参数调整

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

@@ -0,0 +1,36 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+import com.sckw.payment.model.vo.res.MoneyChange;
+import jakarta.validation.constraints.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 新增账目
+ *
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class AddWalletReq extends BasePara implements MoneyChange {
+    /**
+     * 支付通道字典值
+     */
+    @NotBlank(message = "支付通道不能为空")
+    private String channel;
+
+    @NotBlank(message = "合作企业不能为空")
+    private String entId;
+
+    @Positive(message = "充值金额必须大于0")
+    @Digits(message = "小数位数过长", integer = 10, fraction = 2)
+    private BigDecimal money;
+
+    @Size(message = "备注不能超过200")
+    private String remark;
+
+}

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

@@ -0,0 +1,39 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+import com.sckw.payment.model.vo.res.MoneyChange;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 提现
+ *
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class CashWalletReq extends BasePara implements MoneyChange {
+    /**
+     * 支付通道字典值
+     */
+    @NotBlank(message = "支付通道不能为空")
+    private String channel;
+
+    @NotBlank(message = "合作企业不能为空")
+    private String entId;
+
+    @Positive(message = "提现金额必须大于0")
+    @Digits(message = "小数位数过长或金额过大", integer = 10, fraction = 2)
+    private BigDecimal money;
+
+    @Size(message = "备注不能超过200字")
+    private String remark;
+
+}

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
@@ -11,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LedgerListReq extends BasePara {
+public class LedgerListReq extends BasePara implements IdsList {
     @NotBlank(message = "对账单id不能为空")
     private String id;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.LedgerEnum;
 import jakarta.validation.constraints.NotBlank;
@@ -15,7 +16,7 @@ import java.io.Serial;
  */
 @Getter
 @Setter
-public class LogisticsReq extends BasePara {
+public class LogisticsReq extends BasePara implements IdsList {
     @Serial
     private static final long serialVersionUID = 5328731681168692784L;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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

@@ -1,11 +1,11 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import lombok.Getter;
-import lombok.NonNull;
 import lombok.Setter;
 
 import java.io.Serial;
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-public class OfflinePaymentReq extends BasePara {
+public class OfflinePaymentReq extends BasePara implements IdsList {
 
     @Serial
     private static final long serialVersionUID = -4568239842231210898L;

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
@@ -11,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SettlementOfflineReq extends BasePara {
+public class SettlementOfflineReq extends BasePara implements IdsList {
 //    /**
 //     * 结算单id
 //     */

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

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.SettlementEnum;
 import lombok.Getter;
@@ -8,7 +9,6 @@ import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
-import java.time.LocalDateTime;
 
 /**
  * @author Aick Spt
@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
-public class SettlementReq extends BasePara {
+public class SettlementReq extends BasePara implements IdsList {
     @Serial
     private static final long serialVersionUID = 6537008434516489423L;
 

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.base.TimeBase;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.SettlementEnum;
@@ -10,7 +11,7 @@ import java.io.Serial;
  * @author xucaiqin
  * @date 2023-07-18 11:29
  */
-public class SettlementTradeReq extends BasePara implements TimeBase {
+public class SettlementTradeReq extends BasePara implements TimeBase, IdsList {
     @Serial
     private static final long serialVersionUID = -508783597831158781L;
 

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
@@ -11,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SettlementWalletReq extends BasePara {
+public class SettlementWalletReq extends BasePara implements IdsList {
 
     /**
      * 用于过滤当前登录者企业id

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.LedgerEnum;
 import jakarta.validation.constraints.NotBlank;
@@ -14,7 +15,7 @@ import java.io.Serial;
  */
 @Getter
 @Setter
-public class TradeReq extends BasePara {
+public class TradeReq extends BasePara implements IdsList {
     @Serial
     private static final long serialVersionUID = 5328731681168692784L;
     @NotBlank(message = "创建开始时间不能为空")

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

@@ -0,0 +1,19 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class WalletDetailReq extends BasePara {
+    private String entName;
+    /**
+     * 支付通道字典值
+     */
+    private String channel;
+}

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

@@ -0,0 +1,53 @@
+package com.sckw.payment.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 资金信息
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 17:50:58
+ */
+@Getter
+@Setter
+public class FundVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 8188683696457382299L;
+
+    /**
+     * 渠道
+     */
+    private String channel;
+    private String channelLabel;
+
+    private String uid;
+    /**
+     * 当前企业名称
+     */
+    private String uidName;
+
+    private String filter;
+    /**
+     * 往来单位名称
+     */
+    private String filterName;
+
+    private Long payMoney;
+    private Long cashMoney;
+    private Long refundMoney;
+    /**
+     * 可用余额
+     */
+    private Long money;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime updateTime;
+}

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

@@ -117,7 +117,7 @@ public class LedgerTradeVo {
      * 预计收款日期
      */
     @ExcelProperty(value = "预计收款日期")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime receiptTime;
     /**
      * 对账采购财务联系人名称

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

@@ -0,0 +1,27 @@
+package com.sckw.payment.model.vo.res;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * 金额转换
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 18:06:18
+ */
+public interface MoneyChange {
+    /**
+     * 元转分
+     *
+     * @param big
+     * @return
+     */
+    default Long bigMoney(BigDecimal big) {
+        if (Objects.isNull(big)) {
+            return 0L;
+        }
+        BigDecimal divide = big.multiply(new BigDecimal("100"));
+        return divide.longValueExact();
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package com.sckw.payment.model.vo.res;
+
+/**
+ * 钱包信息
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 15:43:49
+ */
+public record WalletDetail(String entName, String money, String moneyYuan, int channel) {
+}