Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/wxpay/WxConfig.java

@@ -17,25 +17,6 @@ public class WxConfig extends WXPayConfig {
 
 	private byte[] certData;
 
-	//api文件放在oss里所以是个http地址
-	private String apiPath;
-
-	public WxConfig() throws Exception {
-		URL urlConet = new URL(apiPath);
-		HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
-		con.setRequestMethod("GET");
-		con.setConnectTimeout(4 * 1000);
-		InputStream inStream = con .getInputStream();
-		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-		byte[] buffer = new byte[2048];
-		int len = 0;
-		while( (len=inStream.read(buffer)) != -1 ){
-			outStream.write(buffer, 0, len);
-		}
-		inStream.close();
-		this.certData =  outStream.toByteArray();
-	}
-
 	/**
 	 * 获取 App ID
 	 *
@@ -119,8 +100,8 @@ public class WxConfig extends WXPayConfig {
 		this.key = key;
 	}
 
-	public void setApiPath(String apiPath) {
-		this.apiPath = apiPath;
+	public void setCertData(byte[] certData) {
+		this.certData = certData;
 	}
 }
 

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -17,6 +17,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.xml.ws.soap.Addressing;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -51,6 +55,9 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private TaOrderMapper taOrderMapper;
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
     /**
      * 微信支付-统一下单
      *
@@ -76,6 +83,9 @@ public class WxPayServiceImpl implements IWxPayService {
         String tradeNo = prefix + System.currentTimeMillis() + taOrder.getTargetId();
         taOrder.setTradeNo(tradeNo);
 
+        //获取personxinx
+        TaPerson person = taPersonMapper.getById(taOrder.getPersonId());
+
         //下单
         Map<String, String> data = new HashMap<String, String>();
         data.put("body", taOrder.getTargetType().equals(CommConstant.ORDER_TARGET_TYPE_HOUSE) ? "房源认筹" : "微信支付");
@@ -91,6 +101,8 @@ public class WxPayServiceImpl implements IWxPayService {
         data.put("notify_url", payNotify+taOrder.getTargetType());
         // 此处指定为APP支付
         data.put("trade_type", "JSAPI");
+        //openid
+        data.put("openid", person.getMiniOpenid());
         Map<String, String> resp = wxpay.unifiedOrder(data);
         log.info("下单成功：{}", resp);
         if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
@@ -394,10 +406,23 @@ public class WxPayServiceImpl implements IWxPayService {
         }
         log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
         //把库里的值赋值给微信
+        URL urlConet = new URL(taWxPayConfig.getApiPath());
+        HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
+        con.setRequestMethod("GET");
+        con.setConnectTimeout(4 * 1000);
+        InputStream inStream = con .getInputStream();
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[2048];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+        inStream.close();
+
         WxConfig config = new WxConfig();
         config.setAppid(taWxPayConfig.getAppid());
         config.setMachId(taWxPayConfig.getMchId());
-        config.setApiPath(taWxPayConfig.getApiPath());
+        config.setCertData(outStream.toByteArray());
         config.setKey(taWxPayConfig.getMchKey());
         return config;
     }