包调整模块位置

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/common/BusinessNo.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/common/BusinessNo.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto.common;
+package com.sckw.payment.model.dto.common;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/common/Page.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/common/Page.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto.common;
+package com.sckw.payment.model.dto.common;
 
 import lombok.Getter;
 import lombok.Setter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/page/CashPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/page/CashPage.java

@@ -1,7 +1,8 @@
-package com.sckw.payment.api.model.dto.page;
+package com.sckw.payment.model.dto.page;
 
-import com.sckw.payment.api.model.dto.CashItem;
-import com.sckw.payment.api.model.dto.common.Page;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.sckw.payment.model.dto.common.Page;
+import com.sckw.payment.model.dto.wallet.CashItem;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +18,6 @@ public class CashPage extends Page<CashItem> {
     @Serial
     private static final long serialVersionUID = 8737528173711734529L;
 
-    private long total_withdraw_money;
-    private long total_balance;
+    @JSONField(name = "total_withdraw_money")
+    private String totalWithdrawMoney;
 }

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/page/PrePayIndexPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/page/PrePayIndexPage.java

@@ -1,7 +1,7 @@
-package com.sckw.payment.api.model.dto.page;
+package com.sckw.payment.model.dto.page;
 
-import com.sckw.payment.api.model.dto.PrePayIndex;
-import com.sckw.payment.api.model.dto.common.Page;
+import com.sckw.payment.model.dto.common.Page;
+import com.sckw.payment.model.dto.wallet.PrePayIndex;
 import lombok.Getter;
 import lombok.Setter;
 

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

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

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/page/RecordPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/page/RecordPage.java

@@ -1,7 +1,6 @@
-package com.sckw.payment.api.model.dto.page;
+package com.sckw.payment.model.dto.page;
 
-import com.sckw.payment.api.model.dto.Record;
-import com.sckw.payment.api.model.dto.common.Page;
+import com.sckw.payment.model.dto.common.Page;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -0,0 +1,22 @@
+package com.sckw.payment.model.dto.wallet;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author xucaiqin
+ * @date 2023-07-25 15:19:14
+ */
+@NoArgsConstructor
+@Data
+public class CashCount implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -5090368604958419905L;
+
+    private String name;
+    private String value;
+    private Long total;
+}

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/CashDetail.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/CashDetail.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/CashDetailItem.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/CashDetailItem.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

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

@@ -0,0 +1,37 @@
+package com.sckw.payment.model.dto.wallet;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author xucaiqin
+ * @date 2023-07-25 15:19:14
+ */
+@NoArgsConstructor
+@Data
+public class CashItem implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 856945436214113979L;
+    @JSONField(name = "order_no")
+    private String orderNo;
+    private String uid;
+    private Integer status;
+    @JSONField(name = "status_label")
+    private String statusLabel;
+    private String channel;
+    @JSONField(name = "channel_label")
+    private String channelLabel;
+    @JSONField(name = "platform_no")
+    private String platformNo;
+    private Integer money;
+    private Integer balance;
+    private String remarks;
+    @JSONField(name = "create_time")
+    private String createTime;
+    @JSONField(name = "finish_time")
+    private String finishTime;
+}

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Channel.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Channel.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Getter;
 import lombok.Setter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Detail.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Detail.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Filter.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Filter.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Freeze.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Freeze.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/LogItem.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/LogItem.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/MemberRes.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/MemberRes.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Getter;
 import lombok.Setter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Money.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Money.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Operate.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Operate.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/OperateDown.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/OperateDown.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Order.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Order.java

@@ -1,5 +1,6 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,5 +16,6 @@ import java.io.Serializable;
 public class Order implements Serializable {
     @Serial
     private static final long serialVersionUID = -3148504181066374194L;
-    private String order_no;
+    @JSONField(name = "order_no")
+    private String orderNo;
 }

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/PatchPay.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PatchPay.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
@@ -18,7 +18,7 @@ public class PatchPay implements Serializable {
     @JSONField(name = "uid")
     private String uid;
     @JSONField(name = "money")
-    private Integer money;
+    private Long money;
     @JSONField(name = "remark")
     private String remark;
 }

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/PayIndex.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PayIndex.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/PayRecord.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PayRecord.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/PayRecordPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PayRecordPage.java

@@ -1,6 +1,6 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
-import com.sckw.payment.api.model.dto.common.Page;
+import com.sckw.payment.model.dto.common.Page;
 import lombok.Getter;
 import lombok.Setter;
 

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/PrePayIndex.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PrePayIndex.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

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

@@ -0,0 +1,48 @@
+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;
+
+@Getter
+@Setter
+public class PrePayWallet implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 7340075510663637767L;
+
+    @JSONField(name = "uid")
+    private String uid;
+    @JSONField(name = "filter")
+    private String filter;
+
+    @JSONField(name = "channel")
+    private String channel;
+
+    @JSONField(name = "channel_label")
+    private String channelLabel;
+    /**
+     * 预付金额
+     */
+    @JSONField(name = "ap_money")
+    private long apMoney;
+
+    /**
+     * 使用中
+     */
+    @JSONField(name = "using_ap_money")
+    private long usingApMoney;
+    /**
+     * 结算中
+     */
+    @JSONField(name = "settling_ap_money")
+    private long settlingApMoney;
+    /**
+     * 总预付金额
+     */
+    @JSONField(name = "total_ap_money")
+    private long totalApMoney;
+
+}

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Record.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Record.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/RrePayDetail.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/RrePayDetail.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/Tips.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/Tips.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import lombok.Data;
 

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

@@ -0,0 +1,21 @@
+package com.sckw.payment.model.dto.wallet;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.sckw.payment.api.model.dto.WalletDto;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 钱包清单
+ */
+@Data
+public class Wallet implements Serializable {
+    /**
+     * 钱包清单
+     */
+    private List<WalletDto> rows;
+    @JSONField(name = "total_money")
+    private long totalMoney;
+}

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/dto/WalletInfo.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/WalletInfo.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.api.model.dto;
+package com.sckw.payment.model.dto.wallet;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

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

@@ -0,0 +1,42 @@
+package com.sckw.payment.model.dto.wallet;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 钱包总览
+ */
+@Data
+public class WalletOverview implements Serializable {
+    @JSONField(name = "uid")
+    private String uid;
+    /**
+     * 提现中金额
+     */
+    @JSONField(name = "channel_total")
+    private Integer channelTotal;
+    /**
+     * 线上可用余额
+     */
+    private Long money;
+    @JSONField(name = "channels")
+    private List<String> channels;
+    /**
+     * 预付金额
+     */
+    @JSONField(name = "ap_money")
+    private Long apMoney;
+    /**
+     * 提现余额
+     */
+    @JSONField(name = "wd_money")
+    private Long wdMoney;
+    /**
+     * 总金额
+     */
+    @JSONField(name = "total_money")
+    private Long totalMoney;
+}