代码修改

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

@@ -46,10 +46,10 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
     @Autowired
     private PaymentProperties paymentProperties;
 
-    @Resource(name="studentAlipayClient")
+    @Resource(name = "studentAlipayClient")
     private AlipayClient studentAlipayClient;
 
-    @Resource(name="teacherAlipayClient")
+    @Resource(name = "teacherAlipayClient")
     private AlipayClient teacherAlipayClient;
 
     @Autowired
@@ -146,7 +146,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
 
     @Override
     public BaseResult<ClosePayment> closePayment(ClosePayment closePayment) {
-        if(StringUtil.isEmpty(closePayment.getPaymentNo())){
+        if (StringUtil.isEmpty(closePayment.getPaymentNo())) {
             return BaseResult.failed("缺失渠道关单必要参数");
         }
 
@@ -212,10 +212,14 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
             log.info("支付宝回调,data is {}", jsonParams.toJSONString());
 
             //获取验签方式 是否使用证书 YES NO
-            String USE_CERT = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_USE_CERT).getParamValue();
-            String ALI_SIGN_TYPE = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_SIGN_TYPE).getParamValue();
-            String ALI_ALIPAY_PUBLIC_KEY = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_ALIPAY_PUBLIC_KEY).getParamValue();
-            String CERT_PATH = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, AlipayConstant.ALI_CERT_PATH).getParamValue();
+            String USE_CERT = configPaymentService.getPaymentConfig(
+                    OpenEnum.ORIGINAL, paymentClient, AlipayConstant.ALI_USE_CERT).getParamValue();
+            String ALI_SIGN_TYPE = configPaymentService.getPaymentConfig(
+                    OpenEnum.ORIGINAL, paymentClient, AlipayConstant.ALI_SIGN_TYPE).getParamValue();
+            String ALI_ALIPAY_PUBLIC_KEY = configPaymentService.getPaymentConfig(
+                    OpenEnum.ORIGINAL, paymentClient, AlipayConstant.ALI_ALIPAY_PUBLIC_KEY).getParamValue();
+            String CERT_PATH = configPaymentService.getPaymentConfig(
+                    OpenEnum.ORIGINAL, paymentClient, AlipayConstant.ALI_CERT_PATH).getParamValue();
 
             boolean verifyResult;
             if ("YES".equals(USE_CERT)) {
@@ -297,11 +301,11 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
     }
 
 
-    private AlipayClient getAlipayClient(PaymentClientEnum paymentClient){
-        if(PaymentClientEnum.STUDENT.equals(paymentClient)){
+    private AlipayClient getAlipayClient(PaymentClientEnum paymentClient) {
+        if (PaymentClientEnum.STUDENT.equals(paymentClient)) {
             return this.studentAlipayClient;
         }
-        if(PaymentClientEnum.TEACHER.equals(paymentClient)){
+        if (PaymentClientEnum.TEACHER.equals(paymentClient)) {
             return this.teacherAlipayClient;
         }
         throw new BizException("未知的客户端类型");

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

@@ -8,7 +8,6 @@ import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryV3Result;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
 import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.util.SignUtils;
@@ -26,21 +25,9 @@ import com.yonge.toolset.payment.base.model.callback.RefundPaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.SysConfigPaymentService;
 import com.yonge.toolset.payment.original.wx.constant.WxpayConstant;
-import com.yonge.toolset.utils.collection.MapUtil;
-import com.yonge.toolset.utils.date.DateUtil;
-import com.yonge.toolset.utils.obj.ObjectUtil;
 import com.yonge.toolset.utils.string.StringUtil;
 import com.yonge.toolset.utils.web.WebUtil;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +36,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
@@ -79,7 +65,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
 
     @Override
     public BaseResult<Payment> executePayment(Payment payment) {
-        String APP_ID = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_APPID).getParamValue();
+        String APP_ID = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, payment.getPaymentClient(), WxpayConstant.WX_APPID).getParamValue();
         String MERCHANT_ID = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_ID).getParamValue();
 
         WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();