修复bug

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

@@ -17,6 +17,7 @@ import com.mmc.pms.service.lease.LeaseGoodsService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -83,4 +84,12 @@ public class LeaseGoodsController extends BaseController {
             @ApiParam(value = "商品id数组", required = true) @RequestBody List<Integer> list) {
         return leaseGoodsService.batchRemoveWareInfo(list);
     }
+
+    @ApiOperation(value = "feign-根据地址id查询是否有商品绑定")
+    @GetMapping("feignLeaseGoodsInfoByAddressId")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)})
+    @ApiIgnore
+    public Integer feignLeaseGoodsInfoByAddressId(@RequestParam Integer id) {
+        return leaseGoodsService.feignLeaseGoodsInfoByAddressId(id);
+    }
 }

src/main/java/com/mmc/pms/dao/category/ProductAttributeDao.java

@@ -31,4 +31,6 @@ public interface ProductAttributeDao {
     int updateProductAttribute(Integer id, Date createTime);
 
     int countLeaseGoodsByTypeId(Integer id);
+
+    int countDeviceMode(Integer id);
 }

src/main/java/com/mmc/pms/dao/lease/LeaseGoodsDao.java

@@ -71,4 +71,5 @@ public interface LeaseGoodsDao {
 
     void removeWareInfo(List<Integer> list);
 
+    Integer feignLeaseGoodsInfoByAddressId(Integer id);
 }

src/main/java/com/mmc/pms/service/category/impl/ProductAttributeServiceImpl.java

@@ -49,7 +49,8 @@ public class ProductAttributeServiceImpl implements ProductAttributeService {
     public ResultBody removeType(Integer id) {
         // 判断该类型是否绑定产品信息
         int count = productAttributeDao.countLeaseGoodsByTypeId(id);
-        if (count > 0) {
+        int deviceModeCount = productAttributeDao.countDeviceMode(id);
+        if (count > 0 || deviceModeCount > 0) {
             return ResultBody.error(ResultEnum.TYPE_DELETE_FAIL);
         }
         productAttributeDao.removeType(id);

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

@@ -26,4 +26,6 @@ public interface LeaseGoodsService {
     ResultBody batchOnShelfOrTakeDown(List<Integer> goodsIds, Integer status);
 
     ResultBody batchRemoveWareInfo(List<Integer> list);
+
+    Integer feignLeaseGoodsInfoByAddressId(Integer id);
 }

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

@@ -188,4 +188,9 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
         leaseGoodsDao.removeWareInfo(list);
         return ResultBody.success();
     }
+
+    @Override
+    public Integer feignLeaseGoodsInfoByAddressId(Integer id) {
+        return leaseGoodsDao.feignLeaseGoodsInfoByAddressId(id);
+    }
 }

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

@@ -48,15 +48,17 @@ public class AppMallGoodsServiceImpl implements AppMallGoodsService {
     @Override
     public ResultBody<GoodsListVO> brandStoreList(List<Integer> userAccountIds) {
         List<GoodsListVO> goodsList = new ArrayList<>();
-        List<MallGoodsDO> mallGoodsDOList = appMallGoodsDao.brandStoreList(userAccountIds);
-        List<MallGoodsVO> list = mallGoodsDOList.stream().map(MallGoodsDO::buildListMallGoodsVO).collect(Collectors.toList());
-        Map<Integer, List<MallGoodsVO>> map = list.
-                stream().collect(Collectors.groupingBy(MallGoodsVO::getUserAccountId));
-        for (Map.Entry<Integer, List<MallGoodsVO>> entry : map.entrySet()) {
-            GoodsListVO goodsListVO = new GoodsListVO();
-            goodsListVO.setUserAccountId(entry.getKey());
-            goodsListVO.setMallGoodsVOList(entry.getValue());
-            goodsList.add(goodsListVO);
+        if (CollectionUtils.isNotEmpty(userAccountIds)){
+            List<MallGoodsDO> mallGoodsDOList = appMallGoodsDao.brandStoreList(userAccountIds);
+            List<MallGoodsVO> list = mallGoodsDOList.stream().map(MallGoodsDO::buildListMallGoodsVO).collect(Collectors.toList());
+            Map<Integer, List<MallGoodsVO>> map = list.
+                    stream().collect(Collectors.groupingBy(MallGoodsVO::getUserAccountId));
+            for (Map.Entry<Integer, List<MallGoodsVO>> entry : map.entrySet()) {
+                GoodsListVO goodsListVO = new GoodsListVO();
+                goodsListVO.setUserAccountId(entry.getKey());
+                goodsListVO.setMallGoodsVOList(entry.getValue());
+                goodsList.add(goodsListVO);
+            }
         }
         return ResultBody.success(goodsList);
     }

src/main/resources/mapper/category/ ProductAttributeDao.xml

@@ -58,4 +58,7 @@
         from lease_goods
         where product_type_id = #{id}
     </select>
+    <select id="countDeviceMode" resultType="java.lang.Integer">
+        select count(*) from device_mode where product_type_id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/lease/LeaseGoodsDao.xml

@@ -410,4 +410,10 @@
         </where>
         order by lg.shelf_status DESC, lg.sort DESC
     </select>
+    <select id="feignLeaseGoodsInfoByAddressId" resultType="java.lang.Integer">
+        select count(*)
+        from lease_goods
+        where ship_address = #{id}
+           or return_address = #{id}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/not-check.yml

@@ -33,4 +33,5 @@ data-filter:
     - /pms/company-inspection/listInspectionPriceUnit
     - /pms/company-inspection/listAPPCompanyInspectionPage
     - /pms/company-inspection/getCompanyInspectionById
-    - /pms/company-inspection/listInspectionPriceUnit
\ No newline at end of file
+    - /pms/company-inspection/listInspectionPriceUnit
+    - /pms/lease/goods/feignLeaseGoodsInfoByAddressId
\ No newline at end of file