fix:小程序支付密码修改、充值、充值列表、提现接口

coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/WalletPaymentOrderDO.java

@@ -1,17 +1,23 @@
 package com.cool.store.entity.wallet;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 
 /**
- * 钱包大额支付订单
+ * 钱包支付订单
  */
-@Table(name = "zxjp_wallet_large_payment")
+@Table(name = "zxjp_wallet_payment_order")
 @Data
-public class WalletLargePaymentDO {
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class WalletPaymentOrderDO {
     /**
      * id
      */
@@ -31,6 +37,12 @@ public class WalletLargePaymentDO {
     @Column(name = "payment_id")
     private String paymentId;
 
+    /**
+     * 订单类型，0充值 1提现
+     */
+    @Column(name = "type")
+    private Integer type;
+
     /**
      * 金额
      */
@@ -46,7 +58,7 @@ public class WalletLargePaymentDO {
      * 订单状态:1-成功 2-失败 3-支付中 4-撤销
      */
     @Column(name = "order_status")
-    private Boolean orderStatus;
+    private Integer orderStatus;
 
     /**
      * 创建时间

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountPasswordRequest.java

@@ -29,6 +29,5 @@ public class AccountPasswordRequest extends StoreShopRequest {
     private String confirmPayPwd;
 
     @ApiModelProperty("当前使用的支付密码(sm3加密后字符串),维护类型为修改密码时必填")
-    @NotNull(message = "当前使用的支付密码不能为空")
     private String currentPayPwd;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountPaymentRequest.java

@@ -3,7 +3,8 @@ package com.cool.store.request.wallet;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Digits;
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -16,6 +17,7 @@ import javax.validation.constraints.Pattern;
 @Data
 public class AccountPaymentRequest extends StoreShopRequest {
     @ApiModelProperty(value = "支付金额")
-    @Pattern(regexp = "^\\d+(\\.\\d{1,2})?$", message = "金额格式不正确")
-    private String amount;
+    @Digits(integer = 10, fraction = 2, message = "金额整数位最多10位，小数位最多2位")
+    private BigDecimal amount;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/LargePaymentQueryRequest.java

@@ -0,0 +1,21 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 大额支付订单查询Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/18
+ */
+@Data
+public class LargePaymentQueryRequest extends StoreShopRequest {
+    @ApiModelProperty("页码")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty("页数量")
+    private Integer pageSize = 10;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/WalletWithDrawerRequest.java

@@ -0,0 +1,30 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 钱包提现Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/18
+ */
+@Data
+public class WalletWithDrawerRequest extends StoreShopRequest {
+    @ApiModelProperty("提现金额")
+    @Digits(integer = 10, fraction = 2, message = "金额整数位最多10位，小数位最多2位")
+    @NotNull(message = "提现金额不能为空")
+    private BigDecimal amount;
+
+    @ApiModelProperty("支付密码(sm3加密后字符串)")
+    @NotBlank(message = "支付密码不能为空")
+    private String payPwd;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/WithDrawerRequest.java

@@ -1,7 +1,9 @@
 package com.cool.store.request.wallet;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author suzhuhong
@@ -9,6 +11,8 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class WithDrawerRequest {
 
     @ApiModelProperty(value = "门店ID")

coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPaymentVO.java

@@ -22,9 +22,6 @@ public class AccountPaymentVO {
 
     @ApiModelProperty(value = "收款银行名称", required = true)
     private String payeeBankName;
-
-    @ApiModelProperty(value = "账号过期时间")
-    private String expireTime;
     
     @ApiModelProperty("过期倒计时（秒）")
     private Long expiryCountdown;

coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/WalletPaymentOrderVO.java

@@ -0,0 +1,30 @@
+package com.cool.store.vo.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 钱包支付订单VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/18
+ */
+@Data
+public class WalletPaymentOrderVO {
+    @ApiModelProperty("预支付id")
+    private String paymentId;
+
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("订单状态:1-成功 2-失败 3-支付中 4-撤销")
+    private Integer orderStatus;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+}