修改工作台承运业务

修改工作台托运业务

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/common/config/MessageUrlConfig.java

@@ -0,0 +1,57 @@
+package com.sckw.transport.common.config;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author lfdc
+ * @date 2023-09-17 10:30:51
+ */
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "message.logistics.order")
+@RefreshScope
+public class MessageUrlConfig {
+
+
+    private PcMessageUrl pc;
+    private AppMessageUrl app;
+
+    @Data
+    public static class PcMessageUrl {
+
+        /**
+         * 托运订单地址
+         */
+        private String consignLogisticsAddOrderUrl;
+
+        /**
+         * 承运订单地址
+         */
+        private String carriageLogisticsAddOrderUrl;
+
+
+    }
+
+    @Data
+    public static class AppMessageUrl {
+
+        /**
+         * 托运订单地址
+         */
+        private String consignLogisticsAddOrderUrl;
+
+        /**
+         * 承运订单地址
+         */
+        private String carriageLogisticsAddOrderUrl;
+
+    }
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/enums/OrderTypeEnum.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/common/enums/OrderTypeEnum.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.enums;
+package com.sckw.transport.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -372,10 +372,20 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
 
     StatisticsByOrderVO selectStatisticsByOrder(@Param("statusList") List<Integer> statusList, @Param("dateStart") String dateStart, @Param("dateEnd") String dateEnd, @Param("topId") Long topId, @Param("unitType") Integer unitType);
 
-    List<LogisticsOrderStatisticsVO> workbenchLogisticsOrderStatisticsByMonth(@Param("id") Long id, @Param("statusList") List<Integer> statusList, @Param("type") Integer type, @Param("dateStart") String dateStart, @Param("dateEnd") String dateEnd);
+    List<LogisticsOrderStatisticsVO> workbenchLogisticsOrderStatisticsByMonth(@Param("id") Long id, @Param("statusList") List<Integer> statusList,
+                                                                              @Param("type") Integer type, @Param("dateStart") String dateStart,
+                                                                              @Param("dateEnd") String dateEnd,
+                                                                              @Param("totalAmount") String totalAmount,
+                                                                              @Param("totalPrice") String totalPrice
+    );
 
 
-    List<LogisticsOrderStatisticsVO> workbenchLogisticsOrderStatisticsByDays(@Param("id") Long id, @Param("statusList") List<Integer> statusList, @Param("type") Integer type, @Param("dateStart") String dateStart, @Param("dateEnd") String dateEnd);
+    List<LogisticsOrderStatisticsVO> workbenchLogisticsOrderStatisticsByDays(@Param("id") Long id, @Param("statusList") List<Integer> statusList,
+                                                                             @Param("type") Integer type, @Param("dateStart") String dateStart,
+                                                                             @Param("dateEnd") String dateEnd,
+                                                                             @Param("totalAmount") String totalAmount,
+                                                                             @Param("totalPrice") String totalPrice
+    );
 
     List<com.sckw.transport.model.dto.LogisticsOrderDTO> selectOrderListByTradeOrderIds(@Param("tradeOrderIds") List<Long> tradeOrderIds, @Param("unitType") String unitType);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsOrderStatisticsParam.java

@@ -20,11 +20,19 @@ public class LogisticsOrderStatisticsParam {
     @SerializedName("dateType")
     private String dateType;
 
-//    /**
-//     * 统计因子 1,4,5,6
-//     */
-//    @NotBlank(message = "统计因子")
-//    @JsonProperty("type")
-//    @SerializedName("type")
-//    private String types;
+    /**
+     * 统计因子 1,2,3,4,5,6
+     */
+    @NotBlank(message = "统计因子")
+    @JsonProperty("totalAmount")
+    @SerializedName("totalAmount")
+    private String totalAmount;
+
+    /**
+     * 统计因子 1,2,3,4,5,6
+     */
+    @NotBlank(message = "统计因子")
+    @JsonProperty("totalPrice")
+    @SerializedName("totalPrice")
+    private String totalPrice;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsOrderStatisticsVO.java

@@ -20,7 +20,11 @@ public class LogisticsOrderStatisticsVO {
      */
     private Integer num;
     /**
-     * 统计金额
+     * 统计量
      */
     private BigDecimal totalAmount;
+    /**
+     * 统计金额
+     */
+    private BigDecimal totalPrice;
 }

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

@@ -48,8 +48,9 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
+import com.sckw.transport.common.config.MessageUrlConfig;
+import com.sckw.transport.common.enums.OrderTypeEnum;
 import com.sckw.transport.dao.*;
-import com.sckw.transport.enums.OrderTypeEnum;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
@@ -107,6 +108,9 @@ public class AcceptCarriageOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     PaymentDubboService paymentDubboService;
 
+    @Autowired
+    private MessageUrlConfig messageUrlConfig;
+
     @Autowired
     public CommonService commonService;
 
@@ -1733,14 +1737,14 @@ public class AcceptCarriageOrderService {
             }
         }
         if (unitOne != null) {
-            orderDetailVO.setConsignCompanyId(unitOne.getId());
+            orderDetailVO.setConsignCompanyId(unitOne.getEntId());
             orderDetailVO.setConsignCompany(unitOne.getFirmName());
             orderDetailVO.setConsignContacts(unitOne.getContacts());
             orderDetailVO.setConsignPhone(unitOne.getPhone());
             orderDetailVO.setCollectionCompany(unitOne.getFirmName());
         }
         if (unitTwo != null) {
-            orderDetailVO.setCarrierCompanyId(unitTwo.getId());
+            orderDetailVO.setCarrierCompanyId(unitTwo.getEntId());
             orderDetailVO.setCarrierCompany(unitTwo.getFirmName());
             orderDetailVO.setCarrierContacts(unitTwo.getContacts());
             orderDetailVO.setCarrierPhone(unitTwo.getPhone());
@@ -1924,6 +1928,13 @@ public class AcceptCarriageOrderService {
         System.out.println("承运订单新建订单-消息列表推送 start");
         commonService.publicLogisticsConsignmentPushMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
                 , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);
+
+        commonService.pushMessageByUrl(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
+                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER
+                ,messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl()
+                ,messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
+        );
+
         System.out.println("承运订单新建订单-消息列表推送 end ");
         return HttpResult.ok();
     }
@@ -2120,7 +2131,7 @@ public class AcceptCarriageOrderService {
         unit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
         EntCacheResDto ent1 = entMap.get(Long.parseLong(orderDTO.getAcceptCompanyId()));
         if (Objects.isNull(ent1)) {
-            throw new BusinessException("企业:" + orderDTO.getConsignCompany() + "的一级企业信息不存在！");
+            throw new BusinessException("企业:" + orderDTO.getAcceptCompany() + "的一级企业信息不存在！");
         }
         unit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
         unit.setTopEntId(ent1.getId());
@@ -2886,7 +2897,8 @@ public class AcceptCarriageOrderService {
             //结束时间
             String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
 
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd);
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
             return HttpResult.ok(list);
         } else if (String.valueOf(NumberConstant.ONE).equals(logisticsOrderStatistics.getDateType())) {
             //开始时间
@@ -2899,7 +2911,8 @@ public class AcceptCarriageOrderService {
             }
             //结束时间
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd);
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
             return HttpResult.ok(list);
         }
         return null;

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

@@ -25,6 +25,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
+import com.sckw.transport.common.config.MessageUrlConfig;
 import com.sckw.transport.dao.KwtLogisticsOrderContractMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.model.KwtLogisticsOrder;
@@ -55,6 +56,9 @@ public class CommonService {
     @Autowired
     private StreamBridge streamBridge;
 
+    @Autowired
+    private MessageUrlConfig messageUrlConfig;
+
     @Value("${message.logistics.order.consignLogisticsOrderUrl}")
     private String consignLogisticsOrderUrl;
 
@@ -237,23 +241,23 @@ public class CommonService {
     /**
      * 发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]
      *
-     * @param checkUnit    托运单位
+     * @param consignUnit    托运单位
      * @param carriageUnit 承运单位
      * @param orderNo      单据号
      * @param createBy     创建人
      * @param entId        创建数据的企业id
      */
-    public void initIatingLogisticsConsignment(KwtLogisticsOrderUnit checkUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId) {
+    public void initIatingLogisticsConsignment(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId) {
         boolean flag = false;
-        if (createBy.equals(checkUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
+        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
             flag = true;
         }
         Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
         map.put("orderNo", orderNo);
-        if (flag && createBy.equals(checkUnit.getContactsId())) {
-            sendMessageLogistics(checkUnit, carriageUnit, map);
+        if (flag && createBy.equals(consignUnit.getContactsId())) {
+            sendMessageLogistics(consignUnit, carriageUnit, map);
         } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendMessageLogistics(checkUnit, carriageUnit, map);
+            sendMessageLogistics(consignUnit, carriageUnit, map);
         } else {
             UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
             //给订单创建人发消息
@@ -266,7 +270,9 @@ public class CommonService {
             msg.setRequestId(UUIDUtils.get32UUID())
                     .setMessageEnum(MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT)
                     .setParams(map)
-                    .setMsgUrl(consignLogisticsOrderUrl)
+                    .setMsgUrls(new HashMap<>(NumberConstant.SIXTEEN){
+                        { put("pc", messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());
+                            put("app", messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()); }})
                     .setUserInfos(userInfos)
                     .setCreateBy(LoginUserHolder.getUserId());
             log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
@@ -511,7 +517,7 @@ public class CommonService {
         List<UserInfo> list = new ArrayList<>();
         UserInfo userInfo1 = new UserInfo();
         userInfo1.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
-        list.add(userInfo);
+        list.add(userInfo1);
         map.put("companyName", consignUnit.getFirmName());
         SckwMessage message = new SckwMessage();
         message.setRequestId(UUIDUtils.get32UUID())
@@ -523,4 +529,101 @@ public class CommonService {
         log.info(MessageEnum.getDesc(consignMessageEnum) + "-[托运方]-业务联系人：{}", JSON.toJSONString(message));
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }
+
+    /**
+     *
+     * @param consignUnit 托运单位
+     * @param carriageUnit  承运单位
+     * @param orderNo   单据号
+     * @param createBy  创建人
+     * @param entId 企业id
+     * @param consignMessageEnum 托运消息体
+     * @param carriageMessageEnum   承运消息体
+     * @param pcConsignLogisticsAddOrderUrl pc托运url
+     * @param pcCarriageLogisticsAddOrderUrl    pc承运url
+     * @param appConsignLogisticsAddOrderUrl    app托运url
+     * @param appCarriageLogisticsAddOrderUrl   app承运url
+     */
+    public void pushMessageByUrl(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId,
+                                 MessageEnum consignMessageEnum, MessageEnum carriageMessageEnum,
+                                 String pcConsignLogisticsAddOrderUrl,String pcCarriageLogisticsAddOrderUrl,
+                                 String appConsignLogisticsAddOrderUrl,String appCarriageLogisticsAddOrderUrl
+                                 )  {
+        boolean flag = false;
+        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
+            flag = true;
+        }
+        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
+        map.put("orderNo", orderNo);
+        if (flag && createBy.equals(consignUnit.getContactsId())) {
+            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum,carriageMessageEnum);
+        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
+            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum,carriageMessageEnum);
+        } else {
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
+            //给订单创建人发消息
+            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());
+            SckwMessage msg = new SckwMessage();
+            msg.setRequestId(UUIDUtils.get32UUID())
+                    .setMessageEnum(carriageMessageEnum)
+                    .setParams(map)
+                    .setMsgUrls(new HashMap<>(NumberConstant.SIXTEEN){{put("pc",pcCarriageLogisticsAddOrderUrl);put("app",appCarriageLogisticsAddOrderUrl);}})
+                    .setUserInfos(userInfos)
+                    .setCreateBy(LoginUserHolder.getUserId());
+            log.info(MessageEnum.getDesc(consignMessageEnum) + "-创建人：{}", JSON.toJSONString(msg));
+            streamBridge.send("sckw-message", JSON.toJSONString(msg));
+            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum,carriageMessageEnum);
+    }
+}
+
+    /**
+     *
+     * @param consignUnit 托运单位
+     * @param carriageUnit 承运单位
+     * @param map
+     * @param consignMessageEnum    托运枚举
+     * @param carriageMessageEnum   承运枚
+     */
+    private void sendPushMessageByUrlLogistics(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit,
+                                               Map<String, Object> map,
+                                               MessageEnum consignMessageEnum,
+                                               MessageEnum carriageMessageEnum
+                                               ) {
+        //给业务联系人发消息[承运方]
+        List<UserInfo> userInfoList = new ArrayList<>();
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
+        userInfoList.add(userInfo);
+        map.put("companyName", carriageUnit.getFirmName());
+        SckwMessage sckwMessage = new SckwMessage();
+        sckwMessage.setRequestId(UUIDUtils.get32UUID())
+                .setMessageEnum(carriageMessageEnum)
+                .setParams(map)
+                .setMsgUrls(new HashMap<>(){{put("pc",messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl());put("app",messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl());}})
+                .setUserInfos(userInfoList)
+                .setCreateBy(LoginUserHolder.getUserId());
+        log.info(MessageEnum.getDesc(carriageMessageEnum) + "-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
+        streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
+
+
+        //给业务联系人发消息[托运方]
+        List<UserInfo> list = new ArrayList<>();
+        UserInfo userInfo1 = new UserInfo();
+        userInfo1.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
+        list.add(userInfo1);
+        map.put("companyName", consignUnit.getFirmName());
+        SckwMessage message = new SckwMessage();
+        message.setRequestId(UUIDUtils.get32UUID())
+                .setMessageEnum(consignMessageEnum)
+                .setParams(map)
+                .setMsgUrls(new HashMap<>(){{put("pc",messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());put("app",messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl());}})
+                .setUserInfos(list)
+                .setCreateBy(LoginUserHolder.getUserId());
+        log.info(MessageEnum.getDesc(consignMessageEnum) + "-[托运方]-业务联系人：{}", JSON.toJSONString(message));
+        streamBridge.send("sckw-message", JSON.toJSONString(message));
+    }
 }

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

@@ -45,7 +45,7 @@ import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
-import com.sckw.transport.enums.OrderTypeEnum;
+import com.sckw.transport.common.enums.OrderTypeEnum;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
@@ -2204,7 +2204,8 @@ public class ConsignOrderService {
             //结束时间
             String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
 
-            List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList, OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd);
+            List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
+                    OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
             return HttpResult.ok(list);
         } else if (String.valueOf(NumberConstant.ONE).equals(logisticsOrderStatistics.getDateType())) {
             //开始时间
@@ -2217,7 +2218,8 @@ public class ConsignOrderService {
             }
             //结束时间
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
-            List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList, OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd);
+            List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
+                    OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
             return HttpResult.ok(list);
         }
         return null;

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

@@ -402,14 +402,14 @@ public class ManagementLogisticsOrderService {
             }
         }
         if (unitOne != null) {
-            orderDetailVO.setConsignCompanyId(unitOne.getId());
+            orderDetailVO.setConsignCompanyId(unitOne.getEntId());
             orderDetailVO.setConsignCompany(unitOne.getFirmName());
             orderDetailVO.setConsignContacts(unitOne.getContacts());
             orderDetailVO.setConsignPhone(unitOne.getPhone());
             orderDetailVO.setCollectionCompany(unitOne.getFirmName());
         }
         if (unitTwo != null) {
-            orderDetailVO.setCarrierCompanyId(unitTwo.getId());
+            orderDetailVO.setCarrierCompanyId(unitTwo.getEntId());
             orderDetailVO.setCarrierCompany(unitTwo.getFirmName());
             orderDetailVO.setCarrierContacts(unitTwo.getContacts());
             orderDetailVO.setCarrierPhone(unitTwo.getPhone());

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
-import com.sckw.core.annotation.Log;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
@@ -180,14 +179,14 @@ public class TransportCommonService {
             }
         }
         if (unitOne != null) {
-            orderDetailVO.setConsignCompanyId(unitOne.getId());
+            orderDetailVO.setConsignCompanyId(unitOne.getEntId());
             orderDetailVO.setConsignCompany(unitOne.getFirmName());
             orderDetailVO.setConsignContacts(unitOne.getContacts());
             orderDetailVO.setConsignPhone(unitOne.getPhone());
             orderDetailVO.setCollectionCompany(unitOne.getFirmName());
         }
         if (unitTwo != null) {
-            orderDetailVO.setCarrierCompanyId(unitTwo.getId());
+            orderDetailVO.setCarrierCompanyId(unitTwo.getEntId());
             orderDetailVO.setCarrierCompany(unitTwo.getFirmName());
             orderDetailVO.setCarrierContacts(unitTwo.getContacts());
             orderDetailVO.setCarrierPhone(unitTwo.getPhone());

sckw-modules/sckw-transport/src/main/resources/bootstrap-lfdc.yml

@@ -22,6 +22,19 @@ spring:
           - dataId: sckw-common.yml
             group: sckw-service-platform
             refresh: true
+message:
+  logistics:
+    order:
+       pc:
+        #托运订单地址
+         consignLogisticsAddOrderUrl: /orderManagement/consignmentOrder
+        #承运订单地址
+         carriageLogisticsAddOrderUrl: /orderManagement/acceptanceOrder
+       app:
+        #托运订单地址
+         consignLogisticsAddOrderUrl: /pages/order/transportOrderList?type=1
+        #承运订单地址
+         carriageLogisticsAddOrderUrl: /pages/order/transportOrderList?type=2
 #spring:
 #  rabbitmq:
 #    username: admin

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1986,7 +1986,7 @@
     </select>
 
     <select id="workbenchLogisticsOrderStatisticsByMonth" resultType="com.sckw.transport.model.vo.LogisticsOrderStatisticsVO">
-        SELECT  A.date_time as dateTime, COALESCE(B.num, 0) as num,IFNULL(B.totalAmount,0) AS totalAmount FROM
+        SELECT  A.date_time as dateTime, COALESCE(B.num, 0) as num,IFNULL(B.totalAmount,0) AS totalAmount , IFNULL(B.totalPrice,0) AS totalPrice FROM
         (
         SELECT
         DATE_FORMAT( DATE_ADD( #{dateStart}, INTERVAL ROW1 MONTH ), '%Y-%m' ) date_time
@@ -2008,7 +2008,13 @@
         ) A
         LEFT JOIN
         (
-        SELECT DATE_FORMAT(a.create_time, '%Y-%m') date_time, COUNT(*) num,sum(a.amount) as totalAmount
+        SELECT DATE_FORMAT(a.create_time, '%Y-%m') date_time, COUNT(*) num,
+        CASE WHEN #{totalAmount} = 1 THEN
+        sum( a.amount )
+        ELSE 0 end AS totalAmount,
+        CASE WHEN #{totalPrice} = 2 THEN
+        sum(a.amount * IFNULL( a.price, 0 ))
+        ELSE 0	end AS totalPrice
         FROM kwt_logistics_order a LEFT JOIN  kwt_logistics_order_unit b ON a.id = b.l_order_id
         WHERE a.del_flag = 0 AND b.unit_type = #{type}
             <if test="statusList != null and statusList.size() > 0">
@@ -2024,7 +2030,7 @@
 
     <select id="workbenchLogisticsOrderStatisticsByDays"
             resultType="com.sckw.transport.model.vo.LogisticsOrderStatisticsVO">
-        SELECT  A.date as dateTime, COALESCE(B.num, 0) as num,IFNULL(B.totalAmount,0) AS totalAmount FROM
+        SELECT  A.date as dateTime, COALESCE(B.num, 0) as num,IFNULL(B.totalAmount,0) AS totalAmount , IFNULL(B.totalPrice,0) AS totalPrice FROM
         (
         select date_add(#{dateStart}, interval row1 DAY) date from
         (
@@ -2040,14 +2046,13 @@
         LEFT JOIN
         (
         SELECT
-<!--        <if test="type == 1">-->
-<!--            COUNT(*) num,-->
-<!--        </if>-->
-<!--        <if test="type == 1">-->
-<!--            sum(a.amount) as totalAmount ,-->
-<!--        </if>-->
         COUNT(*) num,
-        sum(a.amount) as totalAmount ,
+        CASE
+        WHEN #{totalAmount} = 1 THEN
+        sum( a.amount ) ELSE  0 end AS totalAmount,
+        CASE
+        WHEN #{totalPrice} = 2 THEN
+        sum(a.amount * IFNULL( a.price, 0 )) ELSE 0 end AS totalPrice,
         DATE_FORMAT(a.create_time, '%Y-%m-%d') date_time
         FROM kwt_logistics_order a LEFT JOIN  kwt_logistics_order_unit b ON a.id =b.l_order_id
         WHERE a.del_flag = 0 AND b.unit_type = b.unit_type = #{type}