支付方式枚举类调整

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -29,12 +29,11 @@ public enum DictEnum {
     TAX_RATE_0("tax_rate","13", "13%"),
     TAX_RATE_1("tax_rate","11", "11%"),
     TAX_RATE_2("tax_rate","10", "10%"),
-    TRADE_TYPE_01("trade_type", "01", "预付款-汇付"),
-    TRADE_TYPE_02("trade_type", "02", "预付款-新生"),
-    TRADE_TYPE_03("trade_type", "03", "预付款-中信"),
-    TRADE_TYPE_1("trade_type", "1", "货到付款"),
-    TRADE_TYPE_2("trade_type", "2", "线下付款"),
-    TRADE_TYPE_3("trade_type", "3", "第三方支付"),
+    TRADE_TYPE_01("trade_type", "11", "预付款-汇付"),
+    TRADE_TYPE_02("trade_type", "12", "预付款-新生"),
+    TRADE_TYPE_03("trade_type", "13", "预付款-中信"),
+    TRADE_TYPE_1("trade_type", "2", "货到付款"),
+    TRADE_TYPE_2("trade_type", "3", "线下付款"),
     PICKUP_TYPE_0("pickup_type", "0", "供应配送"),
     PICKUP_TYPE_1("pickup_type", "1", "采方自提"),
     DELIVERY_TYPE_0("delivery_type", "0", "签发交付"),

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/constant/ChannelEnum.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ChannelEnum {
-    HF("01","huifu", "汇付渠道"),
-    XS("02","newpay", "新生渠道"),
-    ZX("03","citic", "中信渠道");
+    HF("11","huifu", "汇付渠道"),
+    XS("12","newpay", "新生渠道"),
+    ZX("13","citic", "中信渠道");
     private String code;
     private String channel;
     private String desc;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/TradingEnum.java

@@ -3,21 +3,23 @@ package com.sckw.payment.model.constant;
 import java.util.Objects;
 
 /**
- * 交易方式 枚举
+ * 交易方式 枚举 trading_type
  *
  * @author xucaiqin
  * @date 2023-07-11 12:00:52
  */
 public enum TradingEnum {
-    PRE_PAY(0, "预付款"),
-    RECEIVE_PAY(1, "货到付款"),
-    OFFLINE_PAY(2, "线下付款");
+    PRE_PAY(1, "1", "预付款"),
+    RECEIVE_PAY(2, "2", "货到付款"),
+    OFFLINE_PAY(3, "2", "线下付款");
 
-    private int status;
-    private String desc;
+    private final int status;
+    private final String value;
+    private final String desc;
 
-    TradingEnum(int status, String desc) {
+    TradingEnum(int status, String value, String desc) {
         this.status = status;
+        this.value = value;
         this.desc = desc;
     }
 
@@ -37,15 +39,14 @@ public enum TradingEnum {
         return status;
     }
 
-    public void setStatus(int status) {
-        this.status = status;
-    }
 
     public String getDesc() {
         return desc;
     }
 
-    public void setDesc(String desc) {
-        this.desc = desc;
+    public String getValue() {
+        return value;
     }
+
+
 }