fix 数字课堂商城

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/base/enums/PaymentClientEnum.java

@@ -11,6 +11,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum PaymentClientEnum implements BaseEnum<String, PaymentClientEnum> {
 
     STUDENT("学生端"),
+    KT_STUDENT("数字课堂-学生端"),
     TEACHER("老师端");
     
     private String code;

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -49,6 +49,9 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
     @Resource(name = "studentAlipayClient")
     private AlipayClient studentAlipayClient;
 
+    @Resource(name = "ktStudentAlipayClient")
+    private AlipayClient ktStudentAlipayClient;
+
     @Resource(name = "teacherAlipayClient")
     private AlipayClient teacherAlipayClient;
 
@@ -328,6 +331,9 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         if (PaymentClientEnum.STUDENT.equals(paymentClient)) {
             return this.studentAlipayClient;
         }
+        if (PaymentClientEnum.KT_STUDENT.equals(paymentClient)) {
+            return this.ktStudentAlipayClient;
+        }
         if (PaymentClientEnum.TEACHER.equals(paymentClient)) {
             return this.teacherAlipayClient;
         }

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/config/AlipayConfiguration.java

@@ -30,7 +30,7 @@ public class AlipayConfiguration {
      */
     @Bean(name = "studentAlipayClient")
     public AlipayClient studentAlipayClient() {
-        AlipayClient alipayClient = new DefaultAlipayClient(
+        return new DefaultAlipayClient(
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_URL).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.STUDENT, AlipayConstant.ALI_APPID).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.STUDENT, AlipayConstant.ALI_APP_PRIVATE_KEY).getParamValue(),
@@ -40,12 +40,25 @@ public class AlipayConfiguration {
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.STUDENT, AlipayConstant.ALI_CONTENT_SIGN_KEY).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.STUDENT, AlipayConstant.ALI_CONTENT_SIGN_TYPE).getParamValue()
         );
-        return alipayClient;
+    }
+
+    @Bean(name = "ktStudentAlipayClient")
+    public AlipayClient ktStudentAlipayClient() {
+        return new DefaultAlipayClient(
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_URL).getParamValue(),
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_APPID).getParamValue(),
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_APP_PRIVATE_KEY).getParamValue(),
+            "json", "UTF-8",
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_ALIPAY_PUBLIC_KEY).getParamValue(),
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_SIGN_TYPE).getParamValue(),
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_CONTENT_SIGN_KEY).getParamValue(),
+            configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, AlipayConstant.ALI_CONTENT_SIGN_TYPE).getParamValue()
+        );
     }
 
     @Bean(name = "teacherAlipayClient")
     public AlipayClient teacherAlipayClient() {
-        AlipayClient alipayClient = new DefaultAlipayClient(
+        return new DefaultAlipayClient(
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_URL).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.TEACHER, AlipayConstant.ALI_APPID).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.TEACHER, AlipayConstant.ALI_APP_PRIVATE_KEY).getParamValue(),
@@ -55,7 +68,6 @@ public class AlipayConfiguration {
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.TEACHER, AlipayConstant.ALI_CONTENT_SIGN_KEY).getParamValue(),
                 configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.TEACHER, AlipayConstant.ALI_CONTENT_SIGN_TYPE).getParamValue()
         );
-        return alipayClient;
     }
 
 }

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/wx/OriginalWxAppTemplate.java

@@ -55,6 +55,8 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
 
     @Resource(name = "studentWxService")
     private WxPayService studentWxService;
+    @Resource(name = "ktStudentWxService")
+    private WxPayService ktStudentWxService;
     @Resource(name = "teacherWxService")
     private WxPayService teacherWxService;
 
@@ -353,6 +355,9 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
         if (PaymentClientEnum.STUDENT.equals(paymentClient)) {
             return this.studentWxService;
         }
+        if (PaymentClientEnum.KT_STUDENT.equals(paymentClient)) {
+            return this.ktStudentWxService;
+        }
         if (PaymentClientEnum.TEACHER.equals(paymentClient)) {
             return this.teacherWxService;
         }

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/wx/config/WxpayConfiguration.java

@@ -64,6 +64,42 @@ public class WxpayConfiguration {
         return wxPayService;
     }
 
+    @Bean(name = "ktStudentWxService")
+    public WxPayService ktStudentWxService() {
+        String merchantId = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_ID).getParamValue();
+        String apiV3Key = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_API_V3_KEY).getParamValue();
+
+        String merchantSerialNumber = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_SERIAL_NUMBER).getParamValue();
+        String merchantPrivateKey = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_PRIVATE_KEY).getParamValue();
+
+        String privateCertPath = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_PRIVATE_CERT_PATH).getParamValue();
+        String privateKeyPath = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_PRIVATE_KEY_PATH).getParamValue();
+
+        String appId = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, PaymentClientEnum.KT_STUDENT, WxpayConstant.WX_APPID).getParamValue();
+
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(appId);
+        payConfig.setMchId(merchantId);
+        payConfig.setMchKey(merchantPrivateKey);
+        payConfig.setCertSerialNo(merchantSerialNumber);
+        payConfig.setApiV3Key(apiV3Key);
+        if("local".equals(profile)){
+            payConfig.setPrivateCertPath("D:\\env\\license\\wxpay\\apiclient_cert.pem");
+            payConfig.setPrivateKeyPath("D:\\env\\license\\wxpay\\apiclient_key.pem");
+        }else{
+            payConfig.setPrivateCertPath(privateCertPath);
+            payConfig.setPrivateKeyPath(privateKeyPath);
+        }
+
+        // 可以指定是否使用沙箱环境
+        payConfig.setUseSandboxEnv(false);
+
+
+        WxPayService wxPayService = new WxPayServiceImpl();
+        wxPayService.setConfig(payConfig);
+        return wxPayService;
+    }
+
     @Bean(name = "teacherWxService")
     public WxPayService teacherWxService() {
         String merchantId = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_ID).getParamValue();