fix

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

@@ -2239,7 +2239,7 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setTradeOrderId(kwoTradeOrder.getId());
         addLogisticOrderParam.setTradeOrderNo(kwoTradeOrder.getTOrderNo());
         if (Objects.equals(tradeContractResDto.getConsignment(), 1)) {//买方托运
-            KwoTradeOrderUnit kwoTradeOrderUnit = unitMap.get("1");//采购
+            KwoTradeOrderUnit kwoTradeOrderUnit = unitMap.get("1");//买方
             if (Objects.nonNull(kwoTradeOrderUnit)) {
                 addLogisticOrderParam.setConsignCompany(kwoTradeOrderUnit.getFirmName());
                 addLogisticOrderParam.setConsignCompanyId(kwoTradeOrderUnit.getEntId());
@@ -2247,9 +2247,17 @@ public class KwoTradeOrderService {
                 addLogisticOrderParam.setConsignContacts(kwoTradeOrderUnit.getContacts());
                 addLogisticOrderParam.setConsignContactsId(kwoTradeOrderUnit.getContactsId());
             }
+            KwoTradeOrderUnit kwoTradeOrderUnit2 = unitMap.get("2");//卖方
+            if (Objects.nonNull(kwoTradeOrderUnit2)) {
+                addLogisticOrderParam.setNonConsignCompany(kwoTradeOrderUnit2.getFirmName());
+                addLogisticOrderParam.setNonConsignCompanyId(kwoTradeOrderUnit2.getEntId());
+                addLogisticOrderParam.setNonConsignContactPhone(kwoTradeOrderUnit2.getPhone());
+                addLogisticOrderParam.setNonConsignContacts(kwoTradeOrderUnit2.getContacts());
+                addLogisticOrderParam.setNonConsignContactsId(kwoTradeOrderUnit2.getContactsId());
+            }
 
         } else {
-            KwoTradeOrderUnit kwoTradeOrderUnit = unitMap.get("2");//采购
+            KwoTradeOrderUnit kwoTradeOrderUnit = unitMap.get("2");//卖方
             if (Objects.nonNull(kwoTradeOrderUnit)) {
                 addLogisticOrderParam.setConsignCompany(kwoTradeOrderUnit.getFirmName());
                 addLogisticOrderParam.setConsignCompanyId(kwoTradeOrderUnit.getEntId());
@@ -2257,6 +2265,14 @@ public class KwoTradeOrderService {
                 addLogisticOrderParam.setConsignContacts(kwoTradeOrderUnit.getContacts());
                 addLogisticOrderParam.setConsignContactsId(kwoTradeOrderUnit.getContactsId());
             }
+            KwoTradeOrderUnit kwoTradeOrderUnit2 = unitMap.get("1");//买方
+            if (Objects.nonNull(kwoTradeOrderUnit2)) {
+                addLogisticOrderParam.setNonConsignCompany(kwoTradeOrderUnit2.getFirmName());
+                addLogisticOrderParam.setNonConsignCompanyId(kwoTradeOrderUnit2.getEntId());
+                addLogisticOrderParam.setNonConsignContactPhone(kwoTradeOrderUnit2.getPhone());
+                addLogisticOrderParam.setNonConsignContacts(kwoTradeOrderUnit2.getContacts());
+                addLogisticOrderParam.setNonConsignContactsId(kwoTradeOrderUnit2.getContactsId());
+            }
         }
 
         addLogisticOrderParam.setGoodsId(byOrderId.getGoodsId());