fixed 提升代码质量的修改

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

@@ -128,10 +128,8 @@ public class BackendArticleController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-
         ArticleDto article = new ArticleDto();
-        article.setOperator(operator);
+        article.setOperator(accountInfo.getAccountName());
         article.setId(id);
         article.setStatus(status);
         articleService.updateArticle(article);

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

@@ -140,9 +140,7 @@ public class BackendBalanceController extends BaseController {
             return getFailureResult(201, "充值会员信息不能为空");
         }
 
-        String operator = accountInfo.getAccountName();
         MtBalance mtBalance = new MtBalance();
-
         MtUser userInfo = memberService.queryMemberById(userId);
 
         // 扣减余额
@@ -157,7 +155,7 @@ public class BackendBalanceController extends BaseController {
         mtBalance.setMerchantId(accountInfo.getMerchantId());
         mtBalance.setDescription(remark);
         mtBalance.setUserId(userId);
-        mtBalance.setOperator(operator);
+        mtBalance.setOperator(accountInfo.getAccountName());
         mtBalance.setOrderSn("");
 
         balanceService.addBalance(mtBalance, true);

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

@@ -129,10 +129,8 @@ public class BackendBannerController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-
         BannerDto bannerDto = new BannerDto();
-        bannerDto.setOperator(operator);
+        bannerDto.setOperator(accountInfo.getAccountName());
         bannerDto.setId(id);
         bannerDto.setStatus(status);
         bannerService.updateBanner(bannerDto);

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

@@ -127,9 +127,7 @@ public class BackendBookCateController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-
-        mtBookCate.setOperator(operator);
+        mtBookCate.setOperator(accountInfo.getAccountName());
         mtBookCate.setStatus(status);
         bookCateService.updateBookCate(mtBookCate);
 
@@ -171,6 +169,7 @@ public class BackendBookCateController extends BaseController {
         mtBookCate.setMerchantId(accountInfo.getMerchantId());
         mtBookCate.setSort(Integer.parseInt(sort));
         mtBookCate.setStatus(status);
+        mtBookCate.setOperator(accountInfo.getAccountName());
 
         if (StringUtil.isNotEmpty(id)) {
             mtBookCate.setId(Integer.parseInt(id));

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

@@ -151,12 +151,11 @@ public class BackendBookController extends BaseController {
         if (bookDto == null) {
             return getFailureResult(201);
         }
-
-        String operator = accountInfo.getAccountName();
+        
         MtBook mtBook = new MtBook();
         BeanUtils.copyProperties(bookDto, mtBook);
 
-        mtBook.setOperator(operator);
+        mtBook.setOperator(accountInfo.getAccountName());
         mtBook.setStatus(status);
         bookService.updateBook(mtBook);
 

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

@@ -161,9 +161,7 @@ public class BackendBookItemController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-
-        mtBookItem.setOperator(operator);
+        mtBookItem.setOperator(accountInfo.getAccountName());
         mtBookItem.setStatus(status);
         bookItemService.updateBookItem(mtBookItem);
 

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

@@ -141,10 +141,8 @@ public class BackendCateController extends BaseController {
             return getFailureResult(201, "该类别不存在");
         }
 
-        String operator = accountInfo.getAccountName();
-
         MtGoodsCate cate = new MtGoodsCate();
-        cate.setOperator(operator);
+        cate.setOperator(accountInfo.getAccountName());
         cate.setId(id);
         cate.setStatus(status);
         cateService.updateCate(cate);

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

@@ -128,10 +128,8 @@ public class BackendCommissionRuleController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-
         CommissionRuleParam commissionRule = new CommissionRuleParam();
-        commissionRule.setOperator(operator);
+        commissionRule.setOperator(accountInfo.getAccountName());
         commissionRule.setId(id);
         commissionRule.setStatus(status);
         commissionRuleService.updateCommissionRule(commissionRule);

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

@@ -217,10 +217,7 @@ public class BackendCouponController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Long id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
-        String operator = accountInfo.getAccountName();
-        couponService.deleteCoupon(id, operator);
-
+        couponService.deleteCoupon(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 

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

@@ -218,9 +218,8 @@ public class BackendCouponGroupController extends BaseController {
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
-        String operator = accountInfo.getAccountName();
         ReqCouponGroupDto groupDto = new ReqCouponGroupDto();
-        groupDto.setOperator(operator);
+        groupDto.setOperator(accountInfo.getAccountName());
         groupDto.setId(id);
         groupDto.setStatus(status);
         couponGroupService.updateCouponGroup(groupDto);

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

@@ -168,8 +168,7 @@ public class BackendGoodsController extends BaseController {
             return getFailureResult(1004);
         }
 
-        String operator = accountInfo.getAccountName();
-        goodsService.updateStatus(goodsId, status, operator);
+        goodsService.updateStatus(goodsId, status, accountInfo.getAccountName());
         logger.info("更新商品状态, goodsId = {},account = {}", goodsId, accountInfo.getAccountName());
 
         return getSuccessResult(true);

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

@@ -227,12 +227,14 @@ public class BackendMemberController extends BaseController {
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('member:index')")
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
-        String operator = accountInfo.getAccountName();
-        memberService.deleteMember(id, operator);
-
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(request.getHeader("Access-Token"));
+        MtUser mtUser = memberService.queryMemberById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!mtUser.getMerchantId().equals(accountInfo.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
+        memberService.deleteMember(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 

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

@@ -169,10 +169,8 @@ public class BackendMemberGroupController extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
-        String operator = accountInfo.getAccountName();
         MemberGroupDto groupDto = new MemberGroupDto();
-        groupDto.setOperator(operator);
+        groupDto.setOperator(accountInfo.getAccountName());
         groupDto.setId(id);
         groupDto.setStatus(status);
         memberGroupService.updateMemberGroup(groupDto);

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

@@ -181,9 +181,7 @@ public class BackendOpenGiftController extends BaseController {
         }
         reqDto.setStoreId(0);
         reqDto.setStatus(status);
-        String operator = accountInfo.getAccountName();
-        reqDto.setOperator(operator);
-
+        reqDto.setOperator(accountInfo.getAccountName());
         if (StringUtil.isNotEmpty(id)) {
             reqDto.setId(Integer.parseInt(id));
             openGiftService.updateOpenGift(reqDto);
@@ -233,10 +231,7 @@ 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);
-
-        String operator = accountInfo.getAccountName();
-        openGiftService.deleteOpenGift(id, operator);
-
+        openGiftService.deleteOpenGift(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 }

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

@@ -344,10 +344,7 @@ public class BackendOrderController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
-        String operator = accountInfo.getAccountName();
-        orderService.deleteOrder(id, operator);
-
+        orderService.deleteOrder(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 
@@ -414,8 +411,6 @@ public class BackendOrderController extends BaseController {
         String payOffLine = param.get("payOffLine") != null ? param.get("payOffLine").toString() : "off";
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        String operator = accountInfo.getAccountName();
-
         OrderSettingEnum[] settingList = OrderSettingEnum.values();
         for (OrderSettingEnum setting : settingList) {
             MtSetting info = new MtSetting();
@@ -434,7 +429,7 @@ public class BackendOrderController extends BaseController {
             info.setStoreId(accountInfo.getStoreId());
             info.setDescription(setting.getValue());
             info.setStatus(StatusEnum.ENABLED.getKey());
-            info.setOperator(operator);
+            info.setOperator(accountInfo.getAccountName());
             info.setUpdateTime(new Date());
 
             settingService.saveSetting(info);

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

@@ -189,7 +189,6 @@ public class BackendPointController extends BaseController {
             return getFailureResult(5002);
         }
 
-        String operator = accountInfo.getAccountName();
         PointSettingEnum[] settingList = PointSettingEnum.values();
         for (PointSettingEnum setting : settingList) {
             MtSetting info = new MtSetting();
@@ -210,7 +209,7 @@ public class BackendPointController extends BaseController {
 
             info.setDescription(setting.getValue());
             info.setStatus(status);
-            info.setOperator(operator);
+            info.setOperator(accountInfo.getAccountName());
             info.setUpdateTime(new Date());
 
             settingService.saveSetting(info);

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

@@ -139,8 +139,7 @@ public class BackendPrinterController extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-        mtPrinter.setOperator(operator);
+        mtPrinter.setOperator(accountInfo.getAccountName());
         mtPrinter.setStatus(status);
         printerService.updatePrinter(mtPrinter);
 

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

@@ -187,11 +187,10 @@ public class BackendRefundController extends BaseController {
         String rejectReason = param.get("rejectReason") == null ? "" : param.get("rejectReason").toString();
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
-        String operator = accountInfo.getAccountName();
         if (status.equals(RefundStatusEnum.REJECT.getKey())) {
             RefundDto dto = new RefundDto();
             dto.setId(refundId);
-            dto.setOperator(operator);
+            dto.setOperator(accountInfo.getAccountName());
             dto.setStatus(RefundStatusEnum.REJECT.getKey());
             dto.setRemark(remark);
             dto.setRejectReason(rejectReason);
@@ -199,7 +198,7 @@ public class BackendRefundController extends BaseController {
         } else {
             RefundDto dto = new RefundDto();
             dto.setId(refundId);
-            dto.setOperator(operator);
+            dto.setOperator(accountInfo.getAccountName());
             dto.setStatus(status);
             dto.setRemark(remark);
             if (status.equals(RefundStatusEnum.COMPLETE.getKey())) {

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

@@ -161,11 +161,10 @@ public class BackendSettlementController extends BaseController {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
-        String operator = accountInfo.getAccountName();
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             requestParam.setMerchantId(accountInfo.getMerchantId());
         }
-        requestParam.setOperator(operator);
+        requestParam.setOperator(accountInfo.getAccountName());
         settlementService.submitSettlement(requestParam);
 
         return getSuccessResult(true);
@@ -189,8 +188,7 @@ public class BackendSettlementController extends BaseController {
         if (StringUtil.isEmpty(settlementId)) {
             return getFailureResult(201, "参数有误");
         }
-        String operator = accountInfo.getAccountName();
-        settlementService.doConfirm(Integer.parseInt(settlementId), operator);
+        settlementService.doConfirm(Integer.parseInt(settlementId), accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 }

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

@@ -139,10 +139,7 @@ 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);
-
-        String operator = accountInfo.getAccountName();
-        smsTemplateService.deleteTemplate(id, operator);
-
+        smsTemplateService.deleteTemplate(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 }

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

@@ -138,15 +138,12 @@ public class BackendStockController extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
         MtStock mtStock = stockService.queryStockById(id.longValue());
         if (mtStock == null) {
             return getFailureResult(201, "该数据不存在");
         }
 
-        String operator = accountInfo.getAccountName();
-        stockService.delete(id, operator);
-
+        stockService.delete(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 

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

@@ -161,9 +161,7 @@ public class BackendStoreController extends BaseController {
         Integer storeId = params.get("storeId") == null ? 0 : Integer.parseInt(params.get("storeId").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
-        String operator = accountInfo.getAccountName();
-        storeService.updateStatus(storeId, operator, status);
+        storeService.updateStatus(storeId, accountInfo.getAccountName(), status);
 
         return getSuccessResult(true);
     }
@@ -265,8 +263,7 @@ public class BackendStoreController extends BaseController {
             storeInfo.setId(Integer.parseInt(storeId));
         }
 
-        String operator = accountInfo.getAccountName();
-        storeInfo.setOperator(operator);
+        storeInfo.setOperator(accountInfo.getAccountName());
         storeService.saveStore(storeInfo);
 
         return getSuccessResult(true);

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

@@ -148,14 +148,12 @@ public class BackendUserGradeController extends BaseController {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
-        String operator = accountInfo.getAccountName();
-
         MtUserGrade mtUserGrade = userGradeService.queryUserGradeById(0, id, 0);
         if (mtUserGrade == null || !mtUserGrade.getMerchantId().equals(accountInfo.getMerchantId())) {
             return getFailureResult(201, "您没有删除权限");
         }
 
-        userGradeService.deleteUserGrade(id, operator);
+        userGradeService.deleteUserGrade(id, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
 

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

@@ -109,8 +109,7 @@ public class Backend${tableClass}Controller extends BaseController {
             return getFailureResult(201);
         }
 
-        String operator = accountInfo.getAccountName();
-        ${tablePrefix}${tableClass}.setOperator(operator);
+        ${tablePrefix}${tableClass}.setOperator(accountInfo.getAccountName());
         ${tablePrefix}${tableClass}.setStatus(status);
         ${serviceName}Service.update${tableClass}(${tablePrefix}${tableClass});