Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/GlobalSystemExceptionHandler.java

@@ -28,12 +28,6 @@ public class GlobalSystemExceptionHandler {
         log.error("业务异常:", e);
         return HttpResult.error(e.getCode(), e.getMessage());
     }
-    @ExceptionHandler(value = SuccessBusinessException.class)
-    @ResponseBody
-    public HttpResult handlerRuntimeException(SuccessBusinessException e) {
-        log.error("状态码为正常的业务:", e);
-        return HttpResult.error(HttpStatus.SUCCESS_CODE, e.getMessage());
-    }
 
     @ExceptionHandler(value = RuntimeException.class)
     @ResponseBody

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/SuccessBusinessException.java

@@ -1,35 +0,0 @@
-package com.sckw.core.exception;
-
-import lombok.Getter;
-
-import java.io.Serial;
-
-/**
- * 状态码为正常的业务异常
- *
- * @Author yzc
- * @Description 自定义业务异常
- * @createTime 2023年06月08日 10:05:00
- */
-@Getter
-public class SuccessBusinessException extends RuntimeException {
-    @Serial
-    private static final long serialVersionUID = 6955463132739776238L;
-    /**
-     * 异常信息
-     **/
-    private final String msg;
-    private Object[] param;
-
-    public SuccessBusinessException(String msg) {
-        super(msg);
-        this.msg = msg;
-    }
-
-    public SuccessBusinessException(String msg, Object... param) {
-        super(msg);
-        this.msg = msg;
-        this.param = param;
-    }
-
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletController.java

@@ -29,7 +29,7 @@ public class WalletController {
      * @return
      */
     @PostMapping("createUser")
-    public HttpResult createUser(CreateUserReq createUserReq) {
+    public HttpResult createUser(@RequestBody @Valid CreateUserReq createUserReq) {
         return HttpResult.ok(walletService.createUser(createUserReq));
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/MemberCreate.java

@@ -22,6 +22,9 @@ public class MemberCreate implements Serializable {
     private String legalName;
     @JSONField(name = "legalPhone")
     private String legalPhone;
+    /**
+     * 法人身份证号
+     */
     @JSONField(name = "legalIds")
     private String legalIds;
     @JSONField(name = "accountNo")

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/PrePayWalletVo.java

@@ -1,11 +1,13 @@
 package com.sckw.payment.model.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 预付预收数据
@@ -67,10 +69,9 @@ public class PrePayWalletVo implements Serializable {
      */
     @JSONField(name = "total_ap_money")
     private String totalApMoney;
-    /**
-     * 相关操作
-     */
-    private String action;
+
+    @JsonFormat(timezone = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpWalletRelationService.java

@@ -2,6 +2,7 @@ package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.dao.KwpWalletRelationMapper;
@@ -97,5 +98,13 @@ public class KwpWalletRelationService {
         relationMapper.insert(kwpWalletRelation);
     }
 
+    public KwpWalletRelation query(WalletRelationDto walletRelationDto) {
+        LambdaQueryWrapper<KwpWalletRelation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwpWalletRelation::getEntId, walletRelationDto.entId())
+                .eq(KwpWalletRelation::getUid, walletRelationDto.uid())
+                .eq(KwpWalletRelation::getDelFlag, Global.UN_DELETED).last("limit 1");
+        return relationMapper.selectOne(wrapper);
+    }
+
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletOrderService.java

@@ -0,0 +1,61 @@
+package com.sckw.payment.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.payment.dao.KwpWalletRefundMapper;
+import com.sckw.payment.dao.KwpWalletTransferMapper;
+import com.sckw.payment.model.KwpWalletRefund;
+import com.sckw.payment.model.constant.RefundEnum;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 钱包订单相关业务
+ *
+ * @author xucaiqin
+ * @date 2023-09-18 19:20:02
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class WalletOrderService {
+    private final KwpWalletRefundMapper kwpWalletRefundMapper;
+    private final KwpWalletTransferMapper kwpWalletTransferMapper;
+
+    /**
+     * 预付、预收 查询退款中金额
+     *
+     * @param change  true-预收，需要转换双方企业
+     * @param channel huifu-汇付渠道
+     */
+    public KwpWalletRefund query(boolean change, String uid, String filter, String channel) {
+        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
+        //预收时，切换预收预付的双方人员
+        if (change) {
+            wrapper.eq(KwpWalletRefund::getUid, filter).eq(KwpWalletRefund::getFilter, uid);
+        } else {
+            wrapper.eq(KwpWalletRefund::getUid, uid).eq(KwpWalletRefund::getFilter, filter);
+        }
+        wrapper.eq(KwpWalletRefund::getChannel, channel)
+                .eq(KwpWalletRefund::getStatus, RefundEnum.REFUNDING.getStatus())
+                .orderByDesc(KwpWalletRefund::getCreateTime).last("limit 1");
+        return kwpWalletRefundMapper.selectOne(wrapper);
+    }
+
+    /**
+     * 查询退款中的订单
+     *
+     * @param uid
+     * @param filter
+     * @param channel
+     * @return
+     */
+    public KwpWalletRefund queryOne(String uid, String filter, String channel,RefundEnum refundEnum) {
+        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwpWalletRefund::getUid, uid).eq(KwpWalletRefund::getFilter, filter);
+        wrapper.eq(KwpWalletRefund::getChannel, channel)
+                .eq(KwpWalletRefund::getStatus, refundEnum.getStatus())
+                .orderByDesc(KwpWalletRefund::getCreateTime).last("limit 1");
+        return kwpWalletRefundMapper.selectOne(wrapper);
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
-import com.sckw.core.exception.SuccessBusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.CollectionUtils;
@@ -20,11 +19,13 @@ import com.sckw.payment.dao.KwpWalletRefundMapper;
 import com.sckw.payment.dao.KwpWalletTransferMapper;
 import com.sckw.payment.job.AsyncPool;
 import com.sckw.payment.model.KwpWalletRefund;
+import com.sckw.payment.model.KwpWalletRelation;
 import com.sckw.payment.model.KwpWalletTransfer;
 import com.sckw.payment.model.constant.RefundEnum;
 import com.sckw.payment.model.constant.TransferEnum;
 import com.sckw.payment.model.constant.WalletChannelEnum;
 import com.sckw.payment.model.dto.WalletInfoDto;
+import com.sckw.payment.model.dto.WalletRelationDto;
 import com.sckw.payment.model.dto.common.BusinessNo;
 import com.sckw.payment.model.dto.page.CashPage;
 import com.sckw.payment.model.dto.page.PrePayWalletPage;
@@ -36,6 +37,7 @@ import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.EntCertificateResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -63,6 +65,7 @@ import java.util.stream.Collectors;
 public class WalletService {
     private final PayCenterService payCenterService;
     private final KwpWalletRelationService walletRelationService;
+    private final WalletOrderService walletOrderService;
     private final KwpWalletRefundMapper kwpWalletRefundMapper;
     private final KwpWalletTransferMapper kwpWalletTransferMapper;
     private final RedisLockUtil redisLockUtil;
@@ -156,21 +159,11 @@ public class WalletService {
      */
     private void refundMoney(PrePayWallet prePayWallet, PrePayWalletVo prePayWalletVo, boolean change) {
         DecimalFormat df = new DecimalFormat("0.00");
-        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
-        //预收时，切换预收预付的双方人员
-        if (change) {
-            wrapper.eq(KwpWalletRefund::getUid, prePayWallet.getFilter()).eq(KwpWalletRefund::getFilter, prePayWallet.getUid());
-        } else {
-            wrapper.eq(KwpWalletRefund::getUid, prePayWallet.getUid()).eq(KwpWalletRefund::getFilter, prePayWallet.getFilter());
-        }
-        wrapper.eq(KwpWalletRefund::getChannel, prePayWallet.getChannel()).orderByDesc(KwpWalletRefund::getCreateTime).last("limit 1");
-        KwpWalletRefund kwpWalletRefund = kwpWalletRefundMapper.selectOne(wrapper);
+        KwpWalletRefund kwpWalletRefund = walletOrderService.query(change, prePayWallet.getUid(), prePayWallet.getFilter(), prePayWallet.getChannel());
         if (Objects.nonNull(kwpWalletRefund)) {
             prePayWalletVo.setRefundApMoney(df.format(kwpWalletRefund.getActualMoney()));
-            prePayWalletVo.setAction(RefundEnum.getDesc(kwpWalletRefund.getStatus()));
         } else {
             prePayWalletVo.setRefundApMoney("0.00");
-            prePayWalletVo.setAction("");
         }
     }
 
@@ -181,9 +174,7 @@ public class WalletService {
      */
     private void refundMoney2(FundVo fundVo) {
         DecimalFormat df = new DecimalFormat("0.00");
-        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwpWalletRefund::getUid, fundVo.getUid()).eq(KwpWalletRefund::getFilter, fundVo.getFilter()).eq(KwpWalletRefund::getChannel, fundVo.getChannel()).eq(KwpWalletRefund::getStatus, RefundEnum.REFUNDING.getStatus()).last("limit 1");
-        KwpWalletRefund kwpWalletRefund = kwpWalletRefundMapper.selectOne(wrapper);
+        KwpWalletRefund kwpWalletRefund = walletOrderService.queryOne(fundVo.getUid(), fundVo.getFilter(), fundVo.getChannel(), RefundEnum.REFUNDING);
         if (Objects.nonNull(kwpWalletRefund)) {
             fundVo.setRefundMoney(df.format(kwpWalletRefund.getActualMoney()));
         } else {
@@ -260,8 +251,7 @@ public class WalletService {
         Long entId = LoginUserHolder.getEntId();
         String uid = walletRelationService.getRelation(entId);
         if (StringUtils.isBlank(uid)) {
-            throw new SuccessBusinessException("暂未开通电子钱包");
-//            return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", "-", 0, new ArrayList<>());
+            return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", "-", 0, new ArrayList<>());
         }
         //钱包总览信息
         R<WalletOverview> wallet = payCenterService.general(uid);
@@ -327,28 +317,26 @@ public class WalletService {
      * @return
      */
     public Object channel() {
-        Long entId = LoginUserHolder.getEntId();
-        String uid = walletRelationService.getRelation(entId);
-        if (StringUtils.isBlank(uid)) {
-            throw new BusinessException("暂未开通电子钱包");
-        }
-        R<WalletOverview> wallet = payCenterService.general(uid);
-        if (wallet.getStatus()) {
-            WalletOverview data = wallet.getData();
-            //已开通的渠道
-            List<String> channels = data.getChannels();
+        String uid = walletRelationService.getRelation(LoginUserHolder.getEntId());
+        if (StringUtils.isNotBlank(uid)) {
+            R<WalletOverview> wallet = payCenterService.general(uid);
+            if (wallet.getStatus()) {
+                WalletOverview data = wallet.getData();
+                //已开通的渠道
+                List<String> channels = data.getChannels();
 
-            List<ChannelDetail> res = new ArrayList<>();
-            for (WalletChannelEnum value : WalletChannelEnum.channelEnumList()) {
-                ChannelDetail channelDetail = new ChannelDetail();
-                channelDetail.setChannel(value.getChannel());
-                channelDetail.setName(value.getDesc());
-                channelDetail.setMoney("-");
-                channelDetail.setTotalMoney("-");
-                channelDetail.setOpenFlag(channels.contains(value.getChannel()));
-                res.add(channelDetail);
+                List<ChannelDetail> res = new ArrayList<>();
+                for (WalletChannelEnum value : WalletChannelEnum.channelEnumList()) {
+                    ChannelDetail channelDetail = new ChannelDetail();
+                    channelDetail.setChannel(value.getChannel());
+                    channelDetail.setName(value.getDesc());
+                    channelDetail.setMoney("-");
+                    channelDetail.setTotalMoney("-");
+                    channelDetail.setOpenFlag(channels.contains(value.getChannel()));
+                    res.add(channelDetail);
+                }
+                return res;
             }
-            return res;
         }
         return WalletChannelEnum.channelEnumList().stream().map(a -> {
             ChannelDetail channelDetail = new ChannelDetail();
@@ -972,12 +960,6 @@ public class WalletService {
      * @return
      */
     public Object applyRefund(RefundReq refundReq) {
-        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwpWalletRefund::getChannel, refundReq.getChannel()).eq(KwpWalletRefund::getUid, refundReq.getUid()).eq(KwpWalletRefund::getFilter, refundReq.getFilter()).eq(KwpWalletRefund::getStatus, RefundEnum.APPLY.getStatus()).last("limit 1");
-        KwpWalletRefund kwpWalletRefund = kwpWalletRefundMapper.selectOne(wrapper);
-        if (Objects.nonNull(kwpWalletRefund)) {
-            throw new BusinessException("存在未完成的退款订单");
-        }
         ChannelEnum channelEnum = ChannelEnum.getByChannel(refundReq.getChannel());
         if (Objects.isNull(channelEnum)) {
             throw new BusinessException("支付通道不存在");
@@ -1014,10 +996,7 @@ public class WalletService {
      * @return
      */
     public Object launchRefund(RefundReq refundReq) {
-        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwpWalletRefund::getChannel, refundReq.getChannel());
-        wrapper.eq(KwpWalletRefund::getUid, refundReq.getUid()).eq(KwpWalletRefund::getFilter, refundReq.getFilter()).eq(KwpWalletRefund::getStatus, RefundEnum.APPLY.getStatus()).last("limit 1");
-        KwpWalletRefund kwpWalletRefund = kwpWalletRefundMapper.selectOne(wrapper);
+        KwpWalletRefund kwpWalletRefund = walletOrderService.queryOne(refundReq.getUid(), refundReq.getFilter(), refundReq.getChannel(), RefundEnum.APPLY);
         if (Objects.isNull(kwpWalletRefund)) {
             throw new BusinessException("未找到待完成的退款订单");
         }
@@ -1125,11 +1104,6 @@ public class WalletService {
      */
     public Object createUser(CreateUserReq createUserReq) {
         Long entId = LoginUserHolder.getEntId();
-        String uid = walletRelationService.getRelation(entId);
-        if (StringUtils.isBlank(uid)) {
-            throw new BusinessException("您暂未开通电子钱包");
-        }
-        //字典
         ChannelEnum channelEnum = ChannelEnum.getByChannel(createUserReq.getChannel());
         if (Objects.isNull(channelEnum)) {
             throw new BusinessException("支付通道不存在");
@@ -1139,22 +1113,34 @@ public class WalletService {
             throw new BusinessException("未找到企业信息");
         }
         MemberCreate memberCreate = new MemberCreate();
+        List<EntCertificateResDto> certificateInfo = entCacheResDto.getCertificateInfo();
+        Map<Integer, String> certMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(certificateInfo)) {
+            certMap = certificateInfo.stream().collect(Collectors.toMap(EntCertificateResDto::getType, EntCertificateResDto::getCode, (a, b) -> a));
+        }
         memberCreate.setCompanyName(entCacheResDto.getFirmName());
-        memberCreate.setLicense(entCacheResDto.getBusiness());
-        memberCreate.setLegalName("");
-        memberCreate.setLegalPhone("");
-        memberCreate.setLegalIds("");
+        memberCreate.setLicense(certMap.get(3));
+        memberCreate.setLegalName(entCacheResDto.getLegalName());
+        memberCreate.setLegalPhone(entCacheResDto.getLegalPhone());
+        //法人身份证号
+        memberCreate.setLegalIds(certMap.get(2));
         memberCreate.setAccountNo("");
         memberCreate.setParentBankName("");
         memberCreate.setUnionBank("");
         memberCreate.setBankName("");
-        memberCreate.setChannel("");
+        memberCreate.setChannel(createUserReq.getChannel());
         //开通用户
         R<MemberRes> memberResR = payCenterService.memberIndex(memberCreate);
         if (!memberResR.getStatus()) {
             throw new BusinessException(StringUtils.isNotBlank(memberResR.getMsg()) ? memberResR.getMsg() : "开户失败");
         }
-        return memberResR.getData();
+        MemberRes data = memberResR.getData();
+        WalletRelationDto walletRelationDto = new WalletRelationDto(entId, data.getUid());
+        KwpWalletRelation query = walletRelationService.query(walletRelationDto);
+        if (Objects.isNull(query)) {
+            walletRelationService.save(walletRelationDto);
+        }
+        return data;
     }
 
     /**

sckw-modules/sckw-payment/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/pom.xml

@@ -65,6 +65,11 @@
             <version>1.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-payment-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.sckw</groupId>
             <artifactId>sckw-common-seata</artifactId>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -386,10 +386,10 @@ public class AcceptCarriageOrderController {
 
     /**
      * 工作台-承运业务统计
-     *
+     * @param dateType 1代表周 2代表月
      * @return
      */
-    @RequestMapping(value = "/workbenchStatistics", method = RequestMethod.GET)
+    @RequestMapping(value = "/workbenchStatisticsByAcceptCarriage", method = RequestMethod.GET)
     public HttpResult workbenchStatistics(@RequestParam("dateType") @NotBlank(message = "类型不能为空") String dateType) {
         log.info("工作台-承运业务统计 {}", dateType);
         try {

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

@@ -12,7 +12,6 @@ import com.sckw.transport.model.vo.execlVo.AcceptCarriageOrderExcelVo;
 import com.sckw.transport.model.vo.AcceptCarriageOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -151,7 +150,8 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      * @desc 查询分包物流订单
      * @author zk
      * @date 2023/7/20
-     **/
+     *
+     * @return*/
     List<KwtLogisticsOrder> findLogisticsOrder(Map params);
 
     /**
@@ -441,4 +441,12 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
                                                            @Param("userIds") List<Long> userIds,
                                                            @Param("idsList") List<Long> idsList
     );
+
+    /**
+     * @param params {lOrderId 物流订单id, tOrderId 贸易订单id, upperlOrderId 下级分包物流订单, belowlOrderId 所属上级分包, status 状态}
+     * @desc 统计物流订单
+     * @author zk
+     * @date 2023/9/18
+     **/
+    LogisticsCountVo findLogisticsOrderCount(Map<String, Object> params);
 }

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

@@ -83,7 +83,7 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @author zk
      * @date 2023/7/31
      **/
-    WaybillCountVo findWaybillOrderCount(Map params);
+    WaybillCountVo findWaybillOrderCount(Map<String, Object> params);
 
     /**
      * @param driverId 司机ID

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

@@ -0,0 +1,203 @@
+package com.sckw.transport.model.vo;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * desc 物流订单层级关系
+ * author zk
+ * date 2023/9/18 0018
+ */
+@Data
+public class KwtLogisticsOrderTreeVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 物流订单类型（1 贸易订单生成物流订单、2 自建物流订单）
+     */
+    private String type;
+
+    /**
+     * 交易订单id（kwo_trade_order）
+     */
+    private Long tOrderId;
+
+    /**
+     * 交易订单编号（kwo_trade_order）
+     */
+    private String tOrderNo;
+
+    /**
+     * 物流订单编号
+     */
+    private String lOrderNo;
+
+    /**
+     * 分包上级物流订单id
+     */
+    private Long pid;
+
+    /**
+     * 分包所有物流订单id
+     */
+    private String pids;
+
+    /**
+     * 当前单据所属等级
+     */
+    private String level;
+
+    /**
+     * 结算周期(周结、月结、季结)
+     */
+    private Long settlementCycle;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+
+    /**
+     * 运价
+     */
+    private BigDecimal price;
+
+    /**
+     * 运价方式(元/吨、元/车）
+     */
+    @Min(value = 0,message = "运价方式类型不能大于等于{value}")
+    @Max(value = 4,message = "运价方式类型不能大于等于{value}")
+    private Long priceType;
+
+    /**
+     * 已委托量
+     */
+    @Digits(integer = 10,fraction = 2,message = "委托量格式不正确")
+    @DecimalMin(value = "0.00",message = "委托量不能小于{value}")
+    private BigDecimal amount;
+
+    /**
+     * 单位（吨、方、箱、件）
+     */
+    private String unit;
+
+    /**
+     * 合理损耗
+     */
+    private BigDecimal loss;
+
+    /**
+     * 合理损耗单位(‰/kG)
+     */
+    private String lossUnit;
+
+    /**
+     * 商品价值（扣亏货值）
+     */
+    private BigDecimal goodsPrice;
+
+    /**
+     * 商品价值（扣亏货值）单位
+     */
+    private String goodsPriceUnit;
+
+    /**
+     * 计划开始日期
+     */
+    private LocalDate startTime;
+
+    /**
+     * 计划结束日期
+     */
+    private LocalDate endTime;
+
+    /**
+     * 分包量
+     */
+    private BigDecimal subcontractAmount;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 卸货量
+     */
+    private BigDecimal unloadAmount;
+
+    /**
+     * 装货量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 忽略剩余量
+     */
+    private BigDecimal ignoreAmount;
+
+    /**
+     * 亏吨量(装货量-卸货量)
+     */
+    private BigDecimal deficitAmount;
+
+    /**
+     * 亏吨扣款
+     */
+    private BigDecimal deficitPrice;
+
+    /**
+     * 卸货-履约量（自己+下游承运总卸货量）
+     */
+    private BigDecimal totalUnloadAmount;
+
+    /**
+     * 装货-履约量（自己+下游承运总装货量）
+     */
+    private BigDecimal totalLoadAmount;
+
+    /**
+     * 实际开始时间（装货）
+     */
+    private Date loadTime;
+
+    /**
+     * 实际结束时间（卸货）
+     */
+    private Date unloadTime;
+
+    /**
+     * 付款方式(预付款、线下支付、第三方支付）
+     */
+    private Long payment;
+
+    /**
+     * 发票税率（%）
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status;
+
+    private List<KwtLogisticsOrderTreeVo> children;
+}

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

@@ -0,0 +1,55 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * desc 物流订单统计
+ * author zk
+ * date 2023/9/18 0018
+ */
+@Data
+public class LogisticsCountVo {
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 装货量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 卸货量
+     */
+    private BigDecimal unloadAmount;
+
+    /**
+     * 亏吨量
+     */
+    private BigDecimal deficitAmount;
+
+    /**
+     * 装货时间（第一单车辆运单装货时间）
+     */
+    private Date loadTime;
+
+    /**
+     * 卸货时间（最后一单车辆运单卸货时间）
+     */
+    private Date unloadTime;
+
+    /**
+     * 装货量
+     */
+    private BigDecimal totalLoadAmount;
+
+    /**
+     * 卸货量
+     */
+    private BigDecimal totalUnloadAmount;
+}

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

@@ -0,0 +1,39 @@
+package com.sckw.transport.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lfdc
+ * @description 工作台-统计承运量
+ * @date 2023-09-18 18:09:06
+ */
+@Data
+public class StatisticsAmountVO implements Serializable {
+    /**
+     * 承运量/托运量
+     */
+    @JsonProperty("amount")
+    private BigDecimal amount;
+
+    /**
+     * 环比
+     */
+    @JsonProperty("chainRatio")
+    private String chainRatio;
+
+    /**
+     * 1 增长 2下降
+     */
+    @JsonProperty("flag")
+    private Integer flag;
+
+    /**
+     * 环比上次承运量
+     */
+    @JsonProperty("lastAmount")
+    private BigDecimal lastAmount;
+}

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

@@ -0,0 +1,34 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lfdc
+ * @description 工作台-统计未履约量
+ * @date 2023-09-18 18:09:06
+ */
+@Data
+public class StatisticsMoneyVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 339614434734438926L;
+    /**
+     * 当月/周 金额
+     */
+    private String current;
+    /**
+     * 上月/周 金额
+     */
+    private String before;
+    /**
+     * 环比
+     */
+    private String chainRatio;
+    /**
+     * 1-增长 2-下降
+     */
+    private Integer flag;
+
+}

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

@@ -0,0 +1,18 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lfdc
+ * @description 工作台-统计承运量
+ * @date 2023-09-18 18:09:06
+ */
+@Data
+public class StatisticsResultVO implements Serializable {
+   private StatisticsWaitingAmountVO waitingAmountVO;
+   private StatisticsAmountVO amountVO;
+   private StatisticsTotalPriceVO totalPriceVO;
+   private StatisticsMoneyVO moneyVO;
+}

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

@@ -0,0 +1,39 @@
+package com.sckw.transport.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lfdc
+ * @description 工作台-总金额（费用）
+ * @date 2023-09-18 18:09:06
+ */
+@Data
+public class StatisticsTotalPriceVO implements Serializable {
+    /**
+     * 承运收入/托运费用
+     */
+    @JsonProperty("totalPrice")
+    private BigDecimal totalPrice;
+
+    /**
+     * 环比
+     */
+    @JsonProperty("chainRatio")
+    private String chainRatio;
+
+    /**
+     * 1 增长 2下降
+     */
+    @JsonProperty("flag")
+    private Integer flag;
+
+    /**
+     * 环比上次待分配量
+     */
+    @JsonProperty("lastTotalPrice")
+    private BigDecimal lastTotalPrice;
+}

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

@@ -0,0 +1,39 @@
+package com.sckw.transport.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lfdc
+ * @description 工作台-统计未履约量
+ * @date 2023-09-18 18:09:06
+ */
+@Data
+public class StatisticsWaitingAmountVO implements Serializable {
+    /**
+     * 待分配量
+     */
+    @JsonProperty("waitingAmount")
+    private BigDecimal waitingAmount;
+
+    /**
+     * 环比
+     */
+    @JsonProperty("chainRatio")
+    private String chainRatio;
+
+    /**
+     * 1 增长 2下降
+     */
+    @JsonProperty("flag")
+    private Integer flag;
+
+    /**
+     * 环比上次待分配量
+     */
+    @JsonProperty("lastWaitingAmount")
+    private BigDecimal lastWaitingAmount;
+}

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

@@ -38,6 +38,8 @@ import com.sckw.order.api.model.CompleteLogisticsOrderParam;
 import com.sckw.order.api.model.CreateOrCancelLogisticsOrderParam;
 import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.order.api.model.UnitInfoDetailRes;
+import com.sckw.payment.api.dubbo.PaymentDubboService;
+import com.sckw.payment.api.model.dto.SettlementMoney;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.enums.MessageEnum;
@@ -102,6 +104,9 @@ public class AcceptCarriageOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteManageService remoteManageService;
 
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
+    PaymentDubboService paymentDubboService;
+
     @Autowired
     public CommonService commonService;
 
@@ -2671,7 +2676,7 @@ public class AcceptCarriageOrderService {
             String lastWeekDateStart = DateUtil.getLastWeekDateStartToString(LocalDate.now(), 13);
             //结束时间
             String lastWeekDateEnd = DateUtil.getLastWeekDateEndToString(7);
-            return computeCompare(id, weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd);
+            return computeCompare(id, weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd, 2);
         } else if (String.valueOf(NumberConstant.TWO).equals(dateType)) {
 
             //本月
@@ -2688,7 +2693,7 @@ public class AcceptCarriageOrderService {
             String lastMonthDateStart = DateUtil.getBeforeMonthDateAndDaysStartToString(LocalDateTime.now(), 2, -1);
             //结束时间
             String lastMonthDateEnd = DateUtil.getBeforeMonthDateAndDaysEndToString(LocalDateTime.now(), 1, 0);
-            return computeCompare(id, monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd);
+            return computeCompare(id, monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd, 3);
         } else if (String.valueOf(NumberConstant.THREE).equals(dateType)) {
             //年
             // 获取当前日期
@@ -2714,8 +2719,9 @@ public class AcceptCarriageOrderService {
      * @param lastWeekDateEnd   环比上次结束时间
      * @return
      */
-    private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd) {
+    private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd, Integer dateType) {
         HttpResult httpResult = new HttpResult();
+        StatisticsResultVO resultVO = new StatisticsResultVO();
         //获取完结的单据-排除掉不做统计中的数据
         List<Integer> statusList = new ArrayList<>();
         statusList.add(LogisticsOrderEnum.TO_BE_PLANNED.getCode());
@@ -2743,6 +2749,83 @@ public class AcceptCarriageOrderService {
         vo.setLastEntrustAmount(lastWeek.getEntrustAmount());
         vo.setLastSubcontractAmount(lastWeek.getSubcontractAmount());
         vo.setLastTotalPrice(lastWeek.getTotalPrice());
+
+        /**计算待承运量*/
+        computeCompareWaitingAmount(resultVO,currentWeek,lastWeek);
+
+        /**承运量*/
+        computeCompareAmount(resultVO,currentWeek,lastWeek);
+
+        /**总金额（费用）*/
+        computeCompareTotalPrice(resultVO,currentWeek,lastWeek);
+
+        /**待处理的金额*/
+        SettlementMoney settlementMoney = paymentDubboService.countCarrier(id, dateType);
+        StatisticsMoneyVO moneyVO = new StatisticsMoneyVO();
+        moneyVO.setCurrent(settlementMoney.getCurrent());
+        moneyVO.setBefore(settlementMoney.getBefore());
+        moneyVO.setChainRatio(settlementMoney.getPercent());
+        moneyVO.setFlag(settlementMoney.getFlag());
+        resultVO.setMoneyVO(moneyVO);
+        httpResult.setData(resultVO);
+        return httpResult;
+    }
+
+    private void computeCompareTotalPrice(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
+        Integer flag = 1;
+        BigDecimal chainRatio = new BigDecimal("0.00");
+        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0
+                && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = new BigDecimal("0.00");
+        } else if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
+            flag = 2;
+        } else if (lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = new BigDecimal("100.00").subtract(chainRatio);
+        } else {
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+        }
+        if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
+            flag = 2;
+        }
+        StatisticsTotalPriceVO priceVO = new StatisticsTotalPriceVO();
+        priceVO.setTotalPrice(currentWeek.getTotalPrice());
+        priceVO.setChainRatio(chainRatio.abs() + "%");
+        priceVO.setFlag(flag);
+        priceVO.setLastTotalPrice(lastWeek.getTotalPrice());
+        resultVO.setTotalPriceVO(priceVO);
+    }
+
+    private void computeCompareAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
+        Integer amountFlag = 1;
+        BigDecimal amountChainRatio = new BigDecimal("0.00");
+        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0
+                && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = new BigDecimal("0.00");
+        } else if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = amountChainRatio.subtract(new BigDecimal("100.00"));
+            amountFlag = 2;
+        } else if (lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = new BigDecimal("100.00").subtract(amountChainRatio);
+        } else {
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+        }
+        if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
+            amountFlag = 2;
+        }
+
+        /**承运量*/
+        StatisticsAmountVO amountVO = new StatisticsAmountVO();
+        amountVO.setAmount(currentWeek.getAmount());
+        amountVO.setChainRatio(amountChainRatio.abs() + "%");
+        amountVO.setFlag(amountFlag);
+        amountVO.setLastAmount(lastWeek.getAmount());
+        resultVO.setAmountVO(amountVO);
+    }
+
+    private void computeCompareWaitingAmount(StatisticsResultVO resultVO,StatisticsByOrderVO currentWeek,StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
         if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0
@@ -2760,10 +2843,13 @@ public class AcceptCarriageOrderService {
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
         }
-        vo.setFlag(flag);
-        vo.setChainRatio(chainRatio.abs() + "%");
-        httpResult.setData(vo);
-        return httpResult;
+        /**待分配量*/
+        StatisticsWaitingAmountVO waitingAmountVO = new StatisticsWaitingAmountVO();
+        waitingAmountVO.setWaitingAmount(currentWeek.getWaitingAmount());
+        waitingAmountVO.setChainRatio(chainRatio.abs() + "%");
+        waitingAmountVO.setFlag(flag);
+        waitingAmountVO.setLastWaitingAmount(lastWeek.getWaitingAmount());
+        resultVO.setWaitingAmountVO(waitingAmountVO);
     }
 
     /**

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

@@ -36,6 +36,8 @@ import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.CompleteLogisticsOrderParam;
 import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.order.api.model.UnitInfoDetailRes;
+import com.sckw.payment.api.dubbo.PaymentDubboService;
+import com.sckw.payment.api.model.dto.SettlementMoney;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
@@ -99,6 +101,9 @@ public class ConsignOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteFleetService fleetService;
 
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
+    PaymentDubboService paymentDubboService;
+
     @Autowired
     public CommonService commonService;
 
@@ -1965,7 +1970,7 @@ public class ConsignOrderService {
             String lastWeekDateStart = DateUtil.getLastWeekDateStartToString(LocalDate.now(), 13);
             //结束时间
             String lastWeekDateEnd = DateUtil.getLastWeekDateEndToString(7);
-            return computeCompare(entCacheResDto.getId(), weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd);
+            return computeCompare(entCacheResDto.getId(), weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd,2);
         } else if (String.valueOf(NumberConstant.TWO).equals(dateType)) {
             //月
             //开始时间
@@ -1977,7 +1982,7 @@ public class ConsignOrderService {
             String lastMonthDateStart = DateUtil.getBeforeMonthDateAndDaysStartToString(LocalDateTime.now(), 2, -1);
             //结束时间
             String lastMonthDateEnd = DateUtil.getBeforeMonthDateAndDaysEndToString(LocalDateTime.now(), 1, 0);
-            return computeCompare(entCacheResDto.getId(), monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd);
+            return computeCompare(entCacheResDto.getId(), monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd,3);
         } else if (String.valueOf(NumberConstant.THREE).equals(dateType)) {
             //年
 
@@ -1998,8 +2003,9 @@ public class ConsignOrderService {
      * @param lastWeekDateEnd   环比上次结束时间
      * @return
      */
-    private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd) {
+    private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd,Integer dateType) {
         HttpResult httpResult = new HttpResult();
+        StatisticsResultVO resultVO = new StatisticsResultVO();
         //本周
         //排除掉不做统计中的数据
         //获取完结的单据
@@ -2007,28 +2013,28 @@ public class ConsignOrderService {
         statusList.add(LogisticsOrderEnum.HAVE_FINISHED.getCode());
         statusList.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
         statusList.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
-        StatisticsByOrderVO statistics = kwtLogisticsOrderMapper.selectAcceptCarriageFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
+        StatisticsByOrderVO currentFinish = kwtLogisticsOrderMapper.selectAcceptCarriageFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
         //获取完结中的单据
         statusList.clear();
         statusList.add(LogisticsOrderEnum.TO_BE_PLANNED.getCode());
         statusList.add(LogisticsOrderEnum.PENDING_ORDER.getCode());
         statusList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
         statusList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
-        StatisticsByOrderVO statisticsByOrderVO = kwtLogisticsOrderMapper.selectAcceptCarriageAwaitFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
+        StatisticsByOrderVO currentFinishIng= kwtLogisticsOrderMapper.selectAcceptCarriageAwaitFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
         //全部的未履约量
-        BigDecimal waitingAmount = statistics.getWaitingAmount().add(statisticsByOrderVO.getWaitingAmount());
-        BigDecimal amount = statistics.getAmount().add(statisticsByOrderVO.getAmount());
-        BigDecimal entrustAmount = statistics.getEntrustAmount().add(statisticsByOrderVO.getEntrustAmount());
-        BigDecimal subcontractAmount = statistics.getSubcontractAmount().add(statisticsByOrderVO.getSubcontractAmount());
-        BigDecimal totalPrice = statistics.getTotalPrice().add(statisticsByOrderVO.getTotalPrice());
+        BigDecimal waitingAmount = currentFinish.getWaitingAmount().add(currentFinishIng.getWaitingAmount());
+        BigDecimal amount = currentFinish.getAmount().add(currentFinishIng.getAmount());
+        BigDecimal entrustAmount = currentFinish.getEntrustAmount().add(currentFinishIng.getEntrustAmount());
+        BigDecimal subcontractAmount = currentFinish.getSubcontractAmount().add(currentFinishIng.getSubcontractAmount());
+        BigDecimal totalPrice = currentFinish.getTotalPrice().add(currentFinishIng.getTotalPrice());
 
 
-        StatisticsByOrderVO vo = new StatisticsByOrderVO();
-        vo.setWaitingAmount(waitingAmount);
-        vo.setAmount(amount);
-        vo.setEntrustAmount(entrustAmount);
-        vo.setSubcontractAmount(subcontractAmount);
-        vo.setTotalPrice(totalPrice);
+        StatisticsByOrderVO current = new StatisticsByOrderVO();
+        current.setWaitingAmount(waitingAmount);
+        current.setAmount(amount);
+        current.setEntrustAmount(entrustAmount);
+        current.setSubcontractAmount(subcontractAmount);
+        current.setTotalPrice(totalPrice);
 
         //上周
 
@@ -2052,37 +2058,113 @@ public class ConsignOrderService {
         BigDecimal lastSubcontractAmount = lastStatistics.getSubcontractAmount().add(lastStatisticsByOrderVO.getSubcontractAmount());
         BigDecimal lastTotalPrice = lastStatistics.getTotalPrice().add(lastStatisticsByOrderVO.getTotalPrice());
 
-        vo.setLastWaitingAmount(lastWaitingAmount);
-        vo.setLastAmount(lastAmount);
-        vo.setLastEntrustAmount(lastEntrustAmount);
-        vo.setLastSubcontractAmount(lastSubcontractAmount);
-        vo.setLastTotalPrice(lastTotalPrice);
+        StatisticsByOrderVO last = new StatisticsByOrderVO();
+        last.setWaitingAmount(lastWaitingAmount);
+        last.setAmount(lastAmount);
+        last.setEntrustAmount(lastEntrustAmount);
+        last.setSubcontractAmount(lastSubcontractAmount);
+        last.setTotalPrice(lastTotalPrice);
+
+        /**计算待承运量*/
+        computeCompareWaitingAmount(resultVO,current,last);
+
+        /**承运量*/
+        computeCompareAmount(resultVO,current,last);
+
+        /**总金额（费用）*/
+        computeCompareTotalPrice(resultVO,current,last);
+
+        /**待处理的金额*/
+        SettlementMoney settlementMoney = paymentDubboService.countShipper(id, dateType);
+        StatisticsMoneyVO moneyVO = new StatisticsMoneyVO();
+        moneyVO.setCurrent(settlementMoney.getCurrent());
+        moneyVO.setBefore(settlementMoney.getBefore());
+        moneyVO.setChainRatio(settlementMoney.getPercent());
+        moneyVO.setFlag(settlementMoney.getFlag());
+        resultVO.setMoneyVO(moneyVO);
+        httpResult.setData(resultVO);
+        return httpResult;
+    }
 
-        //环比计算
-        BigDecimal chainRatio = new BigDecimal("0.00");
+    private void computeCompareTotalPrice(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
-        if (waitingAmount.compareTo(new BigDecimal("0.00")) == 0
-                && lastWaitingAmount.compareTo(new BigDecimal("0.00")) == 0) {
+        BigDecimal chainRatio = new BigDecimal("0.00");
+        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0
+                && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("0.00");
-        } else if (waitingAmount.compareTo(new BigDecimal("0.00")) == 0) {
+        } else if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
             flag = 2;
-        } else if (lastWaitingAmount.compareTo(new BigDecimal("0.00")) == 0) {
+        } else if (lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("100.00").subtract(chainRatio);
         } else {
-            chainRatio = (waitingAmount.subtract(lastWaitingAmount)).divide(lastWaitingAmount, NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
                     .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
         }
-        vo.setFlag(flag);
-        vo.setChainRatio(chainRatio.abs() + "%");
-        httpResult.setData(vo);
-        return httpResult;
+        StatisticsTotalPriceVO priceVO = new StatisticsTotalPriceVO();
+        priceVO.setTotalPrice(currentWeek.getTotalPrice());
+        priceVO.setChainRatio(chainRatio.abs() + "%");
+        priceVO.setFlag(flag);
+        priceVO.setLastTotalPrice(lastWeek.getTotalPrice());
+        resultVO.setTotalPriceVO(priceVO);
     }
 
+    private void computeCompareAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
+        Integer amountFlag = 1;
+        BigDecimal amountChainRatio = new BigDecimal("0.00");
+        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0
+                && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = new BigDecimal("0.00");
+        } else if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = amountChainRatio.subtract(new BigDecimal("100.00"));
+            amountFlag = 2;
+        } else if (lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            amountChainRatio = new BigDecimal("100.00").subtract(amountChainRatio);
+        } else {
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+        }
+        if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
+            amountFlag = 2;
+        }
 
+        /**承运量*/
+        StatisticsAmountVO amountVO = new StatisticsAmountVO();
+        amountVO.setAmount(currentWeek.getAmount());
+        amountVO.setChainRatio(amountChainRatio.abs() + "%");
+        amountVO.setFlag(amountFlag);
+        amountVO.setLastAmount(lastWeek.getAmount());
+        resultVO.setAmountVO(amountVO);
+    }
+    private void computeCompareWaitingAmount(StatisticsResultVO resultVO,StatisticsByOrderVO currentWeek,StatisticsByOrderVO lastWeek) {
+        Integer flag = 1;
+        BigDecimal chainRatio = new BigDecimal("0.00");
+        if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0
+                && lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = new BigDecimal("0.00");
+        } else if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
+            flag = 2;
+        } else if (lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
+            chainRatio = new BigDecimal("100.00").subtract(chainRatio);
+        } else {
+            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+        }
+        if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
+            flag = 2;
+        }
+        /**待分配量*/
+        StatisticsWaitingAmountVO waitingAmountVO = new StatisticsWaitingAmountVO();
+        waitingAmountVO.setWaitingAmount(currentWeek.getWaitingAmount());
+        waitingAmountVO.setChainRatio(chainRatio.abs() + "%");
+        waitingAmountVO.setFlag(flag);
+        waitingAmountVO.setLastWaitingAmount(lastWeek.getWaitingAmount());
+        resultVO.setWaitingAmountVO(waitingAmountVO);
+    }
     /**
      * 工作台-物流运输数据统计
      *

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

@@ -34,6 +34,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.vo.LogisticsCountVo;
 import com.sckw.transport.model.vo.UserInfoVo;
 import com.sckw.transport.model.vo.WaybillCountVo;
 import com.sckw.transport.model.vo.WaybillOrderDriverVo;
@@ -1069,6 +1070,52 @@ public class KwtWaybillOrderService {
         return HttpResult.ok("车辆运单撤回成功!");
     }
 
+    /**
+     * @param lorderId 物流运单id
+     * @desc 取消派车-物流订单完结(趟次/循环派车)
+     * @author zk
+     * @date 2023/7/24
+     **/
+    public void cancelSendCar(Long lorderId) {
+        /**1数据校验**/
+        KwtLogisticsOrder order = logisticsOrderDao.selectById(lorderId);
+        if (order == null) {
+            return;
+        }
+
+        /**1-5循环派车失效kwt_logistics_order_circulate**/
+        //趟次派车信息
+        List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("lOrderId", lorderId);
+            put("status", CarWaybillEnum.PENDING_ORDER.getCode());
+        }});
+        for (KwtWaybillOrder waybillOrder:waybillOrders) {
+            waybillOrder.setStatus(CarWaybillEnum.REVOKED.getCode());
+            waybillOrderDao.updateById(waybillOrder);
+
+            //车辆订单-Mongodb数据更新
+            SckwWaybillOrder wOrder = new SckwWaybillOrder();
+            wOrder.set_id(waybillOrder.getId());
+            editSckwWaybillOrder(wOrder, waybillOrder, 2);
+        }
+
+        //循环派车信息
+        List<KwtLogisticsOrderCirculate> circulates = logisticsOrderCirculateDao.findCirculateList(lorderId, null, null, 0);
+        for (KwtLogisticsOrderCirculate circulate : circulates) {
+            circulate.setStatus(Global.NUMERICAL_ONE);
+            logisticsOrderCirculateDao.updateById(circulate);
+
+            //车辆订单-Mongodb数据更新
+            SckwWaybillOrder wOrder = new SckwWaybillOrder();
+            wOrder.set_id(circulate.getId());
+            KwtWaybillOrder waybillOrder = new KwtWaybillOrder();
+            waybillOrder.setStatus(CarWaybillEnum.REVOKED.getCode());
+            waybillOrder.setUpdateTime(circulate.getUpdateTime());
+            waybillOrder.setUpdateBy(circulate.getUpdateBy());
+            editSckwWaybillOrder(wOrder, waybillOrder, 2);
+        }
+    }
+
     /**
      * @param wOrder mongodb中车辆运单信息
      * @param order  车辆运单信息
@@ -1742,13 +1789,99 @@ public class KwtWaybillOrderService {
         boolean subcontractBool = checkSubcontract(logisticsOrder);
 
         /**1-2校验当前承运订单是否运输完成**/
-        //车辆运单统计
+        //车辆运单统计(运输中的物流订单+车辆运单审核通过)
+        WaybillCountVo waybillCount = waybillOrderDao.findWaybillOrderCount(new HashMap() {{
+            put("upperlOrderId", logisticsOrder.getId());
+            put("passStatus", Global.NUMERICAL_ONE);
+            put("logisticsStatus", LogisticsOrderEnum.IN_TRANSIT.getCode());
+        }});
+        //物流订单统计(运输完成后的物流订单)
+        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap(){{
+            put("upperlOrderId", logisticsOrder.getId());
+            put("finishedStatus", Global.NUMERICAL_ONE);
+        }});
+
+        logisticsOrder.setTotalLoadAmount(waybillCount.getLoadAmount().add(LogisticsCount.getLoadAmount()));
+        logisticsOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount().add(LogisticsCount.getUnloadAmount()));
+        logisticsOrderDao.updateById(logisticsOrder);
+
+        /**1-3更新贸易订单总量**/
+        if (logisticsLevel(logisticsOrder) == Global.NUMERICAL_ONE) {
+            //物流订单统计(运输完成后的物流订单)
+            LogisticsCountVo tradeCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap(){{
+                put("tOrderId", logisticsOrder.getTOrderId());
+                put("finishedStatus", Global.NUMERICAL_ONE);
+            }});
+            //查询贸易订单关联物流运单是否全部完结-totalUnfinished
+            WaybillCountVo tradeCount1 = waybillOrderDao.findWaybillOrderCount(new HashMap() {{
+                put("tOrderId", logisticsOrder.getTOrderId());
+            }});
+            CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
+            tradeOrder.setTOrderId(logisticsOrder.getTOrderId());
+            tradeOrder.setActualLoadAmount(tradeCount.getLoadAmount());
+            tradeOrder.setActualUnloadAmount(tradeCount.getUnloadAmount());
+            tradeOrder.setIsAllComplete(tradeCount1.getTotalUnfinished() > 0 ? false : true);
+            tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
+            tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
+            tradeOrderInfoService.completeLogisticsOrder(tradeOrder);
+        }
+
+        /**1-4Mongodb数据更新**/
+        //承运订单
+        SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
+        lOrder.setTotalLoadAmount(logisticsOrder.getTotalLoadAmount());
+        lOrder.setTotalUnloadAmount(logisticsOrder.getTotalUnloadAmount());
+        editSckwLogisticsOrder(lOrder, logisticsOrder);
+
+        /**2当前物流订单属于分包(存在上级物流订单)**/
+        //获取所有上级物流订单ID（当前物流订单ID除外）
+        String pids = logisticsOrder.getPids();
+        if (StringUtils.isNotBlank(pids)) {
+            String[] idArray = pids.split(Global.COMMA);
+            for (String id : idArray) {
+                Long pid = Long.parseLong(id);
+                //当前物流订单ID除外
+                if (!pid.equals(lOrderId)) {
+                    /**校验当前承运订单是否运输完成**/
+                    checkLogisticsByStatus(pid);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param lOrderId 承运订单ID
+     * @description 校验当前承运订单是否运输完成(修改状态 + 统计量)
+     * @author zk
+     * @date 2023/7/27
+     **/
+    public void checkLogisticsByStatusV1(Long lOrderId) {
+        /**
+         校验当前承运订单是否运输完成（虑该当前承运订单上下级物流订单）
+         1存在下级分包，下级物流订单和当前物流订单全部运输完成则修改当前物流订单状态为已完成（HAVE_FINISHED）、统计值
+         2当前物流订单属于分包：需要判断上级及同级分包全部运输完成修改上级物流订单状态为已完成（HAVE_FINISHED）、统计值-一直向上到一级物流订单
+         **/
+
+        /**1存在下级分包**/
+        KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(lOrderId);
+        /**1-1校验下级分包是否全部运输完成**/
+        boolean subcontractBool = checkSubcontract(logisticsOrder);
+
+        /**1-2校验当前承运订单是否运输完成**/
+        //车辆运单统计(运输中的物流订单+车辆运单审核通过)
         WaybillCountVo waybillCount = waybillOrderDao.findWaybillOrderCount(new HashMap() {{
             put("upperlOrderId", logisticsOrder.getId());
-            put("passStatus", 1);
+            put("passStatus", Global.NUMERICAL_ONE);
+            put("logisticsStatus", LogisticsOrderEnum.IN_TRANSIT.getCode());
         }});
-        logisticsOrder.setTotalLoadAmount(waybillCount.getLoadAmount());
-        logisticsOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount());
+        //物流订单统计(运输完成后的物流订单)
+        LogisticsCountVo LogisticsCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap(){{
+            put("upperlOrderId", logisticsOrder.getId());
+            put("finishedStatus", Global.NUMERICAL_ONE);
+        }});
+
+        logisticsOrder.setTotalLoadAmount(waybillCount.getLoadAmount().add(LogisticsCount.getLoadAmount()));
+        logisticsOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount().add(LogisticsCount.getUnloadAmount()));
         BigDecimal subcontractAmount = logisticsOrder.getSubcontractAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getSubcontractAmount();
         //物流运单状态（不包含已完成、已对账、已结算）+ 物流订单上级委派量-下游分包总量 <= 自己承运总装货量 + 下级分包全部运输完成
         if (!LogisticsOrderEnum.transportCompleted(logisticsOrder.getStatus())
@@ -1756,7 +1889,7 @@ public class KwtWaybillOrderService {
                 && subcontractBool) {
             //---------------------------------------------zk 2023-08-01 全量可运
             /**1-3下级分包承运订单运输完成**/
-            //logisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());//取消自动完结
+            logisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());//取消自动完结
             logisticsOrderDao.updateById(logisticsOrder);
 
             /**1-4承运订单状态记录**/
@@ -1791,7 +1924,7 @@ public class KwtWaybillOrderService {
             //查询贸易订单总装货量/总卸货量
             WaybillCountVo tradeCount = waybillOrderDao.findWaybillOrderCount(new HashMap() {{
                 put("tOrderId", logisticsOrder.getTOrderId());
-                put("passStatus", 1);
+                put("passStatus", Global.NUMERICAL_ONE);
             }});
             //查询贸易订单关联物流运单是否全部完结-totalUnfinished
             WaybillCountVo tradeCount1 = waybillOrderDao.findWaybillOrderCount(new HashMap() {{

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

@@ -1,16 +1,20 @@
 package com.sckw.transport.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
@@ -36,8 +40,7 @@ import com.sckw.transport.model.dto.CancelOrderDTO;
 import com.sckw.transport.model.dto.DocumentParamDTO;
 import com.sckw.transport.model.param.ContractParam;
 import com.sckw.transport.model.param.LogisticsOrderParam;
-import com.sckw.transport.model.vo.OrderDetailVO;
-import com.sckw.transport.model.vo.SckwLogisticsOrderVO;
+import com.sckw.transport.model.vo.*;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -733,4 +736,231 @@ public class TransportCommonService {
         PageResult build = PageResult.build(contractParam.getPage(), contractParam.getPageSize(), list.stream().count(), returnList);
         return HttpResult.ok(build);
     }
+
+    /**
+     * @param lOrderId 承运订单ID
+     * @desc 完结物流订单数据处理
+     * @author zk
+     * @date 2023/9/18
+     **/
+    public void closeHandle(Long lOrderId) {
+        /**1数据校验**/
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectById(lOrderId);
+        if (logisticsOrder == null) {
+            return;
+        }
+
+        /**2物流订单树形数据结构**/
+        //所有管理物流订单
+        List<KwtLogisticsOrder> orders = logisticsOrderMapper.findLogisticsOrder(new HashMap<>(){{
+            put("upperlOrderId", lOrderId);
+            put("belowlOrderId", logisticsOrder.getPids());
+        }});
+        //数据copy
+        List<KwtLogisticsOrderTreeVo> logisticsOrders = orders.stream().map( order -> {
+                            KwtLogisticsOrderTreeVo logisticsOrderVo = new KwtLogisticsOrderTreeVo();
+                            BeanUtils.copyPropertiesValue(order, logisticsOrderVo);
+                            return logisticsOrderVo;
+                        }
+                ).collect(Collectors.toList());
+        List<KwtLogisticsOrderTreeVo> treeData = findTree(logisticsOrders);
+        /**数据去除已完结订单下级*/
+        orderTreeHandle(treeData);
+
+        /**3链路数据组装*/
+        List<List<KwtLogisticsOrderTreeVo>> orderLinks = new ArrayList<>();
+        for (KwtLogisticsOrderTreeVo order:treeData) {
+            Stack<KwtLogisticsOrderTreeVo> pathStack = new Stack<>();
+            iteratorNode(order, pathStack, orderLinks);
+        }
+        List<KwtLogisticsOrderTreeVo> orderLink = findLink(orderLinks, lOrderId);
+        //倒序
+        Collections.reverse(orderLink);
+
+        /**4数据处理**/
+        for (KwtLogisticsOrderTreeVo order:orderLink) {
+            //排除已完结订单
+            if (Objects.equals(order.getStatus(), LogisticsOrderEnum.HAVE_FINISHED.getCode())) {
+                //计算总装总卸向上级统计
+                continue;
+            }
+
+            //车辆运单统计(运输中的物流订单+车辆运单审核通过)
+            WaybillCountVo waybillCount = waybillOrderMapper.findWaybillOrderCount(new HashMap() {{
+                put("upperlOrderId", order.getId());
+                put("passStatus", Global.NUMERICAL_ONE);
+                put("logisticsStatus", LogisticsOrderEnum.IN_TRANSIT.getCode());
+            }});
+            //物流订单统计(运输完成后的物流订单)
+            LogisticsCountVo LogisticsCount = logisticsOrderMapper.findLogisticsOrderCount(new HashMap(){{
+                put("upperlOrderId", order.getId());
+                put("finishedStatus", Global.NUMERICAL_ONE);
+            }});
+
+            KwtLogisticsOrder currentOrder = logisticsOrderMapper.selectById(lOrderId);
+            currentOrder.setTotalLoadAmount(waybillCount.getLoadAmount().add(LogisticsCount.getLoadAmount()));
+            currentOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount().add(LogisticsCount.getUnloadAmount()));
+            logisticsOrderMapper.updateById(currentOrder);
+
+            /**Mongodb数据更新**/
+            SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
+            lOrder.setTotalLoadAmount(waybillCount.getLoadAmount());
+            lOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount());
+            SckwBusSum busSum = new SckwBusSum();
+            //业务汇总类型
+            busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+            //操作对象（1新增/2修改）
+            busSum.setMethod(NumberConstant.TWO);
+            //业务汇总数据对象
+            busSum.setObject(order);
+            streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
+
+            //一级物流订单向贸易订单推送数据
+            if (order.getPid() == null) {
+
+            }
+        }
+    }
+
+    /**
+     * @param treeData 物流订单树形数据
+     * @desc 数据去除已完结订单下级
+     * @author zk
+     * @date 2023/9/18
+     **/
+    public static void orderTreeHandle(List<KwtLogisticsOrderTreeVo> treeData){
+        if (CollectionUtil.isEmpty(treeData)) {
+            return;
+        }
+
+        for (KwtLogisticsOrderTreeVo order:treeData) {
+            orderTreeHandle(order.getChildren());
+            if (order.getStatus() == 4) {
+                order.setChildren(null);
+            }
+        }
+    }
+
+    /**
+     * @param orders 物流订单
+     * @desc 树形数据处理
+     * @author zk
+     * @date 2023/9/18
+     **/
+    public static List<KwtLogisticsOrderTreeVo> findTree(List<KwtLogisticsOrderTreeVo> orders) {
+        //跟节点
+        List<KwtLogisticsOrderTreeVo> rootList = new ArrayList();
+
+        //获取根节点数据
+        if (CollectionUtil.isNotEmpty(orders)) {
+            for(KwtLogisticsOrderTreeVo order:orders){
+                if (order.getPid() == null) {
+                    rootList.add(order);
+                }
+            }
+        }
+
+        //遍历，找到二级节点（根节点的id和所有节点中的pid比较）
+        for (KwtLogisticsOrderTreeVo order : rootList) {
+            List<KwtLogisticsOrderTreeVo> child = getChild(order.getId(), orders);
+            order.setChildren(child);
+        }
+
+        return rootList;
+    }
+
+    /**
+     * @param pid 上级物流订单ID
+     * @param orders 物流订单
+     * @desc 树形数据处理-递归
+     * @author zk
+     * @date 2023/9/18
+     **/
+    public static List<KwtLogisticsOrderTreeVo> getChild(Long pid, List<KwtLogisticsOrderTreeVo> orders) {
+        List<KwtLogisticsOrderTreeVo> childList = new ArrayList();
+        for (KwtLogisticsOrderTreeVo order : orders) {
+            if(pid.equals(order.getPid())){
+                //获取当前节点id的所有子列表
+                childList.add(order);
+            }
+        }
+        for (KwtLogisticsOrderTreeVo order : childList) {
+            //将该id的子节点进行遍历，通过递归调用，获取每一个子节点的子节点数据
+            List<KwtLogisticsOrderTreeVo> child = getChild(order.getId(), orders);
+            order.setChildren(child);
+        }
+        if(childList.size()==0){
+            //子节点的长度为0,返回null,null不会被阿里的FastJson包解析
+            return  null;
+        }
+        return childList;
+    }
+
+    /**
+     * @param: order 当前节点
+     * @param: pathstack 栈
+     * @param: orderLinks 设备链路信息
+     * @desc 链路组装
+     * @author zk
+     * @date 2023/8/8
+     **/
+    public static void iteratorNode(KwtLogisticsOrderTreeVo order, Stack<KwtLogisticsOrderTreeVo> pathstack, List orderLinks) {
+        //入栈
+        pathstack.push(order);
+        List childlist = order.getChildren();
+        //没有子节点 说明是叶子结点
+        if (childlist == null){
+            List list = new ArrayList();
+            Iterator stackIt = pathstack.iterator();
+            while (stackIt.hasNext()) {
+                list.add(stackIt.next());
+            }
+            List<KwtLogisticsOrderTreeVo> orders = print(list);
+            orderLinks.add(orders);
+        } else {
+            Iterator iterator = childlist.iterator();
+            while (iterator.hasNext()) {
+                KwtLogisticsOrderTreeVo child = (KwtLogisticsOrderTreeVo) iterator.next();
+                //深度优先 进入递归
+                iteratorNode(child, pathstack, orderLinks);
+                //回溯时候出栈
+                pathstack.pop();
+            }
+        }
+    }
+
+    /**
+     * @param list 树形数据
+     * @desc 链路组装
+     * @author zk
+     * @date 2023/8/8
+     **/
+    private static List<KwtLogisticsOrderTreeVo> print(List list) {
+        List<KwtLogisticsOrderTreeVo> orders = new ArrayList();
+        Iterator iterator = list.iterator();
+        while (iterator.hasNext()) {
+            KwtLogisticsOrderTreeVo order = (KwtLogisticsOrderTreeVo) iterator.next();
+            order.setChildren(null);
+            orders.add(order);
+        }
+        return orders;
+    }
+
+    /**
+     * @param orderLinks 物流订单链路信息
+     * @param lOrderId 物流订单id
+     * @desc 获取当前物流订单垂直链路
+     * @author zk
+     * @date 2023/9/18
+     **/
+    public static List<KwtLogisticsOrderTreeVo> findLink(List<List<KwtLogisticsOrderTreeVo>> orderLinks, Long lOrderId) {
+        for (List<KwtLogisticsOrderTreeVo> logisticsOrders:orderLinks) {
+            for (KwtLogisticsOrderTreeVo order:logisticsOrders) {
+                if (Objects.equals(lOrderId, order.getId())) {
+                    return logisticsOrders;
+                }
+            }
+        }
+        return null;
+    }
 }

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

@@ -686,6 +686,12 @@
             and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
             and id != #{ownOrderId, jdbcType=BIGINT}
         </if>
+        <if test="upperlOrderId != null and upperlOrderId != ''">
+            and FIND_IN_SET(#{upperlOrderId, jdbcType=BIGINT}, pids)
+        </if>
+        <if test="belowlOrderId != null and belowlOrderId != ''">
+            and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
+        </if>
     </select>
     <select id="selectOrderCountByTorderId" resultType="com.sckw.transport.model.dto.LogisticsOrderDTO">
         SELECT a.id          as lOrderId,
@@ -2519,4 +2525,29 @@
         </where>
         ORDER BY tab.createTime DESC
     </select>
+
+    <select id="findLogisticsOrderCount" resultType="com.sckw.transport.model.vo.LogisticsCountVo" parameterType="java.util.Map">
+        SELECT
+        sum(load_amount) loadAmount, sum(unload_amount) unloadAmount,
+        sum(total_load_amount) totalLoadAmount, sum(total_unload_amount) totalUnloadAmount
+        from kwt_logistics_order where del_flag = 0
+        <if test="tOrderId != null and tOrderId != ''">
+            and t_order_id = #{tOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="lOrderId != null and lOrderId != ''">
+            and id = #{lOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="finishedStatus != null and finishedStatus != ''">
+            and status in (4, 5, 6)
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{lOrderId, jdbcType=INTEGER}
+        </if>
+        <if test="upperlOrderId != null and upperlOrderId != ''">
+            and FIND_IN_SET(#{upperlOrderId, jdbcType=BIGINT}, pids)
+        </if>
+        <if test="belowlOrderId != null and belowlOrderId != ''">
+            and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
+        </if>
+    </select>
 </mapper>

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

@@ -177,6 +177,9 @@
         <if test="truckId != null and truckId != ''">
             and wo.truck_id = #{truckId, jdbcType=BIGINT}
         </if>
+        <if test="logisticsStatus != null and logisticsStatus != ''">
+            and lo.status  = #{logisticsStatus, jdbcType=INTEGER}
+        </if>
         <if test="passStatus != null and passStatus != ''">
             and wo.status = 8
         </if>
@@ -522,12 +525,21 @@
         kwo.create_time createTime, kwo.driver_id driverId, kwo.driver_name driverName, kwo.driver_phone driverPhone
         FROM kwt_waybill_order kwo
         where kwo.del_flag = 0
+        <if test="tOrderId != null and tOrderId != ''">
+            and kwo.t_order_id = #{tOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="lOrderId != null and lOrderId != ''">
+            and kwo.id = #{lOrderId, jdbcType=BIGINT}
+        </if>
         <if test="driverId != null and driverId != ''">
             and kwo.driver_id = #{driverId, jdbcType=BIGINT}
         </if>
         <if test="truckNo != null and truckNo != ''">
             and kwo.truck_no = #{truckNo, jdbcType=VARCHAR}
         </if>
+        <if test="status != null and status != ''">
+            and kwo.status = #{status, jdbcType=INTEGER}
+        </if>
         <if test="busStatus != null and busStatus == 2">
             and kwo.status = 2
         </if>