fixed【通用行业版本】编码规范更新

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionCashController.java

@@ -73,12 +73,7 @@ public class BackendCommissionCashController extends BaseController {
         String endTime = request.getParameter("endTime") == null ? "" : request.getParameter("endTime");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        Integer storeId;
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        } else {
-            storeId = accountInfo.getStoreId();
-        }
+        Integer storeId = accountInfo.getStoreId();
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -146,11 +141,14 @@ public class BackendCommissionCashController extends BaseController {
     public ResponseObject info(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         CommissionCashDto commissionCash = commissionCashService.queryCommissionCashById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(commissionCash.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
+
         Map<String, Object> result = new HashMap<>();
         result.put("commissionCash", commissionCash);
 
@@ -170,9 +168,6 @@ public class BackendCommissionCashController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         commissionCashRequest.setOperator(accountDto.getAccountName());
         commissionCashService.updateCommissionCash(commissionCashRequest);
@@ -193,9 +188,6 @@ public class BackendCommissionCashController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         requestParam.setOperator(accountDto.getAccountName());
         if (accountDto.getMerchantId() != null && accountDto.getMerchantId() > 0) {
@@ -219,9 +211,6 @@ public class BackendCommissionCashController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountDto.getMerchantId() != null && accountDto.getMerchantId() > 0) {
             requestParam.setMerchantId(accountDto.getMerchantId());
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRelationController.java

@@ -67,9 +67,6 @@ public class BackendCommissionRelationController extends BaseController {
         String subUserId = request.getParameter("subUserId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -126,13 +123,16 @@ public class BackendCommissionRelationController extends BaseController {
     public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         Integer id = param.get("id") == null ? 0 : Integer.parseInt(param.get("id").toString());
         String status = param.get("status") == null ? StatusEnum.ENABLED.getKey() : param.get("status").toString();
 
         MtCommissionRelation mtCommissionRelation = commissionRelationService.getById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(mtCommissionRelation.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
+
         mtCommissionRelation.setStatus(status);
         commissionRelationService.updateById(mtCommissionRelation);
 
@@ -152,11 +152,14 @@ public class BackendCommissionRelationController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         MtCommissionRelation mtCommissionRelation = commissionRelationService.getById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(mtCommissionRelation.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
+
         mtCommissionRelation.setStatus(StatusEnum.DISABLE.getKey());
         commissionRelationService.updateById(mtCommissionRelation);
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java

@@ -157,9 +157,6 @@ public class BackendCouponGroupController extends BaseController {
     public ResponseObject save(HttpServletRequest request, @RequestBody ReqCouponGroupDto reqCouponGroupDto) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         reqCouponGroupDto.setMerchantId(accountInfo.getMerchantId());
         reqCouponGroupDto.setStoreId(accountInfo.getStoreId());
         reqCouponGroupDto.setOperator(accountInfo.getAccountName());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendFileController.java

@@ -68,9 +68,6 @@ public class BackendFileController extends BaseController {
         String action = request.getParameter("action") == null ? "" : request.getParameter("action");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (action.equals("config")) {
             Map<String, Object> outParams = new HashMap();
@@ -153,7 +150,7 @@ public class BackendFileController extends BaseController {
             resultMap.put("type", file.getContentType());
             resultMap.put("url", url);
             String ip = CommonUtil.getIPFromHttpRequest(request);
-            logger.info("用户ip:{},上传文件url:{}", ip, url);
+            logger.info("用户ip:{},上传文件url:{},account:{}", ip, url, accountInfo.getAccountName());
         } catch (Exception e) {
             return getFailureResult(201, "上传失败，请检查上传配置及权限");
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOpenGiftController.java

@@ -59,9 +59,6 @@ public class BackendOpenGiftController extends BaseController {
     public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
@@ -113,10 +110,6 @@ public class BackendOpenGiftController extends BaseController {
     public ResponseObject info(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         Map<String, Object> param = new HashMap<>();
 
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
@@ -146,9 +139,6 @@ public class BackendOpenGiftController extends BaseController {
     public ResponseObject handleSave(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String id = param.get("id").toString();
         String gradeId = param.get("gradeId").toString();
@@ -243,9 +233,6 @@ public class BackendOpenGiftController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String operator = accountInfo.getAccountName();
         openGiftService.deleteOpenGift(id, operator);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -80,9 +80,6 @@ public class BackendPointController extends BaseController {
         String status = request.getParameter("status") == null ? StatusEnum.ENABLED.getKey() : request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -134,9 +131,6 @@ public class BackendPointController extends BaseController {
     public ResponseObject setting(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.POINT.getKey());
         Map<String, Object> result = new HashMap();
@@ -191,9 +185,6 @@ public class BackendPointController extends BaseController {
         }
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
         }
@@ -246,9 +237,6 @@ public class BackendPointController extends BaseController {
         Integer type = param.get("type") == null ? 1 : Integer.parseInt(param.get("type").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (!CommonUtil.isNumeric(amount)) {
             return getFailureResult(201, "充值积分必须是数字");

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java

@@ -66,9 +66,6 @@ public class BackendSmsController extends BaseController {
         String content = request.getParameter("content") == null ? "" : request.getParameter("content");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -81,6 +78,12 @@ public class BackendSmsController extends BaseController {
         if (StringUtil.isNotEmpty(content)) {
             searchParams.put("content", content);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            searchParams.put("storeId", accountInfo.getStoreId());
+        }
 
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<MtSmsSendedLog> paginationResponse = sendSmsService.querySmsListByPagination(paginationRequest);
@@ -104,9 +107,6 @@ public class BackendSmsController extends BaseController {
     public ResponseObject setting(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.SMS_CONFIG.getKey());
 
@@ -155,9 +155,6 @@ public class BackendSmsController extends BaseController {
         String signName = param.get("signName") != null ? param.get("signName").toString() : null;
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsTemplateController.java

@@ -58,9 +58,6 @@ public class BackendSmsTemplateController extends BaseController {
         String code = request.getParameter("code") == null ? "" : request.getParameter("code");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Map<String, Object> searchParams = new HashMap<>();
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
@@ -97,9 +94,6 @@ public class BackendSmsTemplateController extends BaseController {
     public ResponseObject saveHandler(HttpServletRequest request, @RequestBody SmsTemplateDto smsTemplateDto) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         smsTemplateDto.setMerchantId(accountInfo.getMerchantId());
         smsTemplateService.saveSmsTemplate(smsTemplateDto);
         return getSuccessResult(true);
@@ -118,11 +112,13 @@ public class BackendSmsTemplateController extends BaseController {
     public ResponseObject info(HttpServletRequest request, @PathVariable("id") Long id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         MtSmsTemplate mtSmsTemplate = smsTemplateService.querySmsTemplateById(id.intValue());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(mtSmsTemplate.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
 
         Map<String, Object> result = new HashMap();
         result.put("smsTemplate", mtSmsTemplate);
@@ -143,9 +139,6 @@ public class BackendSmsTemplateController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String operator = accountInfo.getAccountName();
         smsTemplateService.deleteTemplate(id, operator);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java

@@ -51,9 +51,6 @@ public class BackendSourceController extends BaseController {
     public ResponseObject list(HttpServletRequest request) {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         List<TreeNode> sources = sourceService.getSourceTree(accountInfo.getMerchantId(), "");
         return getSuccessResult(sources);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -135,25 +135,26 @@ public class BackendStaffController extends BaseController {
     @PreAuthorize("@pms.hasPermission('staff:list')")
     public ResponseObject saveHandler(HttpServletRequest request, @RequestBody StaffParam staffParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
         }
 
         MtStaff mtStaff = new MtStaff();
+        Integer storeId = staffParam.getStoreId();
         if (staffParam.getId() != null) {
             mtStaff = staffService.queryStaffById(staffParam.getId());
         }
-
-        if (mtStaff == null && staffParam.getId() == null) {
+        if (staffParam.getId() != null && mtStaff == null) {
             return getFailureResult(201, "员工信息不存在");
         }
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             mtStaff.setMerchantId(accountInfo.getMerchantId());
         }
-        mtStaff.setStoreId(staffParam.getStoreId());
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            storeId = accountInfo.getStoreId();
+        }
+        mtStaff.setStoreId(storeId);
         mtStaff.setRealName(staffParam.getRealName());
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(staffParam.getMobile())) {
             mtStaff.setMobile(staffParam.getMobile());
@@ -165,8 +166,8 @@ public class BackendStaffController extends BaseController {
         if (StringUtil.isEmpty(mtStaff.getMobile())) {
             return getFailureResult(201, "手机号码不能为空");
         } else {
-            MtStaff tempUser = staffService.queryStaffByMobile(mtStaff.getMobile());
-            if (tempUser != null && !tempUser.getId().equals(mtStaff.getId())) {
+            MtStaff staff = staffService.queryStaffByMobile(mtStaff.getMobile());
+            if (staff != null && !staff.getId().equals(mtStaff.getId())) {
                 return getFailureResult(201, "该手机号码已经存在");
             }
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java

@@ -145,9 +145,6 @@ public class BackendStockController extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         MtStock mtStock = stockService.queryStockById(id.longValue());
         if (mtStock == null) {

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java

@@ -121,9 +121,6 @@ public class BackendSubMessageController extends BaseController {
     public ResponseObject info(HttpServletRequest request, @PathVariable("key") String key) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Map<String, Object> result = new HashMap();
 
@@ -201,9 +198,6 @@ public class BackendSubMessageController extends BaseController {
         List<LinkedHashMap> paramData = (List) param.get("params");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "请使用商户账号操作");
         }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java

@@ -77,12 +77,7 @@ public class ClientBalanceController extends BaseController {
     @RequestMapping(value = "/setting", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject setting(HttpServletRequest request) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
         String merchantNo = request.getHeader("merchantNo");
-        UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
-        if (userInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Map<String, Object> outParams = new HashMap<>();
         Integer merchantId = merchantService.getMerchantId(merchantNo);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java

@@ -101,9 +101,6 @@ public class ClientPayController extends BaseController {
         String useFor = request.getParameter("type") == null ? "" : request.getParameter("type");
         String merchantNo = request.getHeader("merchantNo");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
-        if (userInfo == null) {
-            return getFailureResult(201, "请先登录");
-        }
         MtUser mtUser = memberService.queryMemberById(userInfo.getId());
         Map<String, Object> outParams = new HashMap<>();
 

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -153,9 +153,6 @@ public class MerchantMemberController extends BaseController {
     public ResponseObject save(HttpServletRequest request, @RequestBody MemberInfoParam memberInfoParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
-        if (userInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         MtStaff staffInfo = null;
         MtUser myUserInfo = memberService.queryMemberById(userInfo.getId());

fuint-application/src/main/resources/vm/java/BackendController.java.vm

@@ -57,12 +57,7 @@ public class Backend${tableClass}Controller extends BaseController {
         String searchStoreId = request.getParameter("storeId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        Integer storeId;
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        } else {
-            storeId = accountInfo.getStoreId();
-        }
+        Integer storeId = accountInfo.getStoreId();
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -117,9 +112,6 @@ public class Backend${tableClass}Controller extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         ${className} ${tablePrefix}${tableClass} = ${serviceName}Service.query${tableClass}ById(id);
         if (${tablePrefix}${tableClass} == null) {
@@ -151,9 +143,6 @@ public class Backend${tableClass}Controller extends BaseController {
         String storeId = params.get("storeId") == null ? "0" : params.get("storeId").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         ${className} info = new ${className}();
         info.setOperator(accountInfo.getAccountName());