--no commit message

app/third/src/main/java/com/zrqx/third/pay/interfaces/payType/impl/WeChatPayImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import com.alibaba.fastjson.JSON;
 import com.zrqx.core.client.form.third.pay.CloseForm;
 import com.zrqx.core.client.form.third.pay.RefundForm;
 import com.zrqx.core.client.form.third.pay.RefundQueryForm;
@@ -38,6 +39,7 @@ import com.zrqx.core.util.datatype.DateUtils;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.third.pay.config.WXPay;
 import com.zrqx.third.pay.config.WXPayConfig;
+import com.zrqx.third.pay.config.WXPayConstants.SignType;
 import com.zrqx.third.pay.config.WXPayUtil;
 import com.zrqx.third.pay.interfaces.payType.PayTypeAdapter;
 /**
@@ -100,7 +102,7 @@ public class WeChatPayImpl extends PayTypeAdapter{
 		OrderPayVo orderPayVo = getOrderPayVo(toPayForm.getOut_trade_no());
 		WXPay wxpay;
 		try {
-			if(WeChartType.NATIVE.getCode().equals(toPayForm.getTrade_type())){
+			if(WeChartType.JSAPI.getCode().equals(toPayForm.getTrade_type())){
 				config.setAppID(appID_JSAPI);
 			}
 			wxpay = new WXPay(config);
@@ -157,17 +159,23 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            Map<String,String> map =new HashMap<String,String>();
 	            String timestamp = String.valueOf(new Date().getTime()/1000);
 	            map.put("appId", wecartPayReturn.getAppid());
-	            map.put("timeStamp", timestamp);
 	            map.put("nonceStr", wecartPayReturn.getNonce_str());
 	            map.put("package", "prepay_id="+wecartPayReturn.getPrepay_id());
-	            map.put("signType", "MD5");
+	            map.put("signType", "HMAC-SHA256");	//SignType.HMACSHA256
+	            map.put("timeStamp", timestamp);
+	            
 	            //签名生成
-	        	String prepay_id= resp.get("prepay_id");
-	            String stringA =""+"appId="+config.getAppID()+"&nonceStr="+resp.get("nonce_str") +"&package=prepay_id="+prepay_id+"&signType=MD5"+"&timeStamp=" + timestamp + "&key="+config.getKey();
-	            String paySign=WXPayUtil.MD5(stringA).toUpperCase();
-	            //String paySign = WXPayUtil.generateSignature(map, config.getKey(),SignType.MD5);
+	        	/*String prepay_id= resp.get("prepay_id");
+	            String stringA =""+"appId="+config.getAppID()+"&nonceStr="+resp.get("nonce_str") +"&package=prepay_id="+prepay_id+"&signType=HMAC-SHA256"+"&timeStamp=" + timestamp + "&key="+config.getKey();
+	            String paySign=WXPayUtil.MD5(stringA).toUpperCase();*/
+
+	            String paySign = WXPayUtil.generateSignature(map, config.getKey(),SignType.HMACSHA256);
 	            wecartPayReturn.setSign(paySign);
 	            wecartPayReturn.setTimestamp(timestamp);
+	            map.put("paySign", paySign);
+	            map.put("package", wecartPayReturn.getPrepay_id());
+		        logger.info("wwwwwwwwwwwwwwwwwwwwJSAPI订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
+		        return CallBack.success(JSON.toJSONString(map));
 			}
 	        if(WeChartType.APP.getCode().equals(toPayForm.getTrade_type())){
 	        	 //拼装参数