常量

cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java

@@ -43,4 +43,30 @@ public interface SystemConstants {
          */
         public static final String CUSTOM = "custom";
     }
+
+
+    /**
+     * 三方支付类型
+     */
+    class PayType {
+        /**
+         * 微信支付
+         */
+        public static final String WECHAT = "wechatPay";
+
+        /**
+         * 支付宝支付
+         */
+        public static final String ALIPAY = "alipay";
+
+        /**
+         * 微信小程序支付
+         */
+        public static final String WECHAT_APP_ID = "wxd88fffa983758a30";
+
+        /**
+         * 支付宝小程序支付
+         */
+        public static final String ALIPAY_APP_ID = "2021004145625815";
+    }
 }

cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java

@@ -24,6 +24,10 @@ public class MkDistributionPayDTO implements Serializable {
     private Long shopId;
     private String platformType = "DIS";
     private Long userId;
+    /**
+     * 支付类型
+     * {@link com.czg.constants.SystemConstants.PayType}
+     */
     private String payType;
     private String returnUrl;
     private String buyerRemark;

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java

@@ -3,6 +3,7 @@ package com.czg.order.entity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -45,6 +46,15 @@ public class ShopMerchant implements Serializable {
      */
     private String relatedLicenceNo;
 
+    /**
+     * 微信appid
+     */
+    private String wechatAppId;
+    /**
+     * 支付宝appid
+     */
+    private String alipayAppId;
+
     /**
      * 聚合支付参数
      */

cash-common/cash-common-service/src/main/java/com/czg/pay/CzgPayBaseReq.java

@@ -63,6 +63,7 @@ public class CzgPayBaseReq<T> {
 
     /**
      * 支付类型
+     * {@link com.czg.constants.SystemConstants.PayType}
      */
     private String payType;
     /**

cash-common/cash-common-service/src/main/java/com/czg/pay/PolyMerchantDTO.java

@@ -18,12 +18,6 @@ public class PolyMerchantDTO {
     @NotEmpty(message = "商户秘钥不为空")
     private String appSecret;
     // 支付密码
-    @NotEmpty(message = "支付密码不为空")
+//    @NotEmpty(message = "支付密码不为空")
     private String payPassword;
-    // 微信appid
-    @NotEmpty(message = "微信appid")
-    private String wechatSmallAppid;
-    // 支付宝appid
-    @NotEmpty(message = "支付宝appid")
-    private String alipaySmallAppid;
 }