承运订单接单消息列表fix

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

@@ -709,10 +709,22 @@ public class AcceptCarriageOrderService {
             Long id = logisticsOrder.getId();
             KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
             KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-//            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-//                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-//                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
+            //接收方
+            KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
+            consignUnit.setUnitType(1);
+            consignUnit.setFirmName(carriageOrderUnit.getFirmName());
+            consignUnit.setEntId(carriageOrderUnit.getEntId());
+            consignUnit.setTopEntId(consignOrderUnit.getTopEntId());
+            consignUnit.setContactsId(carriageOrderUnit.getContactsId());
+
+            //发起方
+            KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(consignOrderUnit.getFirmName());
+            carriageUnit.setEntId(consignOrderUnit.getEntId());
+            carriageUnit.setContactsId(consignOrderUnit.getContactsId());
+            carriageUnit.setTopEntId(carriageOrderUnit.getTopEntId());
+            commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
         } else {
             orderStatus = LogisticsOrderEnum.REJECT_ORDER.getCode();
             //todo 改为拒绝接单  数据统计在页面已退回状态中
@@ -762,10 +774,23 @@ public class AcceptCarriageOrderService {
             Long id = logisticsOrder.getId();
             KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
             KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-//            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-//                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-//                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
+
+            //接收方
+            KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
+            consignUnit.setUnitType(1);
+            consignUnit.setFirmName(carriageOrderUnit.getFirmName());
+            consignUnit.setEntId(carriageOrderUnit.getEntId());
+            consignUnit.setTopEntId(consignOrderUnit.getTopEntId());
+            consignUnit.setContactsId(carriageOrderUnit.getContactsId());
+
+            //发起方
+            KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(consignOrderUnit.getFirmName());
+            carriageUnit.setEntId(consignOrderUnit.getEntId());
+            carriageUnit.setContactsId(consignOrderUnit.getContactsId());
+            carriageUnit.setTopEntId(carriageOrderUnit.getTopEntId());
+            commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
         }
         //状态表新增状态数据
         KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, orderDTO.getLOrderId()).eq(KwtLogisticsOrderTrack::getStatus, orderStatus));

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

@@ -329,7 +329,7 @@ public class CommonService {
         //给业务联系人发消息[承运方]
         List<UserInfo> userInfoList = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
-        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(carriageUnit.getContactsId());
+//        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(carriageUnit.getContactsId());
         userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
         userInfoList.add(userInfo);
         map.put("companyName", carriageUnit.getFirmName());
@@ -361,7 +361,7 @@ public class CommonService {
         //给业务联系人发消息[托运方]
         List<UserInfo> list = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
-        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(consignUnit.getContactsId());
+//        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(consignUnit.getContactsId());
         userInfo.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
         list.add(userInfo);
         map.put("companyName", consignUnit.getFirmName());