Merge branch 'hz_master' into base-modify

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPay.java

 package com.xxfc.platform.universal.weixin.api;
 
 
-import java.util.Map.Entry;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Iterator;
@@ -16,13 +16,12 @@ import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.universal.weixin.util.HTTPUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
 /**
@@ -43,10 +42,13 @@ public class WXPay {
 	 * @param openid
 	 * @return
 	 */
-   
-	public static String webPay(String total_fee,String body,String notify_url,String orderNo,String spbill_create_ip,String openid){
+
+	public static String webPay(String total_fee,String body,String notify_url,String orderNo,String spbill_create_ip,String openid,String wyAppid){
 		WXPrepay prePay = new WXPrepay();
-		prePay.setAppid(SystemConfig.WINXIN_AppID);//pay.getAppId()
+		if (StringUtils.isBlank(wyAppid)){
+			wyAppid=SystemConfig.WINXIN_AppID;
+		}
+		prePay.setAppid(wyAppid);//pay.getAppId()
 		prePay.setBody(body);
 		prePay.setPartnerKey(SystemConfig.WINXIN_PARTNER_KEY);//pay.getPartnerKey()
 		prePay.setMch_id(SystemConfig.WINXIN_PARTNER);//pay.getPartnerId()

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -63,6 +63,9 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
     MQServiceBiZ mqServiceBiZ;
     @Value("${universal.url}")
     String weixinHost;
+    @Value("${wx.appid}")
+    private String wy_appid;
+
 
 
     public JSONObject preparepay(OrderPayVo orderPayVo) {
@@ -102,13 +105,16 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         String sellerAccount = null;
         if (type == 2 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
-            jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount());
+            jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount(),null);
         } else if (type == 1 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
             jsParam = WXPay.apppay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), 0);
         } else if (type == 1 && payWay == 2) {
             sellerAccount = SystemConfig.ALIPAY_PID;
             jsParam = generateAliPayment(orderPayVo, notifyUrl);
+        }else if (type == 3 && payWay == 1){
+            sellerAccount = SystemConfig.APP_PARTNER;
+            jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount(),wy_appid);
         }
         log.info("报名费回调路径jsParam:" + jsParam);
         if (!StringUtils.isBlank(jsParam)) {