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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/CollectionUtils.java

@@ -410,7 +410,7 @@ public class CollectionUtils extends CollectionUtil {
 	 * @throws Exception
 	 */
 	public static <T> T mapToBean(Map map, Class<T> beanClass) throws Exception {
-		T object = beanClass.newInstance();
+		T object = beanClass.getDeclaredConstructor().newInstance();
 		Field[] fields = object.getClass().getDeclaredFields();
 		for (Field field : fields) {
 			int mod = field.getModifiers();

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/OkHttpUtils.java

@@ -15,7 +15,6 @@ import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.protocol.HTTP;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.util.CollectionUtils;
 
@@ -448,7 +447,7 @@ public class OkHttpUtils {
             if (response != null) {
                 HttpEntity he = response.getEntity();
                 if (he != null) {
-                    respContent = EntityUtils.toString(he, HTTP.UTF_8);
+                    respContent = EntityUtils.toString(he, StandardCharsets.UTF_8);
                 }
             } else {
                 log.error("对方响应的状态码不在符合的范围内!");

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/ReflectionUtils.java

@@ -1,6 +1,5 @@
 package com.sckw.core.utils;
 
-import com.sckw.core.utils.StringUtils;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/MessageController.java

@@ -16,11 +16,9 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * @param
  * @desc: 消息相关接口
  * @author: yzc
  * @date: 2023-06-09 15:13
- * @return
  */
 @RestController
 @RequestMapping(value = "/kwmMessage")

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

@@ -179,6 +179,7 @@ public class WalletController {
         return HttpResult.ok(walletService.prePayList(prePayPage));
     }
 
+
     /**
      * 预付列表-按渠道统计数量
      *
@@ -340,6 +341,17 @@ public class WalletController {
         return HttpResult.ok(walletService.transferOrder(moneyPage));
     }
 
+    /**
+     * 货到付款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("receiveOrder")
+    public HttpResult receiveOrder(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.transferReceiveOrder(moneyPage));
+    }
+
     /**
      * 退款订单
      *
@@ -397,6 +409,17 @@ public class WalletController {
     public HttpResult prePayRefund(@RequestBody @Valid MoneyPage moneyPage) {
         return HttpResult.ok(walletService.prePayRefund(moneyPage));
     }
+
+    /**
+     * 预付消费日志
+     *
+     * @param moneyPage
+     * @return
+     */
+    @GetMapping("prePayLogs")
+    public HttpResult prePayLogs(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.prePayLogs(moneyPage));
+    }
     /*预收-详细记录*/
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletReceiveMapper.java

@@ -0,0 +1,18 @@
+package com.sckw.payment.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.payment.model.KwpWalletReceive;
+import com.sckw.payment.model.vo.req.page.MoneyPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @date 2023-10-18 12:57:05
+* @author xucaiqin
+*/
+@Mapper
+public interface KwpWalletReceiveMapper extends BaseMapper<KwpWalletReceive> {
+    List<KwpWalletReceive> pageList(@Param("moneyPage") MoneyPage moneyPage);
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletTransferMapper.java

@@ -16,6 +16,12 @@ import java.util.List;
  */
 @Mapper
 public interface KwpWalletTransferMapper extends BaseMapper<KwpWalletTransfer> {
+    /**
+     * 转账记录
+     *
+     * @param moneyPage
+     * @return
+     */
     List<KwpWalletTransfer> pageList(@Param("moneyPage") MoneyPage moneyPage);
 
     /**
@@ -24,5 +30,5 @@ public interface KwpWalletTransferMapper extends BaseMapper<KwpWalletTransfer> {
      * @param fundVo
      * @return
      */
-    BigDecimal sumMoney(@Param("fundVo")FundVo fundVo);
-}
+    BigDecimal sumMoney(@Param("fundVo") FundVo fundVo);
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletReceive.java

@@ -0,0 +1,109 @@
+package com.sckw.payment.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 货到付款记录表
+* @date 2023-10-18 12:57:05
+* @author xucaiqin
+*/
+@Data
+@TableName(value = "kwp_wallet_receive")
+public class KwpWalletReceive {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 流水号
+     */
+    @TableField(value = "order_no")
+    private String orderNo;
+
+    /**
+     * uid
+     */
+    @TableField(value = "`uid`")
+    private String uid;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "from_ent")
+    private Long fromEnt;
+
+    /**
+     * filter
+     */
+    @TableField(value = "`filter`")
+    private String filter;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "to_ent")
+    private Long toEnt;
+
+    /**
+     * 电子钱包渠道
+     */
+    @TableField(value = "channel")
+    private String channel;
+
+    /**
+     * 转账金额
+     */
+    @TableField(value = "money")
+    private BigDecimal money;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 1-已提交 2-转帐中 3-转账失败 4-转账成功
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_by")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "update_by")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 0-正常 1-删除
+     */
+    @TableField(value = "del_flag")
+    private Integer delFlag;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletTransfer.java

@@ -71,6 +71,12 @@ public class KwpWalletTransfer {
     @TableField(value = "remark")
     private String remark;
 
+    /**
+     * 1-已提交 2-转帐中 3-转账失败 4-转账成功
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
     /**
      * 创建人
      */
@@ -100,10 +106,4 @@ public class KwpWalletTransfer {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-
-    /**
-     * 1-转帐中
-     */
-    @TableField(value = "`status`")
-    private Integer status;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/PayCenterEnum.java

@@ -37,6 +37,7 @@ public enum PayCenterEnum {
     ADVANCE_PAY_WALLETS("/v2/advancepay/wallets", "钱包预付列表"),
     ADVANCE_PAY_PAY_CHANNELS("/v2/advancepay/pay/channels", "钱包预付通道统计"),
     ADVANCE_PAY_RECEIVE("/v2/advancepay/receives", "钱包预收列表"),
+    ADVANCE_PAY_LOGS("/v2/advancepay/operate/logs", "预付支出记录"),
     ADVANCE_PAY_RECEIVE_CHANNELS("/v2/advancepay/receive/channels", "钱包预收通道统计"),
     ADVANCE_PAY_STATUS("/v1/wallet/advancepay/statusCategory", "预付订单状态"),
     INDEX("/v1/index/index", "获取通道清单"),

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/ReceiveEnum.java

@@ -0,0 +1,52 @@
+package com.sckw.payment.model.constant;
+
+import java.util.Objects;
+
+/**
+ * 货到付款枚举
+ *
+ * @author xucaiqin
+ * @date 2023-07-11 12:00:52
+ */
+public enum ReceiveEnum {
+    APPLY(1, "已提交", "1"),
+    TRANSFERRING(2, "支付中", "2"),
+    FAILED(3, "支付失败", "3"),
+    SUCCESS(4, "支付成功", "4");
+
+    private final int status;
+    private final String desc;
+    private final String label;
+
+    ReceiveEnum(int status, String desc, String label) {
+        this.status = status;
+        this.label = label;
+        this.desc = desc;
+    }
+
+    public static String getDesc(Integer status) {
+        if (Objects.isNull(status)) {
+            return "";
+        }
+        for (ReceiveEnum value : values()) {
+            if (status == value.getStatus()) {
+                return value.getDesc();
+            }
+        }
+        return "";
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+
+    public String getDesc() {
+        return desc;
+    }
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/page/PrePayLogsPage.java

@@ -0,0 +1,20 @@
+package com.sckw.payment.model.dto.page;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.sckw.payment.model.dto.common.Page;
+import com.sckw.payment.model.dto.wallet.PrePayLogs;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+
+/**
+ * @author xucaiqin
+ * @date 2023-07-25 16:23:34
+ */
+@Getter
+@Setter
+public class PrePayLogsPage extends Page<PrePayLogs> {
+    @Serial
+    private static final long serialVersionUID = 8374847700935135347L;
+}

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

@@ -0,0 +1,51 @@
+package com.sckw.payment.model.dto.wallet;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author xucaiqin
+ */
+@Getter
+@Setter
+public class PrePayLogs implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3873082194808838563L;
+    private Long id;
+
+    @JSONField(name = "filter")
+    private String filter;
+
+    @JSONField(name = "channel")
+    private String channel;
+
+    @JSONField(name = "channel_label")
+    private String channelLabel;
+    /**
+     * 单号
+     */
+    @JSONField(name = "order_no")
+    private String orderNo;
+
+    /**
+     * 变动金额
+     */
+    @JSONField(name = "money")
+    private BigDecimal money;
+    /**
+     * 预付金额
+     */
+    @JSONField(name = "ap_money")
+    private BigDecimal apMoney;
+    /**
+     * 时间
+     */
+    @JSONField(name = "create_time")
+    private String createTime;
+
+}

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

@@ -0,0 +1,24 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 预付详细记录
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 15:43:49
+ */
+@Getter
+@Setter
+public class PrePayLogsVo extends WalletDetailBase {
+    private Long id;
+    /**
+     * 预付金额
+     */
+    private BigDecimal apMoney;
+
+
+}

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

@@ -20,10 +20,7 @@ import com.sckw.order.api.model.UpdateOrderStatusParam;
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.WalletDto;
 import com.sckw.payment.api.model.dto.common.R;
-import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
-import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
-import com.sckw.payment.dao.KwpSettlementLogisticsTrackMapper;
-import com.sckw.payment.dao.KwpSettlementWalletMapper;
+import com.sckw.payment.dao.*;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.*;
 import com.sckw.payment.model.dto.LedgerUnitDto;

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

@@ -13,10 +13,7 @@ import com.sckw.payment.api.model.dto.common.R;
 import com.sckw.payment.model.constant.PayCenterEnum;
 import com.sckw.payment.model.dto.common.BusinessNo;
 import com.sckw.payment.model.dto.common.Page;
-import com.sckw.payment.model.dto.page.CashPage;
-import com.sckw.payment.model.dto.page.PrePayIndexPage;
-import com.sckw.payment.model.dto.page.PrePayWalletPage;
-import com.sckw.payment.model.dto.page.RecordPage;
+import com.sckw.payment.model.dto.page.*;
 import com.sckw.payment.model.dto.wallet.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -200,7 +197,7 @@ public class PayCenterService {
      * @param uid
      * @return
      */
-    public R<JSONObject> user(String uid,ChannelEnum channelEnum) {
+    public R<JSONObject> user(String uid, ChannelEnum channelEnum) {
         String sync = getHttp(PayCenterEnum.USER, new HashMap<>() {{
             put("uid", uid);
             put("channel", channelEnum);
@@ -612,7 +609,7 @@ public class PayCenterService {
      * @param pageSize
      * @return
      */
-    public R<Page<PrePayIndex2>> advancePayIndex2(String uid, ChannelEnum channel, String filter, Integer page, Integer pageSize,String keyword) {
+    public R<Page<PrePayIndex2>> advancePayIndex2(String uid, ChannelEnum channel, String filter, Integer page, Integer pageSize, String keyword) {
         String sync = getHttp(PayCenterEnum.ADVANCE_PAY_INDEX2, new HashMap<>() {{
             put("uid", uid);
             put("channel", channel);
@@ -685,6 +682,34 @@ public class PayCenterService {
         });
     }
 
+    /**
+     * 预付支出记录
+     *
+     * @param uid
+     * @param channel
+     * @param filter
+     * @param orderNo
+     * @param startDate
+     * @param endDate
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    public R<PrePayLogsPage> advancePayLogs(String uid, ChannelEnum channel, String filter, String orderNo, String startDate, String endDate, Integer page, Integer pageSize) {
+        String sync = getHttp(PayCenterEnum.ADVANCE_PAY_LOGS, new HashMap<>() {{
+            put("uid", uid);
+            put("channel", channel);
+            put("filter", filter);
+            put("orderNo", orderNo);
+            put("startDate", startDate);
+            put("endDate", endDate);
+            put("page", page);
+            put("pageSize", pageSize);
+        }});
+        return JSONObject.parseObject(sync, new TypeReference<>() {
+        });
+    }
+
     /**
      * 钱包预收通道统计
      *
@@ -771,7 +796,7 @@ public class PayCenterService {
      * @param pageSize
      * @return
      */
-    public R<RechargePage> rechargeOrder(String uid, String filter,ChannelEnum channelEnum,String startDate, String endDate, String keyword, Integer page, Integer pageSize) {
+    public R<RechargePage> rechargeOrder(String uid, String filter, ChannelEnum channelEnum, String startDate, String endDate, String keyword, Integer page, Integer pageSize) {
         if (Objects.isNull(page)) {
             page = 1;
         }

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

@@ -1,21 +1,28 @@
 package com.sckw.payment.service;
 
+import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.common.R;
+import com.sckw.payment.dao.KwpWalletReceiveMapper;
+import com.sckw.payment.model.KwpWalletReceive;
+import com.sckw.payment.model.constant.ReceiveEnum;
 import com.sckw.payment.model.dto.common.BusinessNo;
 import com.sckw.payment.model.dto.wallet.PatchPay;
 import com.sckw.payment.model.dto.wallet.WalletInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * @author xucaiqin
@@ -26,6 +33,8 @@ import java.util.Objects;
 @RequiredArgsConstructor
 public class WalletBusinessService {
     private final PayCenterService payCenterService;
+    private final KwpWalletReceiveMapper kwpWalletReceiveMapper;
+    private final KwpWalletRelationService walletRelationService;
 
     /**
      * 校验付款金额是否超过钱包可用余额
@@ -59,7 +68,7 @@ public class WalletBusinessService {
      * @param filter
      * @param channelEnum
      * @param price       清分金额
-     * @param payType     支付方式 支付类型0-默认1-仅预付支付2-仅余额支付
+     * @param payType     支付方式 支付类型0-默认1-仅预付支付2-仅余额支付（货到付款）
      */
     public void splitMoney(String businessNo, String uid, String filter, ChannelEnum channelEnum, BigDecimal price, String payType) {
         long value = price.multiply(new BigDecimal("100")).longValueExact();
@@ -67,6 +76,30 @@ public class WalletBusinessService {
             add(new PatchPay(filter, value, uid + "清分" + value + "至" + filter));
         }};
         R<BusinessNo> businessNoR = payCenterService.payAgentPayV2(uid, filter, channelEnum, value, split, businessNo, payType);
+        Map<String, Consumer<Boolean>> map = new HashMap<>();
+        map.put("2", (b) -> {
+            KwpWalletReceive walletReceive = new KwpWalletReceive();
+            walletReceive.setId(new IdWorker(NumberConstant.ONE).nextId());
+            walletReceive.setOrderNo(businessNo);
+            walletReceive.setUid(uid);
+            walletReceive.setFromEnt(walletRelationService.getEnt(uid));
+            walletReceive.setFilter(filter);
+            walletReceive.setToEnt(walletRelationService.getEnt(filter));
+            walletReceive.setChannel(channelEnum.getChannel());
+            walletReceive.setMoney(price);
+            walletReceive.setRemark("货到付款清分");
+            walletReceive.setCreateBy(LoginUserHolder.getUserId());
+            walletReceive.setCreateTime(LocalDateTime.now());
+            walletReceive.setUpdateBy(LoginUserHolder.getUserId());
+            walletReceive.setUpdateTime(LocalDateTime.now());
+            walletReceive.setDelFlag(Global.UN_DELETED);
+            walletReceive.setStatus(b ? ReceiveEnum.APPLY.getStatus() : ReceiveEnum.FAILED.getStatus());
+            kwpWalletReceiveMapper.insert(walletReceive);
+        });
+        Consumer<Boolean> booleanConsumer = map.get(payType);
+        if (Objects.nonNull(booleanConsumer)) {
+            booleanConsumer.accept(businessNoR.getStatus());
+        }
         if (!businessNoR.getStatus()) {
             log.error("流水号：{} uid:{} filter:{} channel:{} price:{} payType:{}", businessNoR, uid, filter, channelEnum, price, payType);
             throw new BusinessException(businessNoR.getMsg());

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

@@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.BeanUtils;
 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 com.sckw.payment.model.vo.req.page.RefundPage;
@@ -28,7 +27,6 @@ import java.util.List;
 @RequiredArgsConstructor
 public class WalletOrderService {
     private final KwpWalletRefundMapper kwpWalletRefundMapper;
-    private final KwpWalletTransferMapper kwpWalletTransferMapper;
 
     /**
      * 预付、预收 查询退款中金额

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

@@ -15,19 +15,18 @@ import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.WalletDto;
 import com.sckw.payment.api.model.dto.common.R;
+import com.sckw.payment.dao.KwpWalletReceiveMapper;
 import com.sckw.payment.dao.KwpWalletRefundMapper;
 import com.sckw.payment.dao.KwpWalletTransferMapper;
 import com.sckw.payment.job.AsyncPool;
-import com.sckw.payment.model.KwpWallet;
-import com.sckw.payment.model.KwpWalletRefund;
-import com.sckw.payment.model.KwpWalletRelation;
-import com.sckw.payment.model.KwpWalletTransfer;
+import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.*;
 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.common.Page;
 import com.sckw.payment.model.dto.page.CashPage;
+import com.sckw.payment.model.dto.page.PrePayLogsPage;
 import com.sckw.payment.model.dto.page.PrePayWalletPage;
 import com.sckw.payment.model.dto.wallet.*;
 import com.sckw.payment.model.vo.PrePayWalletVo;
@@ -75,6 +74,7 @@ public class WalletService {
     private final WalletOrderService walletOrderService;
     private final KwpWalletRefundMapper kwpWalletRefundMapper;
     private final KwpWalletTransferMapper kwpWalletTransferMapper;
+    private final KwpWalletReceiveMapper kwpWalletReceiveMapper;
     private final RedisLockUtil redisLockUtil;
     private final KwpWalletRefundSubService kwpWalletRefundSubService;
     private final KwpWalletService kwpWalletService;
@@ -223,6 +223,7 @@ public class WalletService {
     private void time(PrePayWalletVo prePayWalletVo) {
         prePayWalletVo.setUpdateTime(kwpWalletService.queryTime(prePayWalletVo.getUid(), prePayWalletVo.getFilter(), prePayWalletVo.getChannel()));
     }
+
     private void timeReceive(PrePayWalletVo prePayWalletVo) {
         prePayWalletVo.setUpdateTime(kwpWalletService.queryTime(prePayWalletVo.getFilter(), prePayWalletVo.getUid(), prePayWalletVo.getChannel()));
     }
@@ -761,7 +762,7 @@ public class WalletService {
                 PatchPay patchPay = new PatchPay();
                 patchPay.setUid(transferReq.getFilter());
                 patchPay.setMoney(transferReq.bigMoney(transferReq.getMoney()));
-                patchPay.setRemark(transferReq.getRemark());
+                patchPay.setRemark(StringUtils.isBlank(transferReq.getRemark()) ? "[" + transferReq.getUid() + "]转账" + transferReq.getMoney() + "给[" + transferReq.getFilter() + "]" : transferReq.getRemark());
                 list.add(patchPay);
                 R<BusinessNo> businessNoR1 = payCenterService.payAgentPayV2(transferReq.getUid(), transferReq.getFilter(), channelEnum, transferReq.bigMoney(transferReq.getMoney()), list, orderNo, "2");
                 if (!businessNoR1.getStatus()) {
@@ -1747,6 +1748,39 @@ public class WalletService {
         return PageRes.build(pageInfo, res);
     }
 
+    /**
+     * 资金明细-货到付款
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<WalletDetailBase> transferReceiveOrder(MoneyPage moneyPage) {
+        PageHelper.startPage(moneyPage.getPage(), moneyPage.getPageSize());
+        List<KwpWalletReceive> kwpWalletTransfers = kwpWalletReceiveMapper.pageList(moneyPage);
+        PageInfo<KwpWalletReceive> pageInfo = new PageInfo<>(kwpWalletTransfers);
+        ArrayList<WalletDetailBase> res = new ArrayList<>();
+        WalletDetailBase walletDetailBase;
+
+        for (KwpWalletReceive kwpWalletTransfer : kwpWalletTransfers) {
+            walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(kwpWalletTransfer.getOrderNo());
+            walletDetailBase.setChannel(kwpWalletTransfer.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(kwpWalletTransfer.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(kwpWalletTransfer.getChannel()));
+            walletDetailBase.setUid(kwpWalletTransfer.getUid());
+            walletDetailBase.setUidName(getFirmName(kwpWalletTransfer.getUid()));
+            walletDetailBase.setFilter(kwpWalletTransfer.getFilter());
+            walletDetailBase.setFilterName(getFirmName(kwpWalletTransfer.getFilter()));
+            walletDetailBase.setStatus(kwpWalletTransfer.getStatus());
+            walletDetailBase.setStatusLabel(TransferEnum.getDesc(kwpWalletTransfer.getStatus()));
+            walletDetailBase.setMoney(kwpWalletTransfer.getMoney());
+            walletDetailBase.setRemark(kwpWalletTransfer.getRemark());
+            walletDetailBase.setCreateTime(DateTimeUtil.format(kwpWalletTransfer.getCreateTime()));
+            res.add(walletDetailBase);
+        }
+        return PageRes.build(pageInfo, res);
+    }
+
     /**
      * 资金明细-退款订单
      *
@@ -2075,6 +2109,52 @@ public class WalletService {
         return user.getData();
     }
 
+    /**
+     * 预付消费日志
+     *
+     * @param moneyPage
+     * @return
+     */
+    public Object prePayLogs(MoneyPage moneyPage) {
+        ChannelEnum channelEnum = ChannelEnum.getByChannel(moneyPage.getChannel());
+        if (Objects.isNull(channelEnum)) {
+            throw new BusinessException("支付通道异常");
+        }
+        R<PrePayLogsPage> prePayWalletPageR = payCenterService.advancePayLogs(moneyPage.getUid(), channelEnum, moneyPage.getFilter(),
+                moneyPage.getKeywords(), moneyPage.getStartCreateTime(), moneyPage.getEndCreateTime(), moneyPage.getPage(), moneyPage.getPageSize());
+        if (!prePayWalletPageR.getStatus()) {
+            return new PageRes<>(moneyPage.getPage(), moneyPage.getPageSize(),
+                    0, 0, new ArrayList<>());
+        }
+        PrePayLogsPage data = prePayWalletPageR.getData();
+        if (Objects.nonNull(data)) {
+            List<PrePayLogs> rows = data.getRows();
+            if (!CollectionUtils.isEmpty(rows)) {
+                List<PrePayLogsVo> collect = rows.stream().map(a -> {
+                    PrePayLogsVo prePayLogsVo = new PrePayLogsVo();
+                    prePayLogsVo.setId(a.getId());
+                    prePayLogsVo.setOrderNo(a.getOrderNo());
+                    prePayLogsVo.setChannel(a.getChannel());
+                    prePayLogsVo.setChannelDict(ChannelEnum.getDict(a.getChannel()));
+                    prePayLogsVo.setChannelLabel(ChannelEnum.getDesc(a.getChannel()));
+                    prePayLogsVo.setUid(moneyPage.getUid());
+                    prePayLogsVo.setUidName(getFirmName(moneyPage.getUid()));
+                    prePayLogsVo.setFilter(a.getFilter());
+                    prePayLogsVo.setFilterName(getFirmName(a.getFilter()));
+                    prePayLogsVo.setStatus(null);
+                    prePayLogsVo.setStatusLabel("");
+                    prePayLogsVo.setMoney(prePayLogsVo.smallMoney(a.getMoney()));
+                    prePayLogsVo.setApMoney(prePayLogsVo.smallMoney(a.getApMoney()));
+                    prePayLogsVo.setRemark("");
+                    prePayLogsVo.setCreateTime(a.getCreateTime());
+                    return prePayLogsVo;
+                }).collect(Collectors.toList());
+                return new PageRes<>(moneyPage.getPage(), moneyPage.getPageSize(), data.getTotal(), (int) (data.getTotal() / data.getPageSize() + 1), collect);
+            }
+        }
+        return new PageRes<>(moneyPage.getPage(), moneyPage.getPageSize(), 0, 0, new ArrayList<>());
+    }
+
     /**
      * 退款处理
      *

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementOfflineMapper.xml

@@ -52,6 +52,7 @@
             <if test="offlineReq.id != null and offlineReq.id != ''">
                 and settlement_id = #{offlineReq.id,jdbcType=INTEGER}
             </if>
+            order by pay_time desc
         </where>
     </select>
 
@@ -61,6 +62,7 @@
         FROM kwp_settlement_offline
         <where>
             order_type = 1
+            order by pay_time desc
         </where>
     </select>
 
@@ -76,6 +78,7 @@
             <if test="offlineReq.id != null and offlineReq.id != ''">
                 and settlement_id = #{offlineReq.id,jdbcType=INTEGER}
             </if>
+            order by pay_time desc
         </where>
     </select>
     <select id="pageList" resultType="com.sckw.payment.model.dto.SettlementOfflineDto">
@@ -90,6 +93,7 @@
             <if test="offlineReq.id != null and offlineReq.id != ''">
                 and settlement_id = #{offlineReq.id,jdbcType=INTEGER}
             </if>
+            order by pay_time desc
         </where>
     </select>
     <select id="list" resultType="com.sckw.payment.model.dto.SettlementOfflineDto">
@@ -104,6 +108,7 @@
             <if test="offlineReq.id != null and offlineReq.id != ''">
                 and settlement_id = #{offlineReq.id,jdbcType=INTEGER}
             </if>
+            order by pay_time desc
         </where>
     </select>
-</mapper>
+</mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementWalletMapper.xml

@@ -121,6 +121,7 @@
             <if test="walletReq.payType != null">
                 and ksw.type = #{walletReq.payType,jdbcType=INTEGER}
             </if>
+            order by ksw.pay_time desc
         </where>
     </select>
     <select id="appList" resultType="com.sckw.payment.model.vo.SettlementVo">
@@ -151,6 +152,7 @@
             <if test="walletReq.payType != null">
                 and ksw.type = #{walletReq.payType,jdbcType=INTEGER}
             </if>
+            order by ksw.pay_time desc
         </where>
     </select>
     <select id="list" resultType="com.sckw.payment.model.dto.SettlementWalletDto">
@@ -181,6 +183,7 @@
             <if test="walletReq.payType != null">
                 and ksw.type = #{walletReq.payType,jdbcType=INTEGER}
             </if>
+            order by ksw.pay_time desc
         </where>
     </select>
-</mapper>
+</mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpWalletReceiveMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.payment.dao.KwpWalletReceiveMapper">
+  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpWalletReceive">
+    <!--@mbg.generated-->
+    <!--@Table kwp_wallet_receive-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="from_ent" jdbcType="BIGINT" property="fromEnt" />
+    <result column="filter" jdbcType="VARCHAR" property="filter" />
+    <result column="to_ent" jdbcType="BIGINT" property="toEnt" />
+    <result column="channel" jdbcType="VARCHAR" property="channel" />
+    <result column="money" jdbcType="DECIMAL" property="money" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_by" jdbcType="BIGINT" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, order_no, `uid`, from_ent, `filter`, to_ent, channel, money, remark, `status`,
+    create_by, create_time, update_by, update_time, del_flag
+  </sql>
+  <select id="pageList" resultMap="BaseResultMap">
+    select *
+    from kwp_wallet_transfer kwt
+    <where>
+      kwt.del_flag = 0
+      <if test="moneyPage.channel != null and moneyPage.channel != ''">
+        and kwt.channel = #{moneyPage.channel,jdbcType=VARCHAR}
+      </if>
+      <if test="moneyPage.uid != null and moneyPage.uid != ''">
+        and kwt.uid = #{moneyPage.uid,jdbcType=VARCHAR}
+      </if>
+      <if test="moneyPage.filter != null and moneyPage.filter != ''">
+        and kwt.filter = #{moneyPage.filter,jdbcType=VARCHAR}
+      </if>
+      <if test="moneyPage.keywords != null and moneyPage.keywords != ''">
+        and kwt.order_no like concat('%', #{moneyPage.keywords,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
+  </select>
+</mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpWalletTransferMapper.xml

@@ -53,6 +53,9 @@
             <if test="moneyPage.filter != null and moneyPage.filter != ''">
                 and kwt.filter = #{moneyPage.filter,jdbcType=VARCHAR}
             </if>
+            <if test="moneyPage.keywords != null and moneyPage.keywords != ''">
+                and kwt.order_no like concat('%', #{moneyPage.keywords,jdbcType=VARCHAR}, '%')
+            </if>
         </where>
     </select>
     <select id="sumMoney" resultType="java.math.BigDecimal">
@@ -72,4 +75,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

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

@@ -53,7 +53,7 @@ public class AcceptCarriageOrderController {
      * 承运订单首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/selectAcceptCarriageOrderList", method = RequestMethod.POST)
     public HttpResult acceptCarriageOrderList(@Valid @RequestBody AcceptCarriageOrderQuery query) {
@@ -71,13 +71,12 @@ public class AcceptCarriageOrderController {
      * 承运订单top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/statisticsAcceptCarriage", method = RequestMethod.POST)
     public HttpResult statisticsAcceptCarriage(@Valid @RequestBody AcceptCarriageOrderQuery query) {
         try {
-            HttpResult result = acceptCarriageOrderService.statisticsAcceptCarriage(query, "2");
-            return result;
+            return acceptCarriageOrderService.statisticsAcceptCarriage(query, "2");
         } catch (Exception e) {
             log.error("承运订单top统计 查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -86,9 +85,7 @@ public class AcceptCarriageOrderController {
 
     /**
      * 承运订单导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/acceptCarriageOrderExport", method = RequestMethod.POST)
@@ -104,8 +101,8 @@ public class AcceptCarriageOrderController {
     /**
      * 获取订单详情-托运订单-承运订单-销售订单-采购订单
      *
-     * @param dto
-     * @return
+     * @param dto   获取订单数据请求参数
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.POST)
@@ -124,7 +121,7 @@ public class AcceptCarriageOrderController {
      * 承运合同/托运合同-根据合同id获取托运订单列表
      *
      * @param contractParam 请求参数
-     * @return
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
@@ -140,8 +137,8 @@ public class AcceptCarriageOrderController {
     /**
      * 托运订单/承运订单-撤销托运
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  订单请求数据
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/cancelConsign", method = RequestMethod.POST)
@@ -157,8 +154,8 @@ public class AcceptCarriageOrderController {
     /**
      * 对账管理-运费收款对账界面查询接口
      *
-     * @param logisticsOrderParam
-     * @return
+     * @param logisticsOrderParam   物流请求数据
+     * @return  物流订单响应结果
      */
     @RequestMapping(value = "/getAcceptCarriageOrder", method = RequestMethod.POST)
     public HttpResult getAcceptCarriageOrder(@RequestBody @Valid LogisticsOrderParam logisticsOrderParam) {
@@ -175,8 +172,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-接单
      *
-     * @param orderDTO
-     * @return
+     * @param orderDTO  物流订单接单请求数据
+     * @return  接单响应结果
      */
     @RequestMapping(value = "/orderTaking", method = RequestMethod.POST)
     public HttpResult orderTaking(@Validated @RequestBody OrderTakingDTO orderDTO) {
@@ -187,7 +184,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-分包托运
      *
      * @param query 请求参数
-     * @return
+     * @return 操作响应数据
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
@@ -205,7 +202,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-分包托运-订单详情
      *
      * @param id 物流订单id
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/subcontractConsignmentOrderDetail", method = RequestMethod.GET)
     public HttpResult subcontractConsignmentOrderDetail(@NotNull(message = "物流订单不能为空") @RequestParam("id") String id) {
@@ -222,7 +219,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取运单详情
      *
      * @param wOrderId 运单id
-     * @return
+     * @return  运单数据
      */
     @RequestMapping(value = "/getWaybillData", method = RequestMethod.GET)
     public HttpResult getWaybillData(@NotNull(message = "物流订单id不能为空") @RequestParam("wOrderId") String wOrderId) {
@@ -239,9 +236,9 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取分包托运列表
      *
      * @param lOrderIds 单据id
-     * @param page
-     * @param pageSize
-     * @return
+     * @param page  请求当前页数
+     * @param pageSize  请求每页条数
+     * @return  响应结果
      */
     @RequestMapping(value = "/getSubcontractConsignment", method = RequestMethod.GET)
     public HttpResult getSubcontractConsignment(@RequestParam("lOrderIds") @NotBlank(message = "单据id不能为空") String lOrderIds,
@@ -259,7 +256,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取分包托运列表-数据统计
      *
      * @param lOrderId 单据id
-     * @return
+     * @return  统计响应结果
      */
     @RequestMapping(value = "/getSubcontractConsignmentCount", method = RequestMethod.GET)
     public HttpResult getSubcontractConsignmentCount(@RequestParam("lOrderId") @NotBlank(message = "单据id不能为空") String lOrderId) {
@@ -273,8 +270,8 @@ public class AcceptCarriageOrderController {
 
     /**
      * 承运订单-停止接单-查询
-     *
-     * @return
+     * @param driverParam   查询订单数据
+     * @return  查询结果数据
      */
     @RequestMapping(value = "/acceptStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult stopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
@@ -290,8 +287,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-设置停止接单-循环单提交
      *
-     * @param stopOrderTakingDTO
-     * @return
+     * @param stopOrderTakingDTO    停止接单请求数据
+     * @return  响应结果
      */
     @RequestMapping(value = "/acceptStopDocumentCommit", method = RequestMethod.POST)
     public HttpResult stopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
@@ -308,7 +305,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-取消派车(撤回派车)/单趟撤回
      *
      * @param baseList 车辆运单id
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/cancelDelivery", method = RequestMethod.POST)
     public HttpResult cancelDelivery(@Valid @RequestBody BaseList baseList) {
@@ -325,8 +322,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-完结订单-页面数据查询
      *
-     * @param orderId
-     * @return
+     * @param orderId 物流订单id
+     * @return  查询响应结果
      */
     @RequestMapping(value = "/acceptCarriageOrderFinishDetail", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
@@ -342,8 +339,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/commitAcceptCarriageOrderFinish", method = RequestMethod.POST)
     public HttpResult commitAcceptCarriageOrderFinish(@Valid @RequestBody OrderFinishDTO orderFinishDTO) {
@@ -359,7 +356,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-查看撤销原因+驳回原因
      *
      * @param id 物流订单
-     * @return
+     * @return 响应结果
      */
     @RequestMapping(value = "/getCancelReason", method = RequestMethod.GET)
     public HttpResult getCancelReason(@NotBlank(message = "物流订单id不能为空") @RequestParam("id") String id,
@@ -376,7 +373,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-新建订单
      *
      * @param addOrderDTO 页面传递参数
-     * @return
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
@@ -394,7 +391,7 @@ public class AcceptCarriageOrderController {
     /**
      * 工作台-承运业务统计
      * @param dateType 1代表周 2代表月
-     * @return
+     * @return 统计结果
      */
     @RequestMapping(value = "/workbenchStatisticsByAcceptCarriage", method = RequestMethod.GET)
     public HttpResult workbenchStatistics(@RequestParam("dateType") @NotBlank(message = "类型不能为空") String dateType) {
@@ -409,8 +406,8 @@ public class AcceptCarriageOrderController {
 
     /**
      * 工作台-物流运输数据统计-承运
-     *
-     * @return
+     * @param logisticsOrderStatistics  物流统计请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/workbenchLogisticsOrderStatistics", method = RequestMethod.POST)
     public HttpResult workbenchLogisticsOrderStatistics(@RequestBody LogisticsOrderStatisticsParam logisticsOrderStatistics) {

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

@@ -52,7 +52,7 @@ public class ConsignOrderController {
      * 托运订单首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/selectConsignOrderList", method = RequestMethod.POST)
     public HttpResult selectConsignOrderList(@Valid @RequestBody AcceptCarriageOrderQuery query) {
@@ -70,25 +70,21 @@ public class ConsignOrderController {
      * 托运订单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/statisticsConsign", method = RequestMethod.POST)
     public HttpResult statisticsConsign(@Valid @RequestBody AcceptCarriageOrderQuery query) {
         try {
-            HttpResult result = consignOrderService.statisticsConsign(query, "1");
-            return result;
+            return consignOrderService.statisticsConsign(query, "1");
         } catch (Exception e) {
             log.error("托运订单-top统计 查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
 
-
     /**
-     * 托运订单-导出
-     *
+     *  托运订单-导出
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/consignExport", method = RequestMethod.POST)
     public void exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
@@ -103,9 +99,8 @@ public class ConsignOrderController {
 
     /**
      * 托运订单/承运订单-获取车辆运单
-     *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单请求数据
+     * @return  车辆运单响应结果
      */
     @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrder(@Validated @RequestBody OrderDTO orderDto) {
@@ -123,7 +118,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-物流订单id查询-针对循环单
      *
      * @param baseList 页面请求数据
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentDetailByOrderIds", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetailByOrderIds(@Valid @RequestBody BaseList baseList) {
@@ -140,7 +135,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-条件查询-针对循环单
      *
      * @param driverParam 页面请求数据
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
@@ -158,7 +153,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-提交-针对循环单
      *
      * @param stopOrderTakingDTO 请求参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentCommit", method = RequestMethod.POST)
     public HttpResult consignStopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
@@ -209,8 +204,8 @@ public class ConsignOrderController {
     /**
      * 托运订单/承运订单-获取车辆运单-统计
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单数据
+     * @return  车辆运单响应结果
      */
     @RequestMapping(value = "/getCarWaybillByOrderCount", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrderCount(@Validated @RequestBody OrderDTO orderDto) {
@@ -227,8 +222,8 @@ public class ConsignOrderController {
     /**
      * 托运订单查看驳回原因
      *
-     * @param id
-     * @return
+     * @param id    物流订单id
+     * @return  响应结果
      */
     @RequestMapping(value = "/getRejectReason", method = RequestMethod.GET)
     public HttpResult getRejectReasonById(@NotBlank @RequestParam("id") String id,
@@ -239,8 +234,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-获取车辆信息
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/getCarListByOrder", method = RequestMethod.POST)
     public HttpResult getCarListByOrder(@Validated @RequestBody OrderDTO orderDto) {
@@ -256,8 +251,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-完结订单-页面数据查询
      *
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignOrderFinishDetail", method = RequestMethod.GET)
     public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
@@ -273,8 +268,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/commitConsignOrderFinish", method = RequestMethod.POST)
     public HttpResult commitConsignOrderFinish(@Validated @RequestBody OrderFinishDTO orderFinishDTO) {
@@ -291,7 +286,7 @@ public class ConsignOrderController {
      * 托运订单-新建订单
      *
      * @param addOrderDTO 页面传递参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
     public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
@@ -319,8 +314,8 @@ public class ConsignOrderController {
 
     /**
      * 工作台-托运业务统计
-     *
-     * @return
+     * @param dateType  请求参数 1周 2月
+     * @return  统计响应结果
      */
     @RequestMapping(value = "/workbenchStatistics", method = RequestMethod.GET)
     public HttpResult workbenchStatistics(@RequestParam("dateType") @NotBlank(message = "类型不能为空") String dateType) {
@@ -336,8 +331,8 @@ public class ConsignOrderController {
 
     /**
      * 工作台-物流运输数据统计-托运业务
-     *
-     * @return
+     * @param logisticsOrderStatistics  物流订单统计请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/workbenchLogisticsOrderStatistics", method = RequestMethod.POST)
     public HttpResult workbenchLogisticsOrderStatistics(@RequestBody LogisticsOrderStatisticsParam logisticsOrderStatistics) {

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

@@ -48,8 +48,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购订单-物流托运生成托运订单
      *
-     * @param logisticsConsignmentParam
-     * @return
+     * @param logisticsConsignmentParam 页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
@@ -68,7 +68,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-销售订单id
      *
      * @param orderQuery 销售订单id
-     * @return
+     * @return  查询物流订单结果
      */
     @RequestMapping(value = "/purchaseLogisticsOrder", method = RequestMethod.POST)
     public HttpResult purchaseLogisticsOrder(@RequestBody @Valid OrderQuery orderQuery) {
@@ -85,7 +85,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-下方数据统计-贸易订单id
      *
      * @param id 贸易订单id
-     * @return
+     * @return  物流订单结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsOrderCount", method = RequestMethod.GET)
@@ -103,7 +103,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-撤销托运
      *
      * @param baseList 物流运单ids
-     * @return
+     * @return  操作结果
      */
     @Validated
     @RequestMapping(value = "/purchaseCancelConsign", method = RequestMethod.POST)
@@ -122,8 +122,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购购订单-车辆信息-销售订单ids
      *
-     * @param orderQuery
-     * @return
+     * @param orderQuery    销售订单请求数据
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsCar", method = RequestMethod.POST)
@@ -140,8 +140,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购/销售订单-完成车次统计
      *
-     * @param tradeOrderId
-     * @return
+     * @param tradeOrderId  贸易订单id
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/statisticsWaybillCount", method = RequestMethod.GET)
@@ -159,7 +159,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-订单完结-数据查询
      *
      * @param orderId 物流订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/selectPurchaseOrderFinish", method = RequestMethod.GET)
@@ -176,15 +176,15 @@ public class LogisticsConsignmentController {
     /**
      * 采购订单-托运订单列表-完结订单
      *
-     * @param OrderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单完结-页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseOrderFinish", method = RequestMethod.POST)
-    public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderFinishDTO OrderFinishDTO) {
-        log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(OrderFinishDTO));
+    public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderFinishDTO orderFinishDTO) {
+        log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
         try {
-            return logisticsConsignmentService.orderFinish(OrderFinishDTO, "1");
+            return logisticsConsignmentService.orderFinish(orderFinishDTO, "1");
         } catch (Exception e) {
             log.error("采购订单-托运订单列表-完结订单 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -195,8 +195,8 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-物流托运生成托运订单
      *
-     * @param logisticsConsignmentParam
-     * @return
+     * @param logisticsConsignmentParam 页面请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
     public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
@@ -214,7 +214,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-销售订单id
      *
      * @param query 订单查询
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.POST)
     public HttpResult sellLogisticsOrder(@Valid @RequestBody OrderQuery query) {
@@ -231,7 +231,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-下方数据统计-贸易订单id
      *
      * @param id 贸易订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/sellLogisticsOrderCount", method = RequestMethod.GET)
@@ -249,7 +249,7 @@ public class LogisticsConsignmentController {
      * 销售订单-车辆列表-销售订单id
      *
      * @param orderQuery 销售订单ids
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.POST)
     public HttpResult sellLogisticsCar(@Valid @RequestBody OrderQuery orderQuery) {
@@ -266,7 +266,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-撤销托运
      *
      * @param baseList 物流订单id
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.POST)
     @GlobalTransactional(name = "default_tx_group")
@@ -285,7 +285,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-订单完结-数据查询
      *
      * @param orderId 物流订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/selectSellOrderFinish", method = RequestMethod.GET)
@@ -302,8 +302,8 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-托运订单列表-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    完结数据页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/sellOrderFinish", method = RequestMethod.POST)
@@ -354,7 +354,7 @@ public class LogisticsConsignmentController {
 
     /**
      * 生成物流订单编号demo
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addLogisticsNumberDemo", method = RequestMethod.GET)
     public HttpResult addLogisticsNumberDemo() {
@@ -364,7 +364,7 @@ public class LogisticsConsignmentController {
 
     /**
      * 生成车辆订单编号demo
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addWaybillNumberDemo", method = RequestMethod.GET)
     public HttpResult addWaybillNumberDemo() {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppConsignController.java

@@ -32,8 +32,8 @@ public class AppConsignController {
 
     /**
      * 企业app订单管理数据托运订单统计
-     * @param query
-     * @return
+     * @param query 请求参数
+     * @return  统计响应结果
      */
     @RequestMapping(name = "企业app订单管理数据托运订单统计", path = "/statisticsConsign", method = RequestMethod.POST)
     public HttpResult statisticsConsign(@Valid  @RequestBody AcceptCarriageOrderQuery query) {
@@ -48,8 +48,8 @@ public class AppConsignController {
 
     /**
      * 企业app托运订单详情统计-统计车辆运单
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @return  车辆运单数据
      */
     @RequestMapping(name = "企业app托运订单详情统计", path = "/statisticsConsignByOrderId", method = RequestMethod.GET)
     public HttpResult statisticsConsignByOrderId(@NotBlank(message = "订单id不能为空") @RequestParam("orderId") String orderId) {
@@ -64,8 +64,8 @@ public class AppConsignController {
 
     /**
      * 企业app托运订单循环车辆运单列表查询
-     * @param driverParam
-     * @return
+     * @param driverParam   循环单查询请求数据
+     * @return  车辆运单列表数据
      */
     @RequestMapping(name = "企业app托运订单循环车辆运单列表查询", path = "/consignStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -25,8 +25,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单统计分类 - [运输中|已完成]
-     * @param keyword
-     * @return
+     * @param keyword   查询关键字
+     * @return  统计响应结果
      */
     @Valid
     @RequestMapping(name = "APP运单统计分类", value = "/waybillStatistic", method = RequestMethod.GET)
@@ -43,8 +43,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单列表 - [运输中|已完成]
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   运单查询请求dto
+     * @return  运单查询结果
      */
     @Valid
     @RequestMapping(name = "APP运单列表", value = "/waybillData", method = RequestMethod.POST)
@@ -59,8 +59,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单列表吨量统计 - [运输中|已完成]
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   统计运单数据查询
+     * @return  运单重量响应结果
      */
     @Valid
     @RequestMapping(name = "APP运单吨量统计", value = "/waybillAmountStatistic", method = RequestMethod.POST)
@@ -75,8 +75,8 @@ public class AppWayBillController {
 
     /**
      * APP 物流订单-运单列表
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   物流订单查询
+     * @return  车辆运单响应结果
      */
     @Valid
     @RequestMapping(name = "物流订单-运单列表", value = "/logisticOrderWaybillData", method = RequestMethod.POST)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementLogisticsOrderController.java

@@ -45,7 +45,7 @@ public class ManagementLogisticsOrderController {
      * 运营管理端-物流订单-首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  物流订单数据查询结果
      */
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     public HttpResult selectLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
@@ -64,14 +64,13 @@ public class ManagementLogisticsOrderController {
      * 运营管理端-物流订单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  物流订单统计结果
      */
     @RequestMapping(value = "/statistics", method = RequestMethod.POST)
     public HttpResult statisticsLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
         log.info("运营管理端-物流订单-top统计 查询 :{}", JSONObject.toJSONString(query));
         try {
-            HttpResult result = managementLogisticsOrderService.statisticsLogisticsOrder(query);
-            return result;
+            return managementLogisticsOrderService.statisticsLogisticsOrder(query);
         } catch (Exception e) {
             log.error("运营管理端-物流订单-top统计 失败 :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -80,9 +79,7 @@ public class ManagementLogisticsOrderController {
 
     /**
      * 运营管理端-物流订单-导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public void exportLogisticsOrder(@Validated @RequestBody ManagementLogisticsOrderQuery query) {
@@ -99,9 +96,9 @@ public class ManagementLogisticsOrderController {
 
     /**
      * 运营端-物流订单-获取订单详情
-     *
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @param orderNo   物流订单编号
+     * @return  订单详情数据
      */
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.GET)
     public HttpResult getOrderDetail(@RequestParam("orderId") @NotBlank(message = "订单id不能为空") String orderId,
@@ -119,8 +116,8 @@ public class ManagementLogisticsOrderController {
     /**
      * 运营端-物流订单-获取运单信息
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单查询请求参数
+     * @return  车辆运单信息
      */
     @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrder(@Valid @RequestBody LogisticsOrderQuery orderDto) {
@@ -137,7 +134,7 @@ public class ManagementLogisticsOrderController {
      * 基础档案-物流合同档案-根据合同id获取托运订单列表
      *
      * @param contractParam 请求参数[合同ids]
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/getLogisticsContract", method = RequestMethod.POST)
     public HttpResult getLogisticsContract(@Valid @RequestBody ManagementContractParam contractParam) {
@@ -155,7 +152,7 @@ public class ManagementLogisticsOrderController {
      * 运营端-贸易订单-获取物流订单
      *
      * @param query 订单查询
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/selectLogisticsOrder", method = RequestMethod.POST)
     public HttpResult selectLogisticsOrderByTradeOrder(@Valid @RequestBody OrderQuery query) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementWaybillOrderController.java

@@ -40,7 +40,7 @@ public class ManagementWaybillOrderController {
      * 运营管理端-运单-首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  运单响应结果数据
      */
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     public HttpResult selectWaybillOrder(@Valid @RequestBody ManagementWaybillOrderQuery query) {
@@ -57,7 +57,7 @@ public class ManagementWaybillOrderController {
      * 运营管理端-运单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  运单统计结果
      */
     @RequestMapping(value = "/statistics", method = RequestMethod.POST)
     public HttpResult statisticsWaybillOrder(@Valid @RequestBody ManagementWaybillOrderQuery query) {
@@ -70,11 +70,9 @@ public class ManagementWaybillOrderController {
         }
     }
 
-    /**
+    /***
      * 运营管理端-运单-导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public void exportWaybillOrder(@Validated @RequestBody ManagementWaybillOrderQuery query) {
@@ -91,8 +89,8 @@ public class ManagementWaybillOrderController {
     /**
      * 运营端-运单-获取订单详情
      *
-     * @param id
-     * @return
+     * @param id 订单id
+     * @return  订单数据
      */
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.GET)
     public HttpResult getOrderDetail(@RequestParam("id") Long id) {

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

@@ -135,9 +135,6 @@ public class AcceptCarriageOrderService {
     @Autowired
     private KwtWaybillOrderTicketMapper waybillOrderTicketMapper;
 
-    @Autowired
-    private KwtWaybillOrderTrackMapper waybillOrderTrackMapper;
-
     @Autowired
     public KwtLogisticsOrderGoodsMapper kwtLogisticsOrderGoodsMapper;
 
@@ -160,8 +157,8 @@ public class AcceptCarriageOrderService {
     /**
      * 承运订单-分包托运
      *
-     * @param bo
-     * @return
+     * @param bo    请求数据
+     * @return  响应结果
      */
     @Transactional(rollbackFor = Exception.class)
     public HttpResult subcontractConsignment(SubcontractConsignmentDTO bo) {
@@ -227,11 +224,8 @@ public class AcceptCarriageOrderService {
         String substring = pidOrderNo.substring(0, 11);
         String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
-        /**分包托运需要判断处于哪一级分包托运
-         * 需要记录当前分包数据-分包上游数据
-         * */
-        /**
-         * 判断是否已存在分包【当前分包只允许加上主单一共四级】*/
+        //分包托运需要判断处于哪一级分包托运,需要记录当前分包数据-分包上游数据
+       //判断是否已存在分包【当前分包只允许加上主单一共四级】
         if (level >= 4) {
             throw new RuntimeException("分包次数已达上限!");
         }
@@ -451,8 +445,8 @@ public class AcceptCarriageOrderService {
     /**
      * 分包托运-承运订单-单据状态
      *
-     * @param bo
-     * @param orderId
+     * @param bo    请求参数
+     * @param orderId   单据id
      */
     private void insertLogisticsOrderTrack(SubcontractConsignmentDTO bo, Long orderId, Integer orderStatus) {
         KwtLogisticsOrderTrack entity = new KwtLogisticsOrderTrack();
@@ -1531,7 +1525,7 @@ public class AcceptCarriageOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && "1".equals(logisticsOrder.getType())) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为传递页面传输值  不传递总量
@@ -2923,8 +2917,8 @@ public class AcceptCarriageOrderService {
         } 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);
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -2950,8 +2944,8 @@ public class AcceptCarriageOrderService {
         } 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);
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             amountFlag = 2;
@@ -2979,8 +2973,8 @@ public class AcceptCarriageOrderService {
         } 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);
+            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -3031,13 +3025,13 @@ public class AcceptCarriageOrderService {
 
             List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
                     OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -3057,13 +3051,13 @@ public class AcceptCarriageOrderService {
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
                     OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));

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

@@ -278,7 +278,7 @@ public class CommonService {
         } else {
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if (type.equals("1")) {
+            if ("1".equals(type)) {
                 map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {

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

@@ -916,7 +916,7 @@ public class ConsignOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && "1".equals(logisticsOrder.getType())) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为不传递总量，只传递当前单据页面传递值
@@ -2214,8 +2214,8 @@ public class ConsignOrderService {
         } 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);
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -2241,8 +2241,8 @@ public class ConsignOrderService {
         } 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);
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             amountFlag = 2;
@@ -2270,8 +2270,8 @@ public class ConsignOrderService {
         } 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);
+            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, RoundingMode.HALF_UP)
+                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, RoundingMode.HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -2322,13 +2322,13 @@ public class ConsignOrderService {
 
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -2348,13 +2348,13 @@ public class ConsignOrderService {
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));

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

@@ -937,7 +937,7 @@ public class WaybillManagementService {
      */
     public List<Long> getWallBillStatues(String status) {
         List<Long> _list = new ArrayList<>();
-        if (status.equals("onway")) {
+        if ("onway".equals(status)) {
             _list.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
             _list.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
             _list.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
@@ -945,7 +945,7 @@ public class WaybillManagementService {
             _list.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
             _list.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
         }
-        if (status.equals("finish")) {
+        if ("finish".equals(status)) {
             _list.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
             _list.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
             _list.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode().longValue());