Kaynağa Gözat

fixed 管理员管理

fushengqian 1 yıl önce
ebeveyn
işleme
2f557f8dfe

+ 8 - 8
fuint-application/src/main/java/com/fuint/common/service/OrderService.java

@@ -232,12 +232,12 @@ public interface OrderService extends IService<MtOrder> {
      * */
     Integer getUserPayOrderCount(Integer userId) throws BusinessCheckException;
 
-     /**
-      * 获取待分佣订单列表
-      *
-      * @param dateTime 时间
-      * @throws BusinessCheckException
-      * @return
-      * */
-     List<MtOrder> getTobeCommissionOrderList(String dateTime) throws BusinessCheckException;
+    /**
+     * 获取待分佣订单列表
+     *
+     * @param dateTime 时间
+     * @throws BusinessCheckException
+     * @return
+     * */
+    List<MtOrder> getTobeCommissionOrderList(String dateTime) throws BusinessCheckException;
 }

+ 9 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java

@@ -247,9 +247,15 @@ public class BackendAccountController extends BaseController {
         tAccount.setPassword(password);
         tAccount.setIsActive(1);
         tAccount.setLocked(0);
-        tAccount.setStoreId(Integer.parseInt(storeId));
-        tAccount.setMerchantId(Integer.parseInt(merchantId));
-        tAccount.setStaffId(Integer.parseInt(staffId));
+        if (StringUtil.isNotEmpty(storeId)) {
+            tAccount.setStoreId(Integer.parseInt(storeId));
+        }
+        if (StringUtil.isNotEmpty(merchantId)) {
+            tAccount.setMerchantId(Integer.parseInt(merchantId));
+        }
+        if (StringUtil.isNotEmpty(staffId)) {
+            tAccount.setStaffId(Integer.parseInt(staffId));
+        }
 
         tAccountService.createAccountInfo(tAccount, duties);
         return getSuccessResult(true);