Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/GoodsListExport.java

@@ -43,7 +43,7 @@ public class GoodsListExport {
     @ExcelProperty(value = "最低单价", index = 9)
     private String lowestPrice;
 
-    @ExcelProperty(value = "地址", index = 10)
+    @ExcelProperty(value = "地址信息", index = 10)
     private String address;
 
     @ExcelProperty(value = "客户经理", index = 11)

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/BuildingMaterialsMarketList.java

@@ -59,10 +59,14 @@ public class BuildingMaterialsMarketList {
     private String tradingLabel;
 
     /**
-     * 发货地
+     * 所属区域
      */
-    private String address;
+    private String cityName;
 
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
     /**
      * 供应商
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -68,7 +68,7 @@ public class KwpGoodsService {
         Long entId = LoginUserHolder.getEntId();
         //添加商品信息
         KwpGoods goods = BeanUtils.copyProperties(addGoodsParam, KwpGoods.class);
-        goods.setEntId(entId).setStatus(GoodsStatusEnum.TAKE_OFF_SHELVES.getCode());
+        goods.setEntId(entId).setStatus(GoodsStatusEnum.SAVED.getCode());
         kwpGoodsMapper.insert(goods);
         addGoodsOtherInfo(goods.getId(), addGoodsParam);
     }
@@ -358,7 +358,7 @@ public class KwpGoodsService {
                     .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
                     .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
                     .setSupplyEnt(Objects.nonNull(entMap.get(e.getSupplyEntId())) ? entMap.get(e.getSupplyEntId()) : null)
-                    .setAddress(Objects.isNull(addressMap.get(id)) ? null : addressMap.get(id).getDetailAddress())
+                    .setAddress(Objects.isNull(addressMap.get(id)) ? null : addressMap.get(id).getCityName() + addressMap.get(id).getDetailAddress())
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);
             goodsList.setHighestPrice(CollectionUtils.isEmpty(priceRanges) ? null : priceRanges.get(priceRanges.size() - 1).getPrice())
@@ -387,13 +387,14 @@ public class KwpGoodsService {
         if (CollectionUtils.isNotEmpty(params.getIds())) {
             wrapper.in(KwpGoods::getId, params.getIds());
         } else {
-            wrapper.like(StringUtils.isNotBlank(params.getKeywords()), KwpGoods::getName, params.getKeywords())
-                    .ge(Objects.nonNull(params.getStartCreateTime()), KwpGoods::getCreateTime, params.getStartCreateTime())
+            List<Long> finalEntIds = entIds;
+            wrapper.ge(Objects.nonNull(params.getStartCreateTime()), KwpGoods::getCreateTime, params.getStartCreateTime())
                     .le(Objects.nonNull(params.getEndCreateTime()), KwpGoods::getCreateTime, params.getEndCreateTime())
                     .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTrading, params.getTradings())
                     .in(CollectionUtils.isNotEmpty(params.getGoodsTypes()), KwpGoods::getGoodsType, params.getGoodsTypes())
-                    .in(CollectionUtils.isNotEmpty(entIds), KwpGoods::getSupplyEntId, entIds)
-                    .in(CollectionUtils.isNotEmpty(params.getStatus()), KwpGoods::getStatus, params.getStatus());
+                    .in(CollectionUtils.isNotEmpty(params.getStatus()), KwpGoods::getStatus, params.getStatus())
+                    .and(e -> e.in(CollectionUtils.isNotEmpty(finalEntIds), KwpGoods::getSupplyEntId, finalEntIds)
+                            .or().like(StringUtils.isNotBlank(params.getKeywords()), KwpGoods::getName, params.getKeywords()));
         }
         wrapper.eq(KwpGoods::getEntId, LoginUserHolder.getEntId()).eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getCreateTime);
         IPage<KwpGoods> goodsIpage = new Page<>();
@@ -567,7 +568,8 @@ public class KwpGoodsService {
             BuildingMaterialsMarketList materials = BeanUtils.copyProperties(e, BuildingMaterialsMarketList.class);
             KwpGoodsAddress address = addressMap.get(e.getId());
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(e.getId());
-            materials.setAddress(Objects.isNull(address) ? null : address.getCityName() + address.getDetailAddress())
+            materials.setCityName(Objects.isNull(address) ? null : address.getCityName())
+                    .setDetailAddress(Objects.isNull(address) ? null : address.getDetailAddress())
                     .setPrice(CollectionUtils.isEmpty(priceRanges) ? null : priceRanges.get(0).getPrice())
                     .setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), e.getGoodsType()))
                     .setTradingLabel(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), e.getTrading()))

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -212,7 +212,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyList();
         }
         List<EntCacheResDto> list = new ArrayList<>();
-        entIds.forEach(entId -> {
+        entIds.stream().distinct().toList().forEach(entId -> {
             EntCacheResDto entCacheResDto = queryEntCacheById(entId);
             if (Objects.nonNull(entCacheResDto)) {
                 list.add(entCacheResDto);