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

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

@@ -109,19 +109,4 @@ public enum ChannelEnum {
         }
         return null;
     }
-
-    /**
-     * 字典值转
-     *
-     * @param value 渠道字典值 1
-     * @return huifu
-     */
-    public static String valueToChannel(String value) {
-        for (ChannelEnum channelEnum : ChannelEnum.values()) {
-            if (channelEnum.getValue().equals(value)) {
-                return channelEnum.getChannel();
-            }
-        }
-        return null;
-    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpLedgerLogisticsController.java

@@ -104,7 +104,7 @@ public class AppKwpLedgerLogisticsController {
      */
     @PostMapping("carrierSum")
     public HttpResult carrierSum(@RequestBody @Valid LogisticsReq logisticsReq) {
-        return HttpResult.ok(kwpLedgerLogisticsService.carrierSum(logisticsReq));
+        return HttpResult.ok(kwpLedgerLogisticsService.carrierSumCount(logisticsReq));
     }
 
     /**

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

@@ -8,10 +8,10 @@ import com.sckw.payment.model.dto.LedgerShipperDto;
 import com.sckw.payment.model.dto.LedgerSize;
 import com.sckw.payment.model.vo.LedgerLogistics;
 import com.sckw.payment.model.vo.req.LogisticsReq;
-import com.sckw.payment.model.vo.res.LedgerCountSumVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -92,14 +92,14 @@ public interface KwpLedgerLogisticsMapper extends BaseMapper<KwpLedgerLogistics>
      * @param logisticsReq
      * @return
      */
-    LedgerCountSumVo countSum(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
+    Long countSum(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
     /**
      * app统计对账金额
      *
      * @param logisticsReq
      * @return
      */
-    LedgerCountSumVo countSumMoney(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
+    BigDecimal countSumMoney(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("status") List<Integer> status);
 
     /**
      * @param entId     托运方企业

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

@@ -8,7 +8,6 @@ import com.sckw.payment.model.dto.LedgerSize;
 import com.sckw.payment.model.dto.LedgerTradeDto;
 import com.sckw.payment.model.vo.LedgerSell;
 import com.sckw.payment.model.vo.req.TradeReq;
-import com.sckw.payment.model.vo.res.LedgerCountSumVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -72,7 +71,7 @@ public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
      * @param status
      * @return
      */
-    LedgerCountSumVo countSum(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
+    Long countSum(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
     /**
      * app端对账统计
      *
@@ -80,7 +79,7 @@ public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
      * @param status
      * @return
      */
-    LedgerCountSumVo countSumMoney(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
+    BigDecimal countSumMoney(@Param("tradeReq") TradeReq tradeReq, @Param("status") List<Integer> status);
 
     void updatePrice(@Param("id") Long id, @Param("totalPrice") BigDecimal totalPrice);
 

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

@@ -1,15 +1,21 @@
 package com.sckw.payment.model.vo.res;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * @author xucaiqin
  * @date 2023-08-17 14:03:38
  */
 @Getter
 @Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class LedgerCountSumVo {
-    private String totalPrice;
-    private String ledgerCount;
+    private BigDecimal totalPrice;
+    private Long ledgerCount;
 }

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

@@ -146,12 +146,9 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             add(LedgerEnum.SAVE.getStatus());
             add(LedgerEnum.REVOCATION.getStatus());
         }};
-        LedgerCountSumVo ledgerCountSumVo = logisticsMapper.countSum(logisticsReq, status);
-        LedgerCountSumVo ledgerCountSumVo2 = logisticsMapper.countSumMoney(logisticsReq, status);
-        LedgerCountSumVo ledgerCountSumVo1 = new LedgerCountSumVo();
-        ledgerCountSumVo1.setTotalPrice(ledgerCountSumVo.getLedgerCount());
-        ledgerCountSumVo1.setLedgerCount(ledgerCountSumVo2.getTotalPrice());
-        return ledgerCountSumVo1;
+        Long aLong = logisticsMapper.countSum(logisticsReq, status);
+        BigDecimal bigDecimal = logisticsMapper.countSumMoney(logisticsReq, status);
+        return new LedgerCountSumVo(bigDecimal, aLong);
     }
 
     public PageRes<ILedger> carrierList(LogisticsReq logisticsReq) {
@@ -169,17 +166,14 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         return new PageRes<>();
     }
 
-    public LedgerCountSumVo carrierSum(LogisticsReq logisticsReq) {
+    public LedgerCountSumVo carrierSumCount(LogisticsReq logisticsReq) {
         fillPara(logisticsReq);
         logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
         logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<Integer> status = new ArrayList<>();
-        LedgerCountSumVo ledgerCountSumVo = logisticsMapper.countSum(logisticsReq, status);
-        LedgerCountSumVo ledgerCountSumVo2 = logisticsMapper.countSumMoney(logisticsReq, status);
-        LedgerCountSumVo ledgerCountSumVo1 = new LedgerCountSumVo();
-        ledgerCountSumVo1.setTotalPrice(ledgerCountSumVo.getLedgerCount());
-        ledgerCountSumVo1.setLedgerCount(ledgerCountSumVo2.getTotalPrice());
-        return ledgerCountSumVo1;
+        Long aLong = logisticsMapper.countSum(logisticsReq, status);
+        BigDecimal bigDecimal = logisticsMapper.countSumMoney(logisticsReq, status);
+        return new LedgerCountSumVo(bigDecimal, aLong);
     }
 
     /**

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

@@ -21,6 +21,7 @@ import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.SettlementEnum;
 import com.sckw.payment.model.constant.TradeUnitType;
+import com.sckw.payment.model.constant.TradingEnum;
 import com.sckw.payment.model.dto.*;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.res.LedgerCountSumVo;
@@ -148,9 +149,9 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
         List<Integer> status = new ArrayList<>();
 
-        LedgerCountSumVo ledgerCountSumVo = tradeMapper.countSum(tradeReq, status);
-        LedgerCountSumVo ledgerCountSumVo2 = tradeMapper.countSumMoney(tradeReq, status);
-        return new LedgerCountSumVo(ledgerCountSumVo2.getTotalPrice(), ledgerCountSumVo.getLedgerCount());
+        Long aLong = tradeMapper.countSum(tradeReq, status);
+        BigDecimal bigDecimal = tradeMapper.countSumMoney(tradeReq, status);
+        return new LedgerCountSumVo(bigDecimal, aLong);
     }
 
     /**
@@ -183,9 +184,9 @@ public class KwpLedgerTradeService extends AbsLedger {
             add(LedgerEnum.SAVE.getStatus());
             add(LedgerEnum.REVOCATION.getStatus());
         }};
-        LedgerCountSumVo ledgerCountSumVo = tradeMapper.countSum(tradeReq, status);
-        LedgerCountSumVo ledgerCountSumVo2 = tradeMapper.countSumMoney(tradeReq, status);
-        return new LedgerCountSumVo(ledgerCountSumVo2.getTotalPrice(), ledgerCountSumVo.getLedgerCount());
+        Long aLong = tradeMapper.countSum(tradeReq, status);
+        BigDecimal bigDecimal = tradeMapper.countSumMoney(tradeReq, status);
+        return new LedgerCountSumVo(bigDecimal, aLong);
     }
 
     private void removeDraft(Long id) {
@@ -253,17 +254,22 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeOrderService.check(ids);
         List<OrderDetailRes> resList = new ArrayList<>();
         Map<Long, String> map = new HashMap<>();
-
+        String trading = tradeSendReq.getTrading();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
             if (Objects.isNull(orderDetailById)) {
                 throw new BusinessException("订单未找到");
             }
-            KwpTradeFreeze byTOrderId = kwpTradeFreezeService.getByTOrderId(id);
-            if (Objects.isNull(byTOrderId)) {
-                throw new BusinessException("未找到关联的冻结单");
+            //1x 预付款 2x 货到付款 3x 线下付款
+            Integer prefix = TradingEnum.getPrefix(trading);
+            //仅预付款需要校验冻结单号
+            if (Objects.nonNull(prefix) && prefix == TradingEnum.PRE_PAY.getStatus() ) {
+                KwpTradeFreeze byTOrderId = kwpTradeFreezeService.getByTOrderId(id);
+                if(Objects.isNull(byTOrderId)){
+                    throw new BusinessException("未找到关联的冻结单");
+                }
+                map.put(id, byTOrderId.getOrderNo());
             }
-            map.put(id, byTOrderId.getOrderNo());
             resList.add(orderDetailById);
         }
         for (Long id : ids) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/task/RefundTask.java

@@ -42,7 +42,6 @@ public class RefundTask {
         wrapper.eq(KwpWalletRefund::getStatus, RefundEnum.REFUNDING.getStatus());
         List<KwpWalletRefund> kwpWalletRefunds = kwpWalletRefundMapper.selectList(wrapper);
         if (CollectionUtils.isEmpty(kwpWalletRefunds)) {
-            log.warn("退款定时任务无数据");
             return;
         }
         try {
@@ -71,7 +70,6 @@ public class RefundTask {
         wrapper.eq(KwpWalletTransfer::getStatus, TransferEnum.TRANSFERRING.getStatus());
         List<KwpWalletTransfer> kwpWalletTransferList = kwpWalletTransferMapper.selectList(wrapper);
         if (CollectionUtils.isEmpty(kwpWalletTransferList)) {
-            log.warn("转账定时任务无数据");
             return;
         }
         try {

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

@@ -250,8 +250,8 @@
         </where>
     </select>
     <!--金额统计规则：未筛选状态，统计已完成的对账单，结算金额。筛选状态统计具体的状态-->
-    <select id="countSumMoney" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select sum(kll.settle_price) "totalPrice"
+    <select id="countSumMoney" resultType="java.math.BigDecimal">
+        select ifnull(sum(kll.settle_price), 0)
         from kwp_ledger_logistics kll
                  inner join kwp_ledger_logistics_unit kllu
                             on kll.id = kllu.l_ledger_id and kllu.del_flag = 0 and
@@ -291,8 +291,8 @@
         </where>
     </select>
     <!--数量统计规则：未筛选，统计所有。需要根据企业方，排除已保存，已撤回两个状态-->
-    <select id="countSum" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select IFNULL(count(1), 0) "ledgerCount"
+    <select id="countSum" resultType="java.lang.Long">
+        select IFNULL(count(1), 0)
         from kwp_ledger_logistics kll
                  inner join kwp_ledger_logistics_unit kllu
                             on kll.id = kllu.l_ledger_id and kllu.del_flag = 0 and

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

@@ -303,8 +303,8 @@
         order by klt.generate_time desc
     </select>
     <!--数量统计规则：未筛选，统计所有。需要根据企业方，排除已保存，已撤回两个状态-->
-    <select id="countSum" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select IFNULL(count(1), 0) "ledgerCount"
+    <select id="countSum" resultType="java.lang.Long">
+        select IFNULL(count(1), 0)
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -348,9 +348,8 @@
     </select>
 
     <!--金额统计规则：未筛选状态，统计已完成的对账单，结算金额。筛选状态统计具体的状态-->
-    <select id="countSumMoney" resultType="com.sckw.payment.model.vo.res.LedgerCountSumVo">
-        select IFNULL(count(1), 0)   "ledgerCount",
-               sum(klt.settle_price) "totalPrice"
+    <select id="countSumMoney" resultType="java.math.BigDecimal">
+        select sum(klt.settle_price)
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and