Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 16203e068976be09d2b4a8e92d31218ba49b7e64
+  newTag: 98073d9d0ef617aec952c289956a1f702a2a5648

src/main/java/com/mmc/pms/controller/lease/AppGoodsController.java

@@ -41,6 +41,6 @@ public class AppGoodsController extends BaseController {
     @PostMapping("leaseGoodsList")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)})
     public ResultBody leaseGoodsList(@RequestBody LeaseGoodsQO param) {
-        return leaseGoodsService.leaseGoodsList(param, null);
+        return leaseGoodsService.leaseGoodsList(param);
     }
 }

src/main/java/com/mmc/pms/service/lease/LeaseGoodsService.java

@@ -23,6 +23,8 @@ public interface LeaseGoodsService {
 
     ResultBody leaseGoodsList(LeaseGoodsQO param, LoginSuccessDTO loginSuccessDTO);
 
+    ResultBody leaseGoodsList(LeaseGoodsQO param);
+
     ResultBody batchOnShelfOrTakeDown(List<Integer> goodsIds, Integer status);
 
     ResultBody batchRemoveWareInfo(List<Integer> list);

src/main/java/com/mmc/pms/service/lease/impl/LeaseGoodsServiceImpl.java

@@ -121,18 +121,21 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
 
     @Override
     public ResultBody leaseGoodsList(LeaseGoodsQO param, LoginSuccessDTO loginSuccessDTO) {
-        if (loginSuccessDTO != null && loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+        if (loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
             // 超级管理员获取所有商品信息
             return ResultBody.success(getLeaseGoodsInfo(param, 1));
-        } else if (loginSuccessDTO != null && !loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+        } else {
             // 非超级管理员获取自家的商品信息
             param.setUserAccountId(loginSuccessDTO.getUserAccountId());
             return ResultBody.success(getLeaseGoodsInfo(param, 1));
-        } else {
-            return ResultBody.success(getLeaseGoodsInfo(param, 0));
         }
     }
 
+    @Override
+    public ResultBody leaseGoodsList(LeaseGoodsQO param) {
+        return ResultBody.success(getLeaseGoodsInfo(param, 0));
+    }
+
     private PageResult getLeaseGoodsInfo(LeaseGoodsQO param, Integer type) {
         int count;
         if (type.equals(1)) {

src/main/java/com/mmc/pms/service/mall/impl/MallGoodsServiceImpl.java

@@ -9,8 +9,6 @@ import com.mmc.pms.entity.lease.LeasePriceStockDO;
 import com.mmc.pms.entity.lease.LeaseSpecAttrDO;
 import com.mmc.pms.entity.lease.LeaseSpecAttrValueDO;
 import com.mmc.pms.entity.mall.*;
-import com.mmc.pms.feign.UserAppApi;
-import com.mmc.pms.model.BackUserAccountVO;
 import com.mmc.pms.model.lease.vo.LeaseGoodsVO;
 import com.mmc.pms.model.lease.vo.LeasePriceStockVO;
 import com.mmc.pms.model.mall.GoodsResourcesVO;
@@ -251,12 +249,9 @@ public class MallGoodsServiceImpl implements MallGoodsService {
             }
             // 获取规格id为空的值，进行新增
             addSpecAttr = specAttrList.stream().filter(spec -> spec.getId() == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(addSpecAttr)) {
-                addMallGoodsSpec(addSpecAttr, mallGoodsVO.getId(), null, null, 0);
-            }
             // 修改排列组合数据
             mallGoodsDao.deleteMallPriceStock(mallGoodsVO.getId());
-            addMallGoodsSpec(null, mallGoodsVO.getId(), mallGoodsVO.getPriceStock(), null, 0);
+            addMallGoodsSpec(addSpecAttr, mallGoodsVO.getId(), mallGoodsVO.getPriceStock(), null, 0);
         } else {
             specAttrList = leaseGoodsVO.getSpecAttrList();
             // 从数据库获取该租赁商品下的所有规格,并删除多余规格
@@ -280,9 +275,11 @@ public class MallGoodsServiceImpl implements MallGoodsService {
                     addNewSpecAttrValues(specAttrVO, 1);
                 }
             }
+            // 获取规格id为空的值，进行新增
+            addSpecAttr = specAttrList.stream().filter(spec -> spec.getId() == null).collect(Collectors.toList());
             // 修改排列组合数据
             leaseGoodsDao.deleteLeasePriceStock(leaseGoodsVO.getId());
-            addMallGoodsSpec(null, leaseGoodsVO.getId(), null, leaseGoodsVO.getPriceStock(), 1);
+            addMallGoodsSpec(addSpecAttr, leaseGoodsVO.getId(), null, leaseGoodsVO.getPriceStock(), 1);
         }
     }