消息列表数据展示bugfix

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

@@ -292,7 +292,7 @@ public class AcceptCarriageOrderService {
         checkUnit.setUnitType(1);
         checkUnit.setFirmName(bo.getCheckCompany());
         checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
-        checkUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+        checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
         checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
 
         //承运单位
@@ -302,14 +302,14 @@ public class AcceptCarriageOrderService {
         carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
         carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
         carriageUnit.setFirmName(bo.getConsignCompany());
-        carriageUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+        carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
         commonService.newSendLogisticsOrderToMessage(carriageUnit,checkUnit,  logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
                 MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
-                "2");
+                "1");
 
         //修改父级mongodb数据
         //更新mongodb

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

@@ -276,11 +276,13 @@ public class CommonService {
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
         } else {
-            sendLogisticsCarriageMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsConsignMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
+            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
+            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             if (type.equals("1")) {
+                map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
+                map.put("companyName", carriageUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             }
 
@@ -290,12 +292,13 @@ public class CommonService {
 
     private void sendLogisticsCreateByMessage(Long createBy, Long entId, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
         UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
+        String name = remoteSystemService.queryUserCacheById(createBy).getName();
         //给订单创建人发消息
         List<UserInfo> userInfos = new ArrayList<>();
         UserInfo createUser = new UserInfo();
         createUser.setUserId(createBy).setEntId(entId);
         userInfos.add(createUser);
-        map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
+//        map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
         SckwMessage msg = new SckwMessage();
         msg.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
@@ -309,6 +312,7 @@ public class CommonService {
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
+        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(),messageEnum.getContent(),name,JSON.toJSONString(msg));
         streamBridge.send("sckw-message", JSON.toJSONString(msg));
     }
 
@@ -324,6 +328,7 @@ public class CommonService {
         //给业务联系人发消息[承运方]
         List<UserInfo> userInfoList = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(carriageUnit.getContactsId());
         userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
         userInfoList.add(userInfo);
         map.put("companyName", carriageUnit.getFirmName());
@@ -354,6 +359,7 @@ public class CommonService {
         //给业务联系人发消息[托运方]
         List<UserInfo> list = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(consignUnit.getContactsId());
         userInfo.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
         list.add(userInfo);
         map.put("companyName", consignUnit.getFirmName());