提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -41,6 +41,7 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.product.api.dubbo.GoodsInfoService;
+import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
@@ -1200,11 +1201,11 @@ public class KwcContractLogisticsService {
         saveContractLogistics.setUpdateBy(LoginUserHolder.getUserId());
         saveContractLogistics.setUpdateTime(date);
         saveContractLogistics.setCommonPrice(baseInfo.getCommonPrice());
-        saveContractLogistics.setSigningUrl(changeFile(req.getContractFile()));
+        saveContractLogistics.setSigningUrl(req.getContractFile());
         kwcContractLogisticsRepository.saveOrUpdateLogistics(saveContractLogistics);
 
         //保存交易商品信息
-        saveLogisticsGoods(req, contactId);
+        saveLogisticsGoods(req, saveContractLogistics.getId());
         //保存物流企业信息
         List<Long> entIdList = new ArrayList<>();
         if (Objects.nonNull(baseInfo.getProvideEntId())) {
@@ -1218,7 +1219,7 @@ public class KwcContractLogisticsService {
             return false;
         }
 
-        saveLogisticListUnit(entIdList, baseInfo, contactId, date);
+        saveLogisticListUnit(entIdList, baseInfo, saveContractLogistics.getId(), date);
 
         return Boolean.TRUE;
     }
@@ -1250,7 +1251,6 @@ public class KwcContractLogisticsService {
                                                                           long contactId,LogisticListReq.TradeBaseInfo baseInfo) {
         KwcContractLogisticsGoods logisticsGoods = new KwcContractLogisticsGoods();
         Date date1 = new Date();
-        logisticsGoods.setId(x.getGoodsId());
         logisticsGoods.setContractId(contactId);
         logisticsGoods.setGoodsId(x.getGoodsId());
         logisticsGoods.setGoodsName(x.getGoodsName());
@@ -1277,12 +1277,12 @@ public class KwcContractLogisticsService {
         //存供应商
         if(Objects.nonNull(baseInfo.getProvideEntId())) {
             buildLogisticsUnit(contactId, baseInfo.getProvideEntId(), baseInfo.getProvidePhone(), entCacheResDtoMap,
-                    date, units,CooperateTypeEnum.SUPPLIER.getCode());
+                    date, units,CooperateTypeEnum.CONSIGN.getCode());
         }
         //存采购商
         if (Objects.nonNull(baseInfo.getPurchaseEntId())) {
             buildLogisticsUnit(contactId, baseInfo.getPurchaseEntId(), baseInfo.getPurchasePhone(), entCacheResDtoMap
-                    , date, units,CooperateTypeEnum.PURCHASER.getCode());
+                    , date, units,CooperateTypeEnum.CARRIAGE.getCode());
         }
         //删除企业
         kwcContractLogisticsUnitRepository.removeByContractId(contactId);
@@ -1350,18 +1350,18 @@ public class KwcContractLogisticsService {
     }
 
     @NotNull
-    private static QueryLogisticDetailResp getQueryLogisticDetailResp(KwcContractLogistics logistics, Map<String, KwcContractLogisticsUnit> contractUniTypeAndUnitMap, List<KwcContractLogisticsGoods> kwcContractLogisticsGoods) {
+    private QueryLogisticDetailResp getQueryLogisticDetailResp(KwcContractLogistics logistics, Map<String, KwcContractLogisticsUnit> contractUniTypeAndUnitMap, List<KwcContractLogisticsGoods> kwcContractLogisticsGoods) {
         QueryLogisticDetailResp queryLogisticListResp = new QueryLogisticDetailResp();
         queryLogisticListResp.setId(logistics.getId());
         queryLogisticListResp.setPid(logistics.getContractPid());
         QueryLogisticDetailResp.TradeBaseInfo tradeBaseInfo = new QueryLogisticDetailResp.TradeBaseInfo();
-        KwcContractLogisticsUnit logisticsUnit = contractUniTypeAndUnitMap.get(logistics.getId() + "-" + CooperateTypeEnum.PURCHASER.getCode());
+        KwcContractLogisticsUnit logisticsUnit = contractUniTypeAndUnitMap.get(logistics.getId() + "-" + CooperateTypeEnum.CARRIAGE.getCode());
         if (Objects.nonNull(logisticsUnit)){
             tradeBaseInfo.setPurchaseEntId(logisticsUnit.getEntId());
             tradeBaseInfo.setPurchasePhone(logisticsUnit.getPhone());
         }
         KwcContractLogisticsUnit providerLogisticsUnit =
-                contractUniTypeAndUnitMap.get(logistics.getId() + "-" + CooperateTypeEnum.PURCHASER.getCode());
+                contractUniTypeAndUnitMap.get(logistics.getId() + "-" + CooperateTypeEnum.CONSIGN.getCode());
         if (Objects.nonNull(providerLogisticsUnit)){
             tradeBaseInfo.setProvideEntId(providerLogisticsUnit.getEntId());
             tradeBaseInfo.setProvidePhone(providerLogisticsUnit.getPhone());
@@ -1383,8 +1383,13 @@ public class KwcContractLogisticsService {
         queryLogisticListResp.setContractFile(logistics.getSigningUrl());
         List<QueryLogisticDetailResp.TradeGoodsInfo> tradeGoodsInfos = Lists.newArrayList();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwcContractLogisticsGoods)){
+            //查询商品信息
+            Map<Long, KwpGoods> kwpGoodsMap = goodsInfoService.getGoodsByIds(kwcContractLogisticsGoods.
+                    stream().map(KwcContractLogisticsGoods::getGoodsId)
+                            .distinct()
+                    .collect(Collectors.toList()));
             tradeGoodsInfos = kwcContractLogisticsGoods.stream()
-                    .map(KwcContractLogisticsService::getTradeGoodsInfo)
+                    .map(x->getTradeGoodsInfo(x, kwpGoodsMap))
                     .collect(Collectors.toList());
         }
 
@@ -1393,10 +1398,11 @@ public class KwcContractLogisticsService {
         return queryLogisticListResp;
     }
 
-    private static QueryLogisticDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractLogisticsGoods x) {
+    private static QueryLogisticDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractLogisticsGoods x,Map<Long, KwpGoods> kwpGoodsMap) {
         QueryLogisticDetailResp.TradeGoodsInfo tradeGoodsInfo = new QueryLogisticDetailResp.TradeGoodsInfo();
         tradeGoodsInfo.setGoodsId(x.getGoodsId());
-        tradeGoodsInfo.setGoodsName(x.getGoodsName());
+        KwpGoods kwpGoods = kwpGoodsMap.getOrDefault(x.getGoodsId(), new KwpGoods());
+        tradeGoodsInfo.setGoodsName(kwpGoods.getName()+"/"+kwpGoods.getGoodsType()+"/"+kwpGoods.getSpec());
         tradeGoodsInfo.setAmount(x.getAmount());
         tradeGoodsInfo.setAmountUnit(x.getUnit());
         tradeGoodsInfo.setPrice(x.getPrice());

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

@@ -1294,7 +1294,7 @@ public class KwpGoodsService {
     public GoodsInfoResp getGoods( GoodsInfoReq req) {
         log.info("查询商品信息，请求参数 :{}", JSON.toJSONString(req));
         //查询上商品信息
-        List<KwpGoods> goods =  kwpGoodsRepository.queryByEntIdAndGoodsName(Long.valueOf(req.getEntId()), req.getGoodsName());
+        List<KwpGoods> goods = kwpGoodsRepository.queryByEntIdAndGoodsName(Long.valueOf(req.getEntId()), req.getGoodsName());
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( goods)){
             return new GoodsInfoResp();
         }