fix

sckw-modules-api/sckw-product-api/src/main/java/com/sckw/product/api/dubbo/GoodsInfoService.java

@@ -7,6 +7,7 @@ import com.sckw.product.api.model.GoodsDetails;
 import com.sckw.product.api.model.KwpGoods;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -87,7 +88,7 @@ public interface GoodsInfoService {
 
     List<KwpGoods> queryGoodsByEntId(Long entId);
 
-    void insertProxyGoods(List<Long> list, Long entId);
+    HashMap<Long, Long> insertProxyGoods(List<Long> list, Long entId);
 
     void deleteProxyGoods(List<Long> list);
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/KwcContractProxyGoods.java

@@ -38,6 +38,9 @@ public class KwcContractProxyGoods {
     @Schema(description = "商品id")
     private Long goodsId;
 
+    @TableField(value = "proxy_goods_id")
+    private Long proxyGoodsId;
+
     /**
      * 商品名
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/impl/KwcContractProxyServiceImpl.java

@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -232,7 +229,11 @@ public class KwcContractProxyServiceImpl implements KwcContractProxyService {
         if (Objects.equals(auditStatus, 1)) {
             List<KwcContractProxyGoods> kwcContractProxyGoods = proxyGoodsRepository.queryByContractId(proxy.getId());
             List<Long> list = kwcContractProxyGoods.stream().map(KwcContractProxyGoods::getGoodsId).toList();
-            goodsInfoService.insertProxyGoods(list, proxy.getProxyId());
+            HashMap<Long, Long> longLongHashMap = goodsInfoService.insertProxyGoods(list, proxy.getProxyId());
+            for (KwcContractProxyGoods kwcContractProxyGood : kwcContractProxyGoods) {
+                kwcContractProxyGood.setProxyGoodsId(longLongHashMap.get(kwcContractProxyGood.getGoodsId()));
+                proxyGoodsRepository.updateById(kwcContractProxyGood);
+            }
         }
         return Boolean.TRUE;
     }

sckw-modules/sckw-product/src/main/java/com/sckw/product/dubbo/GoodsInfoServiceImpl.java

@@ -25,10 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -130,7 +127,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     @Override
     public List<KwpGoods> getGoodsByNameTypeDesc(String goodsName, String goodsType, String goodsSpec) {
         List<com.sckw.product.model.KwpGoods> kwpGoods = kwpGoodsRepository.queryByGoodsNameAndTypeAndDesc(goodsName, goodsType, goodsSpec);
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwpGoods)){
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwpGoods)) {
             return Collections.emptyList();
         }
         return kwpGoods.stream()
@@ -141,7 +138,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     @Override
     public List<KwpGoods> findGoodsByGoodsName(String goodsName) {
         List<com.sckw.product.model.KwpGoods> kwpGoods = kwpGoodsRepository.queryByGoodsName(goodsName);
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwpGoods)){
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwpGoods)) {
             return Collections.emptyList();
         }
 
@@ -195,7 +192,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     @Override
     public List<KwpGoods> queryGoodsByEntId(Long entId) {
         List<com.sckw.product.model.KwpGoods> kwpGoods = kwpGoodsRepository.queryGoodsByEntId(entId);
-        if (CollectionUtils.isEmpty(kwpGoods)){
+        if (CollectionUtils.isEmpty(kwpGoods)) {
             return Collections.emptyList();
         }
 
@@ -205,15 +202,16 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     }
 
     @Override
-    public void insertProxyGoods(List<Long> list, Long entId) {
+    public HashMap<Long, Long> insertProxyGoods(List<Long> list, Long entId) {
+        HashMap<Long, Long> res = new HashMap<>();
         for (Long l : list) {
             AddProxyGoods addProxyGoods = new AddProxyGoods();
             addProxyGoods.setGoodsId(l);
             addProxyGoods.setProxyEntId(entId);
-            kwpGoodsService.addGoods(addProxyGoods);
-
+            Long newGoodsId = kwpGoodsService.addGoods(addProxyGoods);
+            res.put(l, newGoodsId);
         }
-
+        return res;
     }
 
     @Override

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/ExportStatisticGoodsListParam.java

@@ -23,7 +23,7 @@ public class ExportStatisticGoodsListParam extends StatisticGoodsListParam {
      * 状态
      */
     private Integer status;
-    private Integer isAgent;
+    private Integer agentFlag;
 
 
 }

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

@@ -167,7 +167,7 @@ public class KwpGoodsService {
      * @return: void
      */
     @Transactional(rollbackFor = Exception.class)
-    public void addGoods(AddProxyGoods param) {
+    public Long addGoods(AddProxyGoods param) {
         Long goodsId = param.getGoodsId();
         Long proxyEntId = param.getProxyEntId();
         if (Objects.isNull(goodsId) || Objects.isNull(proxyEntId)) {
@@ -194,9 +194,9 @@ public class KwpGoodsService {
         proxyGoods.setStatus(GoodsStatusEnum.SAVED.getCode());
         proxyGoods.setAddedTime(null);
         proxyGoods.setShelfTime(null);
-        proxyGoods.setCreateBy(LoginUserHolder.getUserId());
+        proxyGoods.setCreateBy(goods.getCreateBy());
         proxyGoods.setCreateTime(now);
-        proxyGoods.setUpdateBy(LoginUserHolder.getUserId());
+        proxyGoods.setUpdateBy(goods.getUpdateBy());
         proxyGoods.setUpdateTime(now);
         proxyGoods.setDelFlag(Global.NO);
         kwpGoodsMapper.insert(proxyGoods);
@@ -208,9 +208,9 @@ public class KwpGoodsService {
             KwpGoodsAddress newAddress = BeanUtils.copyProperties(address, KwpGoodsAddress.class);
             newAddress.setId(null);
             newAddress.setGoodsId(newGoodsId);
-            newAddress.setCreateBy(LoginUserHolder.getUserId());
+            newAddress.setCreateBy(address.getCreateBy());
             newAddress.setCreateTime(now);
-            newAddress.setUpdateBy(LoginUserHolder.getUserId());
+            newAddress.setUpdateBy(address.getUpdateBy());
             newAddress.setUpdateTime(now);
             newAddress.setDelFlag(Global.NO);
             kwpGoodsAddressService.insert(newAddress);
@@ -223,9 +223,9 @@ public class KwpGoodsService {
                 KwpGoodsAttribute attribute = BeanUtils.copyProperties(e, KwpGoodsAttribute.class);
                 attribute.setId(null);
                 attribute.setGoodsId(newGoodsId);
-                attribute.setCreateBy(LoginUserHolder.getUserId());
+                attribute.setCreateBy(e.getCreateBy());
                 attribute.setCreateTime(now);
-                attribute.setUpdateBy(LoginUserHolder.getUserId());
+                attribute.setUpdateBy(e.getUpdateBy());
                 attribute.setUpdateTime(now);
                 attribute.setDelFlag(Global.NO);
                 newAttributes.add(attribute);
@@ -241,9 +241,9 @@ public class KwpGoodsService {
                 image.setId(null);
                 image.setGoodsId(newGoodsId);
                 image.setImage(FileUtils.replaceAll(e.getImage()));
-                image.setCreateBy(LoginUserHolder.getUserId());
+                image.setCreateBy(e.getCreateBy());
                 image.setCreateTime(now);
-                image.setUpdateBy(LoginUserHolder.getUserId());
+                image.setUpdateBy(e.getUpdateBy());
                 image.setUpdateTime(now);
                 image.setDelFlag(Global.NO);
                 newImages.add(image);
@@ -258,9 +258,9 @@ public class KwpGoodsService {
                 KwpGoodsPriceRange priceRange = BeanUtils.copyProperties(e, KwpGoodsPriceRange.class);
                 priceRange.setId(null);
                 priceRange.setGoodsId(newGoodsId);
-                priceRange.setCreateBy(LoginUserHolder.getUserId());
+                priceRange.setCreateBy(e.getCreateBy());
                 priceRange.setCreateTime(now);
-                priceRange.setUpdateBy(LoginUserHolder.getUserId());
+                priceRange.setUpdateBy(e.getUpdateBy());
                 priceRange.setUpdateTime(now);
                 priceRange.setDelFlag(Global.NO);
                 newPriceRanges.add(priceRange);
@@ -282,6 +282,7 @@ public class KwpGoodsService {
             }
             kwpGoodsUnitService.insertBatch(units);
         }
+        return newGoodsId;
     }
 
     /**
@@ -816,7 +817,7 @@ public class KwpGoodsService {
             List<Long> ids = StringUtils.splitStrToList(params.getIds(), ",", Long.class);
             wrapper.in(KwpGoods::getId, ids);
         } else {
-            wrapper.eq(Objects.nonNull(params.getIsAgent()), KwpGoods::getIsAgent, params.getIsAgent());
+            wrapper.eq(Objects.nonNull(params.getAgentFlag()), KwpGoods::getIsAgent, params.getAgentFlag());
             //代理商看自己。供应商可看代理商商品
             Long entId = LoginUserHolder.getEntId();
             Integer entTypes = LoginUserHolder.getEntTypes();
@@ -824,7 +825,7 @@ public class KwpGoodsService {
                 wrapper.eq(KwpGoods::getAgentEntId, entId);
             }
             if (Objects.equals(entTypes, EntTypeEnum.SUPPLIER.getCode())) {
-                wrapper.eq(KwpGoods::getEntId, LoginUserHolder.getEntId());
+                wrapper.eq(KwpGoods::getEntId, entId);
             }
             if (Objects.nonNull(params.getStartCreateTime())) {
                 wrapper.ge(KwpGoods::getCreateTime, params.getStartCreateTime());