xucaiqin преди 1 месец
родител
ревизия
d93817fb5b

+ 2 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2449,6 +2449,8 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setUnloadCityCode(unloadAddress.getCityCode());
             addLogisticOrderParam.setUnloadCityCode(unloadAddress.getCityCode());
             addLogisticOrderParam.setUnloadCityName(unloadAddress.getCityName());
             addLogisticOrderParam.setUnloadCityName(unloadAddress.getCityName());
             addLogisticOrderParam.setUnLoadDetailAddress(unloadAddress.getDetailAddress());
             addLogisticOrderParam.setUnLoadDetailAddress(unloadAddress.getDetailAddress());
+            addLogisticOrderParam.setUnloadContacts(unloadAddress.getContacts());
+            addLogisticOrderParam.setUnloadPhone(unloadAddress.getPhone());
         }
         }
         addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());
         addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());

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

@@ -249,9 +249,9 @@ public class KwpGoodsService {
             goodsEntInfo.setEnt(supplyEnt.getFirmName());
             goodsEntInfo.setEnt(supplyEnt.getFirmName());
             goodsEntInfo.setEntHead(supplyEnt.getHead());
             goodsEntInfo.setEntHead(supplyEnt.getHead());
             goodsEntInfo.setEntBusiness(supplyEnt.getBusiness());
             goodsEntInfo.setEntBusiness(supplyEnt.getBusiness());
-            goodsEntInfo.setEntAddress(supplyEnt.getCityName());
-            goodsEntInfo.setContacts(supplyEnt.getContacts());
-            goodsEntInfo.setPhone(supplyEnt.getPhone());
+            goodsEntInfo.setEntAddress(supplyEnt.getCityName() + (StrUtil.isNotEmpty(supplyEnt.getDetailAddress()) ? supplyEnt.getDetailAddress() : ""));
+            goodsEntInfo.setContacts(supplyEnt.getLegalName());
+            goodsEntInfo.setPhone(supplyEnt.getLegalPhone());
         }
         }
         UserCacheResDto managerInfo = remoteSystemService.queryUserCacheById(detail.getManager());
         UserCacheResDto managerInfo = remoteSystemService.queryUserCacheById(detail.getManager());
         if (Objects.nonNull(managerInfo)) {
         if (Objects.nonNull(managerInfo)) {