--no commit message

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

@@ -40,6 +40,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;
 /**
@@ -163,13 +164,17 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            map.put("package", "prepay_id="+wecartPayReturn.getPrepay_id());
 	            map.put("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=MD5"+"&timeStamp=" + timestamp + "&key="+config.getKey();
-	            String paySign=WXPayUtil.MD5(stringA).toUpperCase();
+//	        	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 paySign = WXPayUtil.generateSignature(map, config.getKey(),SignType.MD5);
+	            wecartPayReturn.setSign(paySign);
+	            wecartPayReturn.setTimestamp(timestamp);
 	            wecartPayReturn.setSign(paySign);
 	            wecartPayReturn.setTimestamp(timestamp);
 	            map.put("paySign", paySign);
+	            
 		        logger.info("wwwwwwwwwwwwwwwwwwwwJSAPI订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
 	            return CallBack.success(JSON.toJSONString(map));
 			}