【代码优化】后台Controller控制相关代码

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -1324,6 +1324,9 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             if (orderDto.getVerifyCode().equals(mtOrder.getVerifyCode()) || StringUtil.isEmpty(mtOrder.getVerifyCode())) {
                 mtOrder.setStatus(OrderStatusEnum.DELIVERED.getKey());
                 mtOrder.setVerifyCode("");
+                mtOrder.setConfirmStatus(YesOrNoEnum.YES.getKey());
+                mtOrder.setConfirmTime(new Date());
+                mtOrder.setConfirmRemark(orderDto.getConfirmRemark());
             } else {
                 throw new BusinessCheckException("核销码错误，请确认！");
             }
@@ -1357,18 +1360,6 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             mtOrder.setRemark(orderDto.getRemark());
         }
 
-        if (null != orderDto.getConfirmStatus()) {
-            mtOrder.setConfirmStatus(orderDto.getConfirmStatus());
-        }
-
-        if (null != orderDto.getConfirmRemark()) {
-            mtOrder.setConfirmRemark(orderDto.getConfirmRemark());
-        }
-
-        if (null != orderDto.getConfirmTime()) {
-            mtOrder.setConfirmTime(orderDto.getConfirmTime());
-        }
-
         mtOrderMapper.updateById(mtOrder);
         return mtOrder;
     }

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

@@ -76,10 +76,7 @@ public class BackendCommonController 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, "请先登录");
-        }
-        Integer merchantId = 0;
+        Integer merchantId = accountInfo.getMerchantId();
         String page = QrCodeEnum.STORE.getPage() + "?" + QrCodeEnum.STORE.getKey() + "Id=" + id;
         if (type.equals(QrCodeEnum.TABLE.getKey())) {
             page = QrCodeEnum.TABLE.getPage() + "?" + QrCodeEnum.TABLE.getKey() + "Id=" + id;

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

@@ -80,9 +80,6 @@ public class BackendConfirmLogController extends BaseController {
         String couponId = request.getParameter("couponId") == null ? "" : request.getParameter("couponId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -144,9 +141,6 @@ public class BackendConfirmLogController extends BaseController {
         String userCouponId = (request.getParameter("userCouponId") == null || StringUtil.isEmpty(request.getParameter("userCouponId"))) ? "0" : request.getParameter("userCouponId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         couponService.rollbackUserCoupon(id, Integer.parseInt(userCouponId), accountInfo.getAccountName());
         return getSuccessResult(true);

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

@@ -100,9 +100,6 @@ public class BackendCouponController extends BaseController {
         String status = request.getParameter("status") == null ? "" : request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -227,12 +224,6 @@ 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);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
-        List<Long> ids = new ArrayList<>();
-        ids.add(id);
 
         String operator = accountInfo.getAccountName();
         couponService.deleteCoupon(id, operator);
@@ -254,9 +245,6 @@ public class BackendCouponController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         reqCouponDto.setOperator(accountInfo.getAccountName());
 
         // 同一分组内卡券名称不能重复
@@ -287,21 +275,15 @@ public class BackendCouponController extends BaseController {
     /**
      * 卡券详情
      *
-     * @param request
+     * @param couponId
      * @return
      */
     @ApiOperation(value = "卡券详情")
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('coupon:coupon:index')")
-    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, "请先登录");
-        }
-
-        MtCoupon mtCouponInfo = couponService.queryCouponById(id);
+    public ResponseObject info(@PathVariable("id") Integer couponId) throws BusinessCheckException {
+        MtCoupon mtCouponInfo = couponService.queryCouponById(couponId);
 
         String baseImage = settingService.getUploadBasePath();
 
@@ -323,7 +305,7 @@ public class BackendCouponController extends BaseController {
         }
 
         // 卡券适用商品
-        List<MtCouponGoods> couponGoodsList = mtCouponGoodsMapper.getCouponGoods(id);
+        List<MtCouponGoods> couponGoodsList = mtCouponGoodsMapper.getCouponGoods(couponId);
         String goodsIds = "";
         List<MtGoods> goodsList = new ArrayList<>();
         if (couponGoodsList.size() > 0) {
@@ -402,9 +384,6 @@ public class BackendCouponController extends BaseController {
         String userIds = request.getParameter("userIds");
         String object = request.getParameter("object");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (couponId == null) {
             return getFailureResult(201, "系统参数有误");

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

@@ -81,9 +81,6 @@ public class BackendCouponGroupController 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);
@@ -187,9 +184,6 @@ public class BackendCouponGroupController 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, "请先登录");
-        }
 
         // 该分组已有数据，不允许删除
         Map<String, Object> searchParams = new HashMap<>();
@@ -220,9 +214,6 @@ public class BackendCouponGroupController 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, "请先登录");
-        }
 
         String operator = accountInfo.getAccountName();
         ReqCouponGroupDto groupDto = new ReqCouponGroupDto();
@@ -237,21 +228,15 @@ public class BackendCouponGroupController extends BaseController {
     /**
      * 获取分组详情
      *
-     * @param request
+     * @param groupId
      * @return
      */
     @ApiOperation(value = "获取分组详情")
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('coupon:group:index')")
-    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, "请先登录");
-        }
-
-        MtCouponGroup mtCouponGroup = couponGroupService.queryCouponGroupById(id);
+    public ResponseObject info(@PathVariable("id") Integer groupId) throws BusinessCheckException {
+        MtCouponGroup mtCouponGroup = couponGroupService.queryCouponGroupById(groupId);
 
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("groupInfo", mtCouponGroup);
@@ -302,9 +287,6 @@ public class BackendCouponGroupController extends BaseController {
     public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("fileInput") MultipartFile file) throws Exception {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String filePath = couponGroupService.saveExcelFile(file, request);
         String uuid = couponGroupService.importSendCoupon(file, accountInfo.getAccountName(), filePath);
@@ -320,9 +302,6 @@ public class BackendCouponGroupController extends BaseController {
     public ResponseObject quickSearch(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(Constants.PAGE_NUMBER);

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

@@ -134,7 +134,7 @@ public class BackendDoConfirmController extends BaseController {
     /**
      * 确认核销
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "确认核销")

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

@@ -72,9 +72,6 @@ public class BackendDutyController extends BaseController {
         String status = request.getParameter("status") == null ? "" : request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -136,9 +133,6 @@ public class BackendDutyController extends BaseController {
         String description = param.get("description").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         // 获取角色所分配的菜单
         List<TSource> sources = null;
@@ -173,12 +167,7 @@ public class BackendDutyController extends BaseController {
     @RequestMapping(value = "/info/{roleId}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('system:role:index')")
-    public ResponseObject info(HttpServletRequest request, @PathVariable("roleId") Long roleId) {
-        String token = request.getHeader("Access-Token");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+    public ResponseObject info(@PathVariable("roleId") Long roleId) {
         TDuty htDuty = tDutyService.getRoleById(roleId);
 
         Map<String, Object> result = new HashMap<>();
@@ -220,9 +209,6 @@ public class BackendDutyController extends BaseController {
         String description = param.get("description").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (StringUtil.isEmpty(id)) {
             return getFailureResult(201, "信息提交有误");
@@ -265,9 +251,6 @@ public class BackendDutyController extends BaseController {
     public ResponseObject deleteRole(HttpServletRequest request, @PathVariable("roleId") Long roleId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         tDutyService.deleteDuty(accountInfo.getMerchantId(), roleId);
         return getSuccessResult(true);
     }
@@ -285,9 +268,6 @@ public class BackendDutyController extends BaseController {
     public ResponseObject changeStatus(HttpServletRequest request, @RequestBody DutyStatusRequest dutyStatusRequest) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         tDutyService.updateStatus(accountInfo.getMerchantId(), dutyStatusRequest);
         return getSuccessResult(true);
     }

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

@@ -50,17 +50,11 @@ public class BackendGenCodeController extends BaseController {
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('system:genCode:index')")
     public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
         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"));
         String tableName = request.getParameter("tableName");
         String status = request.getParameter("status");
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
         paginationRequest.setPageSize(pageSize);
@@ -90,16 +84,10 @@ public class BackendGenCodeController extends BaseController {
     @RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('system:genCode:add')")
-    public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
+    public ResponseObject updateStatus(@RequestBody Map<String, Object> params) throws BusinessCheckException {
         String status = params.get("status") != null ? params.get("status").toString() : StatusEnum.ENABLED.getKey();
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         TGenCode tGenCode = genCodeService.queryGenCodeById(id);
         if (tGenCode == null) {
             return getFailureResult(201);
@@ -132,8 +120,8 @@ public class BackendGenCodeController extends BaseController {
         String backendPath = params.get("backendPath") == null ? "" : params.get("backendPath").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            return getFailureResult(1004, "平台超管帐号才有操作权限");
         }
 
         TGenCode tGenCode = new TGenCode();
@@ -166,13 +154,7 @@ public class BackendGenCodeController extends BaseController {
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('system:genCode:index')")
-    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, "请先登录");
-        }
-
+    public ResponseObject info(@PathVariable("id") Integer id) throws BusinessCheckException {
         TGenCode tGenCode = genCodeService.queryGenCodeById(id);
 
         Map<String, Object> result = new HashMap<>();
@@ -194,10 +176,9 @@ public class BackendGenCodeController extends BaseController {
     public ResponseObject gen(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, "请先登录");
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            return getFailureResult(1004, "平台超管帐号才有操作权限");
         }
-
         TGenCode tGenCode = genCodeService.queryGenCodeById(id);
         if (tGenCode == null) {
             return getFailureResult(201, "生成代码不存在");

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

@@ -82,9 +82,6 @@ public class BackendGiveLogController extends BaseController {
         String couponId = request.getParameter("couponId") == null ? "" : request.getParameter("couponId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -124,14 +121,8 @@ public class BackendGiveLogController extends BaseController {
     @RequestMapping(value = "/giveItem", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject giveItem(HttpServletRequest request) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
         String giveId = request.getParameter("giveId");
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         if (StringUtil.isEmpty(giveId)) {
             return getFailureResult(201, "参数有误");
         }

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

@@ -66,9 +66,6 @@ public class BackendHomeController extends BaseController {
         Date endTime = DateUtil.getDayEnd();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer merchantId = accountInfo.getMerchantId();
         Integer storeId = accountInfo.getStoreId();
@@ -123,9 +120,6 @@ public class BackendHomeController extends BaseController {
         Integer storeId = StringUtil.isEmpty(request.getParameter("storeId")) ? 0 : Integer.parseInt(request.getParameter("storeId"));
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer merchantId = account.getMerchantId() == null ? 0 : account.getMerchantId();

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

@@ -131,10 +131,6 @@ public class BackendMemberController extends BaseController {
             params.put("groupIds", groupIds);
         }
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-        TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             params.put("merchantId", accountInfo.getMerchantId());
         }
@@ -150,8 +146,8 @@ public class BackendMemberController extends BaseController {
         // 会员等级列表
         Map<String, Object> param = new HashMap<>();
         param.put("STATUS", StatusEnum.ENABLED.getKey());
-        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
-            param.put("MERCHANT_ID", account.getMerchantId());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            param.put("MERCHANT_ID", accountInfo.getMerchantId());
         }
         List<MtUserGrade> userGradeList = memberService.queryMemberGradeByParams(param);
 
@@ -201,8 +197,14 @@ public class BackendMemberController extends BaseController {
         String token = request.getHeader("Access-Token");
         Integer userId = param.get("userId") == null ? 0 : Integer.parseInt(param.get("userId").toString());
         String status = param.get("status") == null ? StatusEnum.ENABLED.getKey() : param.get("status").toString();
-
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         MtUser userInfo = memberService.queryMemberById(userId);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(userInfo.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
+
         if (userInfo == null) {
             return getFailureResult(201, "会员不存在");
         }

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

@@ -65,9 +65,6 @@ public class BackendMemberGroupController 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);
@@ -113,9 +110,6 @@ public class BackendMemberGroupController extends BaseController {
     public ResponseObject save(HttpServletRequest request, @RequestBody MemberGroupDto memberGroupDto) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
@@ -145,9 +139,6 @@ public class BackendMemberGroupController 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, "请先登录");
-        }
 
         // 该分组已有会员，不允许删除
         Map<String, Object> searchParams = new HashMap<>();
@@ -178,9 +169,6 @@ public class BackendMemberGroupController 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, "请先登录");
-        }
 
         String operator = accountInfo.getAccountName();
         MemberGroupDto groupDto = new MemberGroupDto();
@@ -195,21 +183,15 @@ public class BackendMemberGroupController extends BaseController {
     /**
      * 获取分组详情
      *
-     * @param request
+     * @param groupId
      * @return
      */
     @ApiOperation(value = "获取分组详情")
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('member:group:index')")
-    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, "请先登录");
-        }
-
-        MtUserGroup mtUserGroup = memberGroupService.queryMemberGroupById(id);
+    public ResponseObject info(@PathVariable("id") Integer groupId) throws BusinessCheckException {
+        MtUserGroup mtUserGroup = memberGroupService.queryMemberGroupById(groupId);
 
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("groupInfo", mtUserGroup);

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

@@ -68,9 +68,6 @@ public class BackendMerchantController extends BaseController {
         String status = request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             merchantId = accountInfo.getMerchantId().toString();
         }
@@ -231,21 +228,21 @@ public class BackendMerchantController extends BaseController {
     /**
      * 获取商户详情
      *
-     * @param id
+     * @param merchantId
      * @return
      */
     @ApiOperation(value = "获取商户详情")
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('merchant:index')")
-    public ResponseObject getMerchantInfo(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
+    public ResponseObject getMerchantInfo(HttpServletRequest request, @PathVariable("id") Integer merchantId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
-            id = accountInfo.getMerchantId();
+            merchantId = accountInfo.getMerchantId();
         }
 
-        MtMerchant merchantInfo = merchantService.queryMerchantById(id);
+        MtMerchant merchantInfo = merchantService.queryMerchantById(merchantId);
 
         Map<String, Object> result = new HashMap<>();
         result.put("merchantInfo", merchantInfo);

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

@@ -302,8 +302,6 @@ public class BackendOrderController extends BaseController {
         if (StringUtil.isNotEmpty(verifyCode)) {
             orderDto.setVerifyCode(verifyCode);
         }
-        orderDto.setConfirmStatus(YesOrNoEnum.YES.getKey());
-        orderDto.setConfirmTime(new Date());
 
         orderService.updateOrder(orderDto);
         return getSuccessResult(true);

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

@@ -70,9 +70,6 @@ public class BackendSendLogController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -130,9 +127,6 @@ public class BackendSendLogController extends BaseController {
     public ResponseObject removeUserCoupon(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, "请先登录");
-        }
 
         if (id == null) {
             return getFailureResult(201, "系统参数有误");

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

@@ -4,7 +4,6 @@ import com.fuint.common.Constants;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.enums.SettingTypeEnum;
 import com.fuint.common.enums.SmsSettingEnum;
-import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.service.SendSmsService;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.util.TokenUtil;

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

@@ -102,9 +102,6 @@ public class BackendSourceController extends BaseController {
     public ResponseObject addSource(HttpServletRequest request, @RequestBody Map<String, Object> param) {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String name = param.get("name").toString();
         String status = param.get("status").toString();
@@ -159,9 +156,6 @@ public class BackendSourceController extends BaseController {
     public ResponseObject update(HttpServletRequest request, @RequestBody Map<String, Object> param) {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String name = param.get("name").toString();
         String status = param.get("status").toString();
@@ -223,9 +217,6 @@ public class BackendSourceController extends BaseController {
     public ResponseObject delete(HttpServletRequest request, @PathVariable("sourceId") Long sourceId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         TSource tSource = sourceService.getById(sourceId);
         if (!tSource.getMerchantId().equals(accountInfo.getMerchantId()) && accountInfo.getMerchantId() > 0) {
             return getFailureResult(201, "抱歉，您没有删除的权限");
@@ -242,9 +233,6 @@ public class BackendSourceController extends BaseController {
     public ResponseObject treeselect(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(), "");
         List<TreeSelect> data = sourceService.buildMenuTreeSelect(sources);

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

@@ -179,9 +179,6 @@ public class BackendStockController extends BaseController {
         List<LinkedHashMap> goodsList = (List) params.get("goodsList");
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer myStoreId = accountDto.getStoreId();
         if (myStoreId != null && myStoreId > 0) {
@@ -204,20 +201,14 @@ public class BackendStockController extends BaseController {
     /**
      * 获取库存管理记录详情
      *
-     * @param request
+     * @param id
      * @return
      */
     @ApiOperation(value = "获取库存管理记录详情")
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('stock:index')")
-    public ResponseObject info(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
-        AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
+    public ResponseObject info(@PathVariable("id") Integer id) throws BusinessCheckException {
         MtStock mtStock = stockService.queryStockById(id.longValue());
         Map<String, Object> param = new HashMap<>();
         param.put("STOCK_ID", mtStock.getId());

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

@@ -127,9 +127,6 @@ public class BackendStoreController extends BaseController {
         String storeName = request.getParameter("name") == null ? "" : request.getParameter("name");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
             storeId = accountInfo.getStoreId().toString();
@@ -173,9 +170,6 @@ public class BackendStoreController extends BaseController {
         Integer storeId = params.get("storeId") == null ? 0 : Integer.parseInt(params.get("storeId").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         String operator = accountInfo.getAccountName();
         storeService.updateStatus(storeId, operator, status);
@@ -196,9 +190,6 @@ public class BackendStoreController extends BaseController {
     public ResponseObject saveHandler(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         StoreDto storeInfo = new StoreDto();
         String storeId = params.get("id").toString();
@@ -303,11 +294,13 @@ public class BackendStoreController extends BaseController {
     public ResponseObject getStoreInfo(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, "请先登录");
-        }
 
         StoreDto storeInfo = storeService.queryStoreDtoById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(storeInfo.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
 
         Map<String, Object> result = new HashMap<>();
         result.put("storeInfo", storeInfo);

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

@@ -93,9 +93,6 @@ public class BackendUserCouponController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Map<String, Object> param = new HashMap<>();
         param.put("pageNumber", page);
@@ -160,9 +157,6 @@ public class BackendUserCouponController extends BaseController {
         }
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId();
@@ -190,9 +184,6 @@ public class BackendUserCouponController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         // 删除会员的卡券
         couponService.deleteUserCoupon(id, accountInfo.getAccountName());

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

@@ -3,7 +3,6 @@ package com.fuint.module.merchantApi.controller;
 import com.fuint.common.dto.OrderDto;
 import com.fuint.common.dto.UserInfo;
 import com.fuint.common.dto.UserOrderDto;
-import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.param.OrderConfirmParam;
 import com.fuint.common.param.OrderDetailParam;
 import com.fuint.common.param.OrderListParam;
@@ -24,7 +23,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 /**
  * 订单类controller
@@ -165,8 +163,7 @@ public class MerchantOrderController extends BaseController {
         orderDto.setId(orderInfo.getId());
         orderDto.setConfirmRemark(param.getRemark());
         orderDto.setVerifyCode(param.getCode());
-        orderDto.setConfirmStatus(YesOrNoEnum.YES.getKey());
-        orderDto.setConfirmTime(new Date());
+        orderDto.setOperator(staffInfo.getRealName());
 
         orderService.updateOrder(orderDto);