Merge branch 'hotfix_0518_fixbug' into test6.10.1

@@ -35,7 +35,7 @@ public class WeixinPayConstants {
 	 *  支付主体是殴印
 	 */
 	public interface Miniapp{
-		String APP_PARTNER_CERT = "/.cert/wechatpay/apiclient_cert_ufo.p12";
+//		String APP_PARTNER_CERT = "/.cert/wechatpay/apiclient_cert_ufo.p12";
 		String APPID = "wxc677c88385762287";
 		String MALL_ID = UFO_PARTNER_ID;
 	}

@@ -2,7 +2,7 @@ package com.yohoufo.order.service.pay.weixin;
 
 import com.yohoufo.order.config.WeixinPayConstants;
 import com.yohoufo.order.service.pay.weixin.config.AbstractWeixinPayConfig;
-import com.yohoufo.order.service.pay.weixin.config.UfoWeixinPayConfig;
+import com.yohoufo.order.service.pay.weixin.config.UfoMiniPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.AbstractHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.WxUfoHttpSslClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 public class MiniappWeixinPayService extends AbstractWeixinPayService {
 
     @Autowired
-    UfoWeixinPayConfig ufoWeixinConfig;
+    UfoMiniPayConfig ufoMiniPayConfig;
 
     @Autowired
     WxUfoHttpSslClient wxUfoHttpSslClient;
@@ -27,7 +27,7 @@ public class MiniappWeixinPayService extends AbstractWeixinPayService {
 
     @Override
     protected AbstractWeixinPayConfig abstractWeixinConfig() {
-        return ufoWeixinConfig;
+        return ufoMiniPayConfig;
     }
 
     @Override

@@ -2,6 +2,7 @@ package com.yohoufo.order.service.pay.weixin;
 
 import com.yohoufo.order.config.WeixinPayConstants;
 import com.yohoufo.order.service.pay.weixin.config.AbstractWeixinPayConfig;
+import com.yohoufo.order.service.pay.weixin.config.YoufuMniniPayConfig;
 import com.yohoufo.order.service.pay.weixin.config.YoufuWeixinPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.AbstractHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.YoufuWxHttpSslClient;

@@ -2,6 +2,7 @@ package com.yohoufo.order.service.pay.weixin;
 
 import com.yohoufo.order.config.WeixinPayConstants;
 import com.yohoufo.order.service.pay.weixin.config.AbstractWeixinPayConfig;
+import com.yohoufo.order.service.pay.weixin.config.YoufuMniniPayConfig;
 import com.yohoufo.order.service.pay.weixin.config.YoufuWeixinPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.AbstractHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.YoufuWxHttpSslClient;
@@ -16,7 +17,7 @@ public class YoufuMiniappWeixinPayService extends AbstractWeixinPayService {
 
 
     @Autowired
-    YoufuWeixinPayConfig youfuWeixinConfig;
+    YoufuMniniPayConfig youfuMniniPayConfig;
 
     @Autowired
     YoufuWxHttpSslClient youfuWxHttpSslClient;
@@ -28,7 +29,7 @@ public class YoufuMiniappWeixinPayService extends AbstractWeixinPayService {
 
     @Override
     protected AbstractWeixinPayConfig abstractWeixinConfig() {
-        return youfuWeixinConfig;
+        return youfuMniniPayConfig;
     }
 
     @Override

+package com.yohoufo.order.service.pay.weixin.config;
+
+import com.yohoufo.order.config.WeixinPayConstants;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UfoMiniPayConfig extends AbstractWeixinPayConfig {
+
+    @Override
+    public String appId() {
+        return WeixinPayConstants.Miniapp.APPID;
+    }
+
+    @Override
+    public String partnerId() {
+        return WeixinPayConstants.Miniapp.MALL_ID;
+    }
+
+    @Override
+    public String mchCertPath() {
+        return WeixinPayConstants.UFO_PARTNER_CERT;
+    }
+}

+package com.yohoufo.order.service.pay.weixin.config;
+
+import com.yohoufo.order.config.WeixinPayConstants;
+import org.springframework.stereotype.Component;
+
+@Component
+public class YoufuMniniPayConfig extends AbstractWeixinPayConfig {
+
+    @Override
+    public String appId() {
+        return WeixinPayConstants.YoufuMiniapp.APPID;
+    }
+
+    @Override
+    public String partnerId() {
+        return WeixinPayConstants.YoufuMiniapp.MALL_ID;
+    }
+
+    @Override
+    public String mchCertPath() {
+        return WeixinPayConstants.YOUFU_UFO_PARTNER_CERT;
+    }
+}