物流生成单据号异常事务处理

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -1,13 +1,11 @@
 package com.sckw.mongo.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -324,7 +322,7 @@ public class SckwWaybillOrder{
     /**
      * 装货所在地区
      */
-    private Integer loadCityCode;
+    private String loadCityCode;
 
     /**
      * 装货所属区域名称
@@ -369,7 +367,7 @@ public class SckwWaybillOrder{
     /**
      * 卸货所在地区
      */
-    private Integer unloadCityCode;
+    private String unloadCityCode;
 
     /**
      * 卸货所属区域名称

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

@@ -128,6 +128,12 @@ public class OrderDetailVO {
      * 合同编号
      */
     private String contractNo;
+
+    /**
+     * 装货地址
+     */
+    private String loadName;
+
     /**
      * 装货地址
      */
@@ -144,6 +150,10 @@ public class OrderDetailVO {
      * 装货详细地址
      */
     private String loadAddressDetail;
+    /**
+     * 装货地名
+     */
+    private String unloadName;
     /**
      * 装货详细地址
      */

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

@@ -1629,6 +1629,8 @@ public class AcceptCarriageOrderService {
      */
     @Transactional(rollbackFor = Exception.class)
     public HttpResult addOrder(AddOrderDTO orderDTO) {
+        /**生成订单编号*/
+        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         HttpResult httpResult = ValidUtil.serviceValid(orderDTO);
         if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
             return HttpResult.error(httpResult.getMsg());
@@ -1643,8 +1645,6 @@ public class AcceptCarriageOrderService {
         }
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
-        /**生成订单编号*/
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         /**根据合同计算当前单据状态*/
         /**判断生成物流订单应生成哪一种单据状态*/
         List<Long> contractList = new ArrayList<>();

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

@@ -55,7 +55,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -339,7 +338,7 @@ public class ConsignOrderService {
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
                             .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO));
                     //合理损耗
-                    BigDecimal loss = order.getLoss();
+                    BigDecimal loss = order.getLoss() == null ? new BigDecimal("0.00") : order.getLoss();
                     /**亏吨量/吨->装货量-卸货量
                      * 合理损耗值=装货量*合理损耗
                      扣亏量/吨->亏吨量-合理损耗值
@@ -708,7 +707,7 @@ public class ConsignOrderService {
      * @param id
      * @return
      */
-    public HttpResult getRejectReasonById(String id,Integer status) {
+    public HttpResult getRejectReasonById(String id, Integer status) {
         Map<String, String> map = kwtLogisticsOrderMapper.getRejectReason(id, status);
         return HttpResult.ok(map);
     }
@@ -1089,7 +1088,9 @@ public class ConsignOrderService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult addOrder(AddOrderDTO addOrderDTO) throws ParseException {
+    public HttpResult addOrder(AddOrderDTO addOrderDTO){
+        /**生成订单编号*/
+        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         HttpResult httpResult = ValidUtil.serviceValid(addOrderDTO);
         if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
             return HttpResult.error(httpResult.getMsg());
@@ -1104,8 +1105,6 @@ public class ConsignOrderService {
         }
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
-        /**生成订单编号*/
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         /**根据合同计算当前单据状态*/
         /**判断生成物流订单应生成哪一种单据状态*/
         List<Long> contractList = new ArrayList<>();
@@ -1196,7 +1195,7 @@ public class ConsignOrderService {
      * @param orderStatus 订单状态
      * @param lOrderNo    主体订单编号
      */
-    private void saveConsignLogisticsOrder(AddOrderDTO addOrderDTO, Long lOrderId, Integer orderStatus, String lOrderNo) throws ParseException {
+    private void saveConsignLogisticsOrder(AddOrderDTO addOrderDTO, Long lOrderId, Integer orderStatus, String lOrderNo) {
         KwtLogisticsOrder order = new KwtLogisticsOrder();
         order.setId(lOrderId);
         order.setEntId(LoginUserHolder.getEntId());

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

@@ -561,9 +561,9 @@ public class KwtWaybillOrderService {
     }
 
     /**
-     * @param orderId    订单ID
+     * @param orderId     订单ID
      * @param addressType 地址类型（1装货地址、2卸货地址）
-     * @param type 订单类型（1物流订单、2车辆运单）
+     * @param type        订单类型（1物流订单、2车辆运单）
      * @desc 获取订单地址信息
      * @author zk
      * @date 2023/7/20
@@ -724,7 +724,7 @@ public class KwtWaybillOrderService {
         order.setLoadType(loadAddress.getType());
         order.setLoadContacts(loadAddress.getContacts());
         order.setLoadPhone(loadAddress.getPhone());
-        order.setLoadCityCode(loadAddress.getCityCode());
+        order.setLoadCityCode(loadAddress.getCityCode() == null ? null : String.valueOf(loadAddress.getCityCode()));
         order.setLoadCityName(loadAddress.getCityName());
         order.setLoadDetailAddress(loadAddress.getDetailAddress());
         order.setLoadLat(loadAddress.getLat());
@@ -733,7 +733,7 @@ public class KwtWaybillOrderService {
         order.setUnloadType(unloadAddress.getType());
         order.setUnloadContacts(unloadAddress.getContacts());
         order.setUnloadPhone(unloadAddress.getPhone());
-        order.setUnloadCityCode(unloadAddress.getCityCode());
+        order.setUnloadCityCode(unloadAddress.getCityCode() == null ? null : String.valueOf(unloadAddress.getCityCode()));
         order.setUnloadCityName(unloadAddress.getCityName());
         order.setUnloadDetailAddress(unloadAddress.getDetailAddress());
         order.setUnloadLat(unloadAddress.getLat());
@@ -881,7 +881,7 @@ public class KwtWaybillOrderService {
         return HttpResult.ok("车辆运单撤回成功!");
     }
 
-    public HttpResult cancelSendCarV1(List<Long> ids){
+    public HttpResult cancelSendCarV1(List<Long> ids) {
         /**1数据校验**/
         if (CollectionUtils.isEmpty(ids)) {
             return HttpResult.error("请选择需要撤回的车辆运单！");
@@ -893,7 +893,7 @@ public class KwtWaybillOrderService {
             if (order != null) {
                 //3待接单的车辆运单才能撤回
                 if (order.getStatus() != CarWaybillEnum.PENDING_ORDER.getCode()) {
-                    return HttpResult.error("运单"+order.getWOrderNo()+"当前状态已不能撤回！");
+                    return HttpResult.error("运单" + order.getWOrderNo() + "当前状态已不能撤回！");
                 }
             } else {
                 //循环派车信息
@@ -935,7 +935,7 @@ public class KwtWaybillOrderService {
 
         /**5Mongodb数据更新**/
         //1车辆订单
-        for (KwtWaybillOrder waybillOrder:waybillOrders) {
+        for (KwtWaybillOrder waybillOrder : waybillOrders) {
             SckwWaybillOrder wOrder = new SckwWaybillOrder();
             wOrder.set_id(waybillOrder.getId());
             editSckwWaybillOrder(wOrder, waybillOrder, 2);
@@ -2142,6 +2142,7 @@ public class KwtWaybillOrderService {
 
     /**
      * 承运订单-托运订单-订单详情数据统计
+     *
      * @param orderId
      * @param type
      * @return
@@ -2160,6 +2161,7 @@ public class KwtWaybillOrderService {
 
     /**
      * 承运数据统计
+     *
      * @param orderId
      * @return
      */
@@ -2200,6 +2202,7 @@ public class KwtWaybillOrderService {
 
     /**
      * 托运数据统计
+     *
      * @param orderId
      * @return
      */

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

@@ -28,6 +28,7 @@ import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.*;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
+import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
@@ -68,6 +69,9 @@ public class LogisticsConsignmentService {
     @Resource
     private StreamBridge streamBridge;
 
+    @Autowired
+    RedisLockUtil redisLockUtil;
+
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
@@ -116,22 +120,26 @@ public class LogisticsConsignmentService {
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
         }
-        checkParamData(bo);
+        HttpResult checked = checkParamData(bo);
+        if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
+            return HttpResult.error(checked.getMsg());
+        }
         logisticsConsignmentInsert(bo);
         return HttpResult.ok();
     }
 
-    private void checkParamData(LogisticsConsignmentParam bo) {
+    private HttpResult checkParamData(LogisticsConsignmentParam bo) {
         if (!ObjectUtils.isEmpty(bo.getLoss())) {
             if (bo.getLoss().compareTo(new BigDecimal("0.00")) < 0) {
-                throw new RuntimeException("合理损耗填写时,必须大于0");
+                return HttpResult.error("合理损耗填写时,必须大于0");
             }
         }
         if (!ObjectUtils.isEmpty(bo.getGoodsPrice())) {
             if (bo.getGoodsPrice().compareTo(new BigDecimal("0.00")) < 0) {
-                throw new RuntimeException("扣亏货值填写时,必须大于0");
+                return HttpResult.error("扣亏货值填写时,必须大于0");
             }
         }
+        return HttpResult.ok();
     }
 
     /**
@@ -146,12 +154,17 @@ public class LogisticsConsignmentService {
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
         }
-        checkParamData(bo);
+        HttpResult checked = checkParamData(bo);
+        if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
+            return HttpResult.error(checked.getMsg());
+        }
         logisticsConsignmentInsert(bo);
         return HttpResult.ok();
     }
 
     void logisticsConsignmentInsert(LogisticsConsignmentParam bo) {
+        Long count = kwtLogisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, bo.getTOrderId()));
+        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "1", "0", String.valueOf(count + 1));
         OrderDetailRes tradeOrder = tradeOrderInfoService.getOrderDetailById(Long.parseLong(bo.getTOrderId()));
         if (tradeOrder == null) {
             log.error("订单id查找失败:{}", bo.getTOrderId());
@@ -177,8 +190,6 @@ public class LogisticsConsignmentService {
             order.setAmount(new BigDecimal("0.00"));
             order.setSubcontractAmount(new BigDecimal("0.00"));
         }
-        Long count = kwtLogisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, bo.getTOrderId()));
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "1", "0", String.valueOf(count + 1));
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
         Integer orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
         insertLogisticsGoods(bo, lOrderNo, orderId);
@@ -236,7 +247,7 @@ public class LogisticsConsignmentService {
             logisticsOrder.setSubcontractAmount(new BigDecimal("0.00"));
             logisticsOrder.setCarryingCapacity(new BigDecimal("0.00"));
         }
-        logisticsOrder.setLoss(bo.getLoss() == null ? null :bo.getLoss());
+        logisticsOrder.setLoss(bo.getLoss() == null ? null : bo.getLoss());
         logisticsOrder.setLossUnit(bo.getLossUnit());
         logisticsOrder.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
         BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);

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

@@ -184,11 +184,13 @@ public class TransportCommonService {
         orderDetailVO.setPrice(logisticsOrder.getPrice() == null ? null : String.valueOf(logisticsOrder.getPrice()));
         orderDetailVO.setLoss(logisticsOrder.getLoss() == null ? null : String.valueOf(logisticsOrder.getLoss()));
         orderDetailVO.setDeduct(logisticsOrder.getGoodsPrice() == null ? null : String.valueOf(logisticsOrder.getGoodsPrice()));
-        orderDetailVO.setLoadAddress(loadOrderAddress.getName());
+        orderDetailVO.setLoadName(loadOrderAddress.getName());
+        orderDetailVO.setLoadAddress(loadOrderAddress.getCityName());
         orderDetailVO.setLoadContacts(loadOrderAddress.getContacts());
         orderDetailVO.setLoadPhone(loadOrderAddress.getPhone());
         orderDetailVO.setLoadAddressDetail(loadOrderAddress.getDetailAddress());
-        orderDetailVO.setUnloadAddress(unloadOrderAddress.getName());
+        orderDetailVO.setUnloadName(unloadOrderAddress.getName());
+        orderDetailVO.setUnloadAddress(unloadOrderAddress.getCityName());
         orderDetailVO.setUnloadContacts(unloadOrderAddress.getContacts());
         orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
         orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
@@ -231,6 +233,7 @@ public class TransportCommonService {
                 }
             }
         }
+        orderDetailVO.setRemark(logisticsOrder.getRemark());
         return orderDetailVO;
     }
 

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

@@ -0,0 +1,201 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 10.10.10.230:8848
+        # 命名空间
+        namespace: sckw_lfdc
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: 10.10.10.230:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw_lfdc
+        # 共享配置
+        group: sckw-service-platform
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true
+#spring:
+#  rabbitmq:
+#    username: admin
+#    password: admin
+#    host: 10.10.10.138
+#    port: 5672
+#    virtual-host: /
+#  cloud:
+#    nacos:
+#      discovery:
+#        # 服务注册地址
+##        server-addr: 47.108.162.14:8848
+#        server-addr: 127.0.0.1:8848
+#        # 命名空间
+#        namespace: sckw-service-platform-dev
+#        # nacos用户名
+#        username: nacos
+#        # nacos密码
+#        password: nacos
+#        # 共享配置
+#        group: sckw-service-platform
+#        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
+#      #        weight: 100
+#      config:
+#        # 配置中心地址
+##        server-addr: 47.108.162.14:8848
+#        server-addr: 127.0.0.1:8848
+#        # 配置文件格式
+#        file-extension: yaml
+#        # 命名空间
+#        namespace: sckw-service-platform-dev
+#        # 共享配置
+#        group: sckw-service-platform
+#        enabled: true
+#    stream:
+#      bindings:
+#        sckwSms-out-0:
+#          destination: sckw-sms
+#          content-type: application/json
+#          default-binder: defaultRabbit
+#          group: sckw
+#        sckwMessage-out-0:
+#          destination: sckw-message
+#          content-type: application/json
+#          default-binder: defaultRabbit
+#          group: sckw
+#      binders:
+#        defaultRabbit:
+#          type: rabbit
+#          environment:
+#            spring:
+#              rabbitmq:
+#                virtual-host: /
+#                host: 39.104.134.114
+#                port: 5672
+#                username: wph
+#                password: Yy123...
+#    # sentinel降级配置
+#    sentinel:
+#      transport:
+#        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+#        port: 8719  #默认8719端口,如果被占用会向上扫描。
+#        #控制台地址
+#        #dashboard: 47.108.162.14:19527
+#        dashboard: 127.0.0.1:19527
+#      log:
+#        #日志路径
+#        dir: logs/sentinel
+#        # 默认将调用链路收敛，导致链路流控效果无效
+#        web-context-unify: false
+#        #持久化nacos配置中
+#      datasource:
+#        #sentinel-rule: # 唯一名称可自定义
+#        #限流
+#        flow:
+#          nacos:
+#            # 设置Nacos的连接地址、命名空间和Group ID
+#            namespace:  sckw-service-platform-dev
+#            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+#            # username: ${spring.cloud.nacos.discovery.username}
+#            # password: ${spring.cloud.nacos.discovery.password}
+#            # 设置Nacos中配置文件的命名规则
+#            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+#            data-id:  sckw-file-sentinel-flow-rules
+#            group-id: SENTINEL_GROUP
+#            data-type: json
+#            # 必填的重要字段，指定当前规则类型是"限流"
+#            rule-type: flow
+#        #熔断
+#        degrade:
+#          nacos:
+#            namespace:  sckw-service-platform-dev
+#            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#            #data-id: ${spring.application.name}-sentinel-degrade-rules
+#            data-id: sckw-file-sentinel-degrade-rules
+#            group-id: SENTINEL_GROUP
+#            #熔断
+#            rule-type: degrade
+#      #取消慢加载
+#      eager: true
+#  datasource:
+#    dynamic:
+#      seata: true
+##sfs:
+##  nacos:
+##    server-addr: 127.0.0.1:8848
+##    namespace: 967df0d8-156b-441a-a5ab-615b4a865168
+##    group: MY_GROUP
+##
+##    nacos:
+##      server-addr: ${sfs.nacos.server-addr}
+##      namespace: ${sfs.nacos.namespace}
+##      group: ${sfs.nacos.group}
+#
+##seata:
+##  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+##  # 事务分组名称，要和服务端对应
+##  tx-service-group: sckw-transport-seata-service-group
+##  service:
+##    vgroup-mapping:
+##      # key是事务分组名称 value要和服务端的机房名称保持一致
+##      sckw-transport-seata-service-group: default
+##  registry:
+##    # 指定nacos作为注册中心
+##    type: nacos
+##    nacos:
+##      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+##      #server-addr: 47.108.162.14:8848
+##      namespace: ${spring.cloud.nacos.discovery.namespace}
+##      #      group: SEATA_GROUP
+##      group: ${spring.cloud.nacos.discovery.group}
+##  config:
+##    # 指定nacos作为配置中心
+##    type: nacos
+##    nacos:
+##      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+##      #server-addr: 47.108.162.14:8848
+##      namespace: ${spring.cloud.nacos.discovery.namespace}
+##      group: ${spring.cloud.nacos.discovery.group}
+##  application-id: ${spring.application.name}
+##  #  当前不生效，使用驼峰
+##  enabled: true
+##  #  enable-auto-data-source-proxy: false
+##  enableAutoDataSourceProxy: false
+##  application-id: sckw-seata-file
+## 支持feign对sentinel支持
+##feign:
+##  sentinel:
+##    enabled: true
+#
+#dubbo:
+#  application:
+#    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
+#    name: transport-dubbo-server
+#  protocol:
+#    name: dubbo
+#    port: -1
+#    prefer-serialization: java
+#  registry:
+#    # 配置dubbo的注册中心为nacos
+#    address: nacos://${spring.cloud.nacos.discovery.server-addr}
+#    group: ${spring.cloud.nacos.config.group}
+#    protocol: nacos
+#    #use-as-config-center: false
+#    #use-as-metadata-center: false
+#aliyun:
+#  oss:
+#    endpoint: oss-cn-chengdu.aliyuncs.com
+#    accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
+#    secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
+#    bucket: kaiwu-saas
+#links:
+#isBindManyRole:
+#mybatis-plus:
+#  configuration:
+#    # 是否将sql打印到控制面板(该配置会将sql语句和查询的结果都打印到控制台)
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -5,8 +5,8 @@ spring:
   application:
     name: sckw-transport
   profiles:
-    active: ${DEPLOY_MODE:dev}
-#    active: @profiles.active@
+#    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

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

@@ -799,6 +799,9 @@
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
                 and c.city_code = #{query.unloadAddressCode}
             </if>
+            <if test="query.billingMode != null and query.billingMode != ''">
+                and a.billing_mode =#{query.billingMode}
+            </if>
         </where>
         ORDER BY a.id DESC
         <!--               ,a.create_time-->