枚举类扩展

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

@@ -6,12 +6,13 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ChannelEnum {
-    HF("11","huifu", "汇付渠道"),
-    XS("12","newpay", "新生渠道"),
-    ZX("13","citic", "中信渠道");
-    private String code;
-    private String channel;
-    private String desc;
+    HF("11", "1", "huifu", "汇付渠道"),
+    XS("12", "2", "newpay", "新生渠道"),
+    ZX("13", "3", "citic", "中信渠道");
+    private final String code;//预付款+支付渠道
+    private final String value;//渠道对应的字典值
+    private final String channel;
+    private final String desc;
 
     public static ChannelEnum getByCode(String code) {
         for (ChannelEnum channelEnum : ChannelEnum.values()) {

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

@@ -1,5 +1,7 @@
 package com.sckw.payment.model.constant;
 
+import com.sckw.payment.api.model.constant.ChannelEnum;
+
 import java.util.Objects;
 
 /**
@@ -10,11 +12,17 @@ import java.util.Objects;
  */
 public enum TradingEnum {
     PRE_PAY(1, "1", "预付款"),
+    PRE_PAY_HF(11, PRE_PAY.value + ChannelEnum.HF.getValue(), "预付款-汇付"),
+    PRE_PAY_XS(12, PRE_PAY.value + ChannelEnum.XS.getValue(), "预付款-新生"),
+    PRE_PAY_ZX(13, PRE_PAY.value + ChannelEnum.ZX.getValue(), "预付款-中信"),
     RECEIVE_PAY(2, "2", "货到付款"),
-    OFFLINE_PAY(3, "2", "线下付款");
+    RECEIVE_PAY_HF(21, RECEIVE_PAY.value + ChannelEnum.HF.getValue(), "货到付款-汇付"),
+    RECEIVE_PAY_XS(22, RECEIVE_PAY.value + ChannelEnum.XS.getValue(), "货到付款-新生"),
+    RECEIVE_PAY_ZX(23, RECEIVE_PAY.value + ChannelEnum.ZX.getValue(), "货到付款-中信"),
+    OFFLINE_PAY(3, "3", "线下付款");
 
     private final int status;
-    private final String value;
+    private final String value;//字典值
     private final String desc;
 
     TradingEnum(int status, String value, String desc) {