承运订单自建订单消息列表bugfix

sckw-modules/sckw-manage/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-manage
   profiles:
-    active: @profiles.active@
+    active: lfdc
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderUnit.java

@@ -39,7 +39,7 @@ public class KwtLogisticsOrderUnit implements Serializable {
     private Long entId;
 
     /**
-     * 一级企业id
+     * 一级企业id-存放对方数据
      */
     private Long topEntId;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -2022,21 +2022,22 @@ public class AcceptCarriageOrderService {
         /**发送信息至消息列表*/
         //托运单位
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getConsignCompanyId()));
+        //承运单位
+        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
         KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
+        //接收方
         consignUnit.setUnitType(NumberConstant.ONE);
         consignUnit.setEntId(Long.parseLong(orderDTO.getConsignCompanyId()));
-        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
+        consignUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
         consignUnit.setFirmName(orderDTO.getConsignCompany());
-        consignUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
-
-        //承运单位
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
+        consignUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        //发起方
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
         carriageUnit.setUnitType(NumberConstant.TWO);
         carriageUnit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
+        carriageUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
         carriageUnit.setFirmName(orderDTO.getAcceptCompany());
-        carriageUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        carriageUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
 //        System.out.println("承运订单新建订单-消息列表推送 start");
 //        commonService.publicLogisticsConsignmentPushMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
 //                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);