电子钱包，资金明细-提现订单 功能开发

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

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author xucaiqin
@@ -27,8 +28,8 @@ public class CashItem implements Serializable {
     private String channelLabel;
     @JSONField(name = "platform_no")
     private String platformNo;
-    private Integer money;
-    private Integer balance;
+    private BigDecimal money;
+    private BigDecimal balance;
     private String remarks;
     @JSONField(name = "create_time")
     private String createTime;

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

@@ -1410,25 +1410,36 @@ public class WalletService {
      * @return
      */
     public PageRes<WalletDetailBase> cashOrder(MoneyPage moneyPage) {
-        WalletDetailBase chargeDetailVo = new WalletDetailBase();
-        chargeDetailVo.setOrderNo("");
-        chargeDetailVo.setChannel("");
-        chargeDetailVo.setChannelDict("");
-        chargeDetailVo.setChannelLabel("");
-        chargeDetailVo.setUid("");
-        chargeDetailVo.setUidName("");
-        chargeDetailVo.setFilter("");
-        chargeDetailVo.setFilterName("");
-        chargeDetailVo.setStatus(0);
-        chargeDetailVo.setStatusLabel("");
-        chargeDetailVo.setMoney(new BigDecimal("0"));
-        chargeDetailVo.setRemark("");
-//        chargeDetailVo.setCreateTime(LocalDateTime.now());
-        List<WalletDetailBase> objects = new ArrayList<>() {{
-            add(chargeDetailVo);
-        }};
-        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
-        return new PageRes<>(objectPageInfo, objects);
+        String channel = moneyPage.getChannel();
+        ChannelEnum channelEnum = ChannelEnum.getByChannel(channel);
+        if (Objects.isNull(channelEnum)) {
+            throw new BusinessException("支付通道不存在");
+        }
+        R<CashPage> cashPageR = payCenterService.withdrawIndex(moneyPage.getUid(), channelEnum, "all", moneyPage.getPage(), moneyPage.getPageSize());
+        if (!cashPageR.getStatus()) {
+            return new PageRes<>(moneyPage.getPage(), moneyPage.getPageSize(), 0, 0, new ArrayList<>());
+        }
+        CashPage data = cashPageR.getData();
+        List<CashItem> rows = data.getRows();
+        List<WalletDetailBase> collect = rows.stream().map(a -> {
+            WalletDetailBase walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(a.getOrderNo());
+            walletDetailBase.setChannel(a.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(a.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(a.getChannel()));
+            walletDetailBase.setUid(a.getUid());
+            walletDetailBase.setUidName(getFirmName(a.getUid()));
+            walletDetailBase.setFilter("");
+            walletDetailBase.setFilterName("");
+            walletDetailBase.setStatus(a.getStatus());
+            walletDetailBase.setStatusLabel(a.getStatusLabel());
+            walletDetailBase.setMoney(walletDetailBase.smallMoney(a.getMoney()));
+            walletDetailBase.setRemark(a.getRemarks());
+            walletDetailBase.setCreateTime(a.getCreateTime());
+
+            return walletDetailBase;
+        }).collect(Collectors.toList());
+        return new PageRes<>(moneyPage.getPage(), moneyPage.getPageSize(), data.getTotal(), (int) (data.getTotal() / moneyPage.getPageSize() + 1), collect);
     }
 
     /**
@@ -1575,6 +1586,12 @@ public class WalletService {
         return HttpResult.ok("冻结成功");
     }
 
+    /**
+     * 预付-详细记录
+     *
+     * @param moneyPage
+     * @return
+     */
     public PageRes<PrePayDetailVo> prePayOrder(MoneyPage moneyPage) {
         PrePayDetailVo chargeDetailVo = new PrePayDetailVo();
         chargeDetailVo.setOrderNo("123");
@@ -1597,6 +1614,12 @@ public class WalletService {
         return new PageRes<>(objectPageInfo, objects);
     }
 
+    /**
+     * 预收-详细记录
+     *
+     * @param moneyPage
+     * @return
+     */
     public PageRes<PrePayDetailVo> preReceiveOrder(MoneyPage moneyPage) {
         PrePayDetailVo chargeDetailVo = new PrePayDetailVo();
         chargeDetailVo.setOrderNo("123");