fixed 编码质量优化

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

@@ -525,6 +525,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
         }
         cateInfo.setStatus(StatusEnum.DISABLE.getKey());
         cateInfo.setUpdateTime(new Date());
+        cateInfo.setOperator(operator);
         mtGoodsMapper.updateById(cateInfo);
     }
 

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

@@ -84,12 +84,7 @@ public class BackendBookItemController extends BaseController {
         String cateId = request.getParameter("cateId");
 
         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);
@@ -178,9 +173,6 @@ public class BackendBookItemController 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, "请先登录");
-        }
 
         MtBookItem mtBookItem = bookItemService.getBookItemById(id);
         if (mtBookItem == null) {
@@ -215,9 +207,6 @@ public class BackendBookItemController extends BaseController {
         String storeId = params.get("storeId") == null ? "0" : params.get("storeId").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         MtBookItem mtBookItem = new MtBookItem();
         mtBookItem.setMobile(mobile);
@@ -249,11 +238,11 @@ public class BackendBookItemController 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, "请先登录");
-        }
 
         MtBookItem mtBookItem = bookItemService.getBookItemById(id);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0 && !mtBookItem.getMerchantId().equals(accountInfo.getMerchantId())) {
+            return getFailureResult(1004);
+        }
 
         Map<String, Object> result = new HashMap<>();
         result.put("mtBookItem", mtBookItem);

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

@@ -103,9 +103,6 @@ public class BackendCashierController extends BaseController {
         Integer cateId = request.getParameter("cateId") == null ? 0 : Integer.parseInt(request.getParameter("cateId"));
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount accountInfo = accountService.getAccountInfoById(accountDto.getId());
         Integer storeId = (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) ? 0 : accountInfo.getStoreId();
@@ -172,9 +169,6 @@ public class BackendCashierController extends BaseController {
         String keyword =  param.get("keyword") == null ? "" : param.get("keyword").toString();
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount accountInfo = accountService.getAccountInfoById(accountDto.getId());
         Integer storeId = accountInfo.getStoreId();
@@ -196,21 +190,14 @@ public class BackendCashierController extends BaseController {
     /**
      * 获取商品详情
      *
-     * @param request
-     * @param goodsId
+     * @param goodsId 商品ID
      * @return
      */
     @ApiOperation(value = "获取商品详情")
     @RequestMapping(value = "/getGoodsInfo/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('cashier:index')")
-    public ResponseObject getGoodsInfo(HttpServletRequest request, @PathVariable("id") Integer goodsId) throws InvocationTargetException, IllegalAccessException {
-        String token = request.getHeader("Access-Token");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
+    public ResponseObject getGoodsInfo(@PathVariable("id") Integer goodsId) throws InvocationTargetException, IllegalAccessException {
         GoodsDto goodsInfo = goodsService.getGoodsDetail(goodsId, false);
 
         Map<String, Object> result = new HashMap<>();
@@ -287,9 +274,6 @@ public class BackendCashierController extends BaseController {
         String keyword = param.get("keyword") == null ? "" : param.get("keyword").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (StringUtil.isEmpty(keyword)) {
             return getFailureResult(201);
@@ -327,15 +311,15 @@ public class BackendCashierController extends BaseController {
     public ResponseObject getMemberInfoById(HttpServletRequest request, @PathVariable("userId") String userId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (StringUtil.isEmpty(userId)) {
             return getFailureResult(201);
         }
 
         MtUser userInfo = memberService.queryMemberById(Integer.parseInt(userId));
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0 && !accountInfo.getMerchantId().equals(userInfo.getMerchantId())) {
+            return getFailureResult(1004);
+        }
 
         Map<String, Object> result = new HashMap<>();
         result.put("memberInfo", userInfo);
@@ -356,9 +340,6 @@ public class BackendCashierController extends BaseController {
         String userId = param.get("userId") == null ? "" : param.get("userId").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
             return getFailureResult(201, "平台账号不能执行该操作");
@@ -392,9 +373,6 @@ public class BackendCashierController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         List<HangUpDto> dataList = new ArrayList<>();
 

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

@@ -82,9 +82,6 @@ public class BackendCateController extends BaseController {
         String searchStoreId = request.getParameter("storeId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
@@ -147,9 +144,6 @@ public class BackendCateController 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, "请先登录");
-        }
 
         MtGoodsCate mtCate = cateService.queryCateById(id);
         if (mtCate == null) {
@@ -192,9 +186,6 @@ public class BackendCateController extends BaseController {
         Integer storeId = (params.get("storeId") == null || StringUtil.isEmpty(params.get("storeId").toString())) ? 0 : Integer.parseInt(params.get("storeId").toString());
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
-        if (accountDto == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer myStoreId = accountDto.getStoreId();
         if (myStoreId > 0) {
@@ -234,14 +225,15 @@ public class BackendCateController extends BaseController {
     @PreAuthorize("@pms.hasPermission('goods:cate: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, "请先登录");
-        }
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
         MtGoodsCate mtCate = cateService.queryCateById(id);
         String imagePath = settingService.getUploadBasePath();
 
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0 && !accountInfo.getMerchantId().equals(mtCate.getMerchantId())) {
+            return getFailureResult(1004);
+        }
+
         Map<String, Object> result = new HashMap<>();
         result.put("cateInfo", mtCate);
         result.put("imagePath", imagePath);

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

@@ -96,9 +96,6 @@ public class BackendGoodsController extends BaseController {
         String cateId = request.getParameter("cateId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
@@ -197,11 +194,15 @@ public class BackendGoodsController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
+
+        MtGoods mtGoods = goodsService.queryGoodsById(goodsId);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0 && !mtGoods.getMerchantId().equals(accountInfo.getMerchantId())) {
+            return getFailureResult(1004);
         }
+
         String operator = accountInfo.getAccountName();
         goodsService.deleteGoods(goodsId, operator);
+
         return getSuccessResult(true);
     }
 
@@ -220,15 +221,16 @@ public class BackendGoodsController 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, "请先登录");
-        }
 
         MtGoods mtGoods = goodsService.queryGoodsById(id);
         if (mtGoods == null) {
             return getFailureResult(201, "该商品不存在");
         }
 
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0 && !mtGoods.getMerchantId().equals(accountInfo.getMerchantId())) {
+            return getFailureResult(1004);
+        }
+
         String operator = accountInfo.getAccountName();
 
         MtGoods goodsInfo = new MtGoods();
@@ -255,9 +257,7 @@ public class BackendGoodsController extends BaseController {
         String token = request.getHeader("Access-Token");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         Integer storeId = accountInfo.getStoreId();
         GoodsDto goods = goodsService.getGoodsDetail(goodsId, false);
 
@@ -378,9 +378,6 @@ public class BackendGoodsController extends BaseController {
     public ResponseObject saveHandler(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 goodsId = param.get("goodsId") == null ? "0" : param.get("goodsId").toString();
         if (StringUtil.isEmpty(goodsId)) {
@@ -598,16 +595,10 @@ public class BackendGoodsController extends BaseController {
     @RequestMapping(value = "/saveSpecName", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('goods:goods:add')")
-    public ResponseObject saveSpecName(HttpServletRequest request, @RequestBody Map<String, Object> param) {
-        String token = request.getHeader("Access-Token");
+    public ResponseObject saveSpecName(@RequestBody Map<String, Object> param) {
         String goodsId = param.get("goodsId") == null ? "0" : param.get("goodsId").toString();
         String name = param.get("name") == null ? "" : param.get("name").toString();
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         if (StringUtil.isEmpty(goodsId)) {
             return getFailureResult(201, "请先保存商品基础信息");
         }
@@ -652,17 +643,11 @@ public class BackendGoodsController extends BaseController {
     @RequestMapping(value = "/saveSpecValue", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('goods:goods:add')")
-    public ResponseObject saveSpecValue(HttpServletRequest request, @RequestBody Map<String, Object> param) {
-        String token = request.getHeader("Access-Token");
+    public ResponseObject saveSpecValue(@RequestBody Map<String, Object> param) {
         String specName = param.get("specName") == null ? "" : param.get("specName").toString();
         String goodsId = param.get("goodsId") == null ? "" : param.get("goodsId").toString();
         String value = param.get("value") == null ? "" : param.get("value").toString();
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         if (StringUtil.isEmpty(goodsId)) {
             return getFailureResult(201, "请先保存商品基础信息");
         }
@@ -815,9 +800,7 @@ public class BackendGoodsController extends BaseController {
     public ResponseObject selectGoods(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, "请先登录");
-        }
+        
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             params.put("merchantId", accountInfo.getMerchantId());
         }