新增转帐中金额

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

@@ -18,7 +18,7 @@ import java.util.List;
 @Setter
 public class FinanceCount {
     /**
-     * 周期维度 日、月
+     * 周期维度 1-日、2-周、3-月 4-年
      */
     @NotBlank(message = "周期维度不能为空")
     private Integer circle;

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

@@ -41,6 +41,10 @@ public class FundVo implements Serializable {
      * 充值中金额
      */
     private String chargingMoney;
+    /**
+     * 转账中金额
+     */
+    private String transferMoney;
     /**
      * 提现中金额
      */

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

@@ -62,7 +62,7 @@ public class WalletService {
     private final PayCenterService payCenterService;
     private final KwpWalletRelationService walletRelationService;
     private final KwpWalletRefundMapper kwpWalletRefundMapper;
-    private final KwpWalletTransferMapper transferMapper;
+    private final KwpWalletTransferMapper kwpWalletTransferMapper;
     private final RedisLockUtil redisLockUtil;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
@@ -182,6 +182,20 @@ public class WalletService {
         }
     }
 
+    private void transferMoney(FundVo fundVo) {
+        DecimalFormat df = new DecimalFormat("0.00");
+        LambdaQueryWrapper<KwpWalletTransfer> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwpWalletTransfer::getUid, fundVo.getUid())
+                .eq(KwpWalletTransfer::getFilter, fundVo.getFilter()).eq(KwpWalletTransfer::getChannel, fundVo.getChannel())
+                .eq(KwpWalletTransfer::getStatus, TransferEnum.TRANSFERRING.getStatus()).last("limit 1");
+        KwpWalletTransfer kwpWalletTransfer = kwpWalletTransferMapper.selectOne(wrapper);
+        if (Objects.nonNull(kwpWalletTransfer)) {
+            fundVo.setTransferMoney(df.format(kwpWalletTransfer.getMoney()));
+        } else {
+            fundVo.setTransferMoney("0.00");
+        }
+    }
+
     /**
      * 按钱包渠道进行统计钱包清单数量
      *
@@ -409,6 +423,7 @@ public class WalletService {
             fundVo.setChargingMoney(dfMoney(re.getChargingMoney()));
             fundVo.setTotalMoney(dfMoney(re.getTotalMoney()));
             refundMoney2(fundVo);
+            transferMoney(fundVo);
             vo.add(fundVo);
         }
         DecimalFormat df = new DecimalFormat("0.00");
@@ -573,12 +588,12 @@ public class WalletService {
                 if (!businessNoR1.getStatus()) {
                     //转账失败
                     walletTransfer.setStatus(TransferEnum.FAILED.getStatus());
-                    transferMapper.insert(walletTransfer);
+                    kwpWalletTransferMapper.insert(walletTransfer);
                     throw new BusinessException(StringUtils.isNotBlank(businessNoR1.getMsg()) ? businessNoR1.getMsg() : "转账失败");
                 }
                 //转帐中
                 walletTransfer.setStatus(TransferEnum.TRANSFERRING.getStatus());
-                transferMapper.insert(walletTransfer);
+                kwpWalletTransferMapper.insert(walletTransfer);
                 return businessNoR1.getData();
             } finally {
                 redisLockUtil.unlock(key);