--no commit message

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

@@ -155,18 +155,10 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            }  
 	        }
 	        if(WeChartType.JSAPI.getCode().equals(toPayForm.getTrade_type())){
+	        	
 	        	 //拼装参数
 	            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", wecartPayReturn.getPrepay_id());
-	            map.put("signType", "MD5");
-	            map.put("total_fee", realData);
-	            
-	            
-	            
 	            //签名生成
 	        	String prepay_id= resp.get("prepay_id");
 	        	
@@ -175,9 +167,17 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            //String paySign = WXPayUtil.generateSignature(map, config.getKey(),SignType.MD5);
 	            wecartPayReturn.setSign(paySign);
 	            wecartPayReturn.setTimestamp(timestamp);
+	            
+	            map.put("appId", wecartPayReturn.getAppid());
+	            map.put("nonceStr", wecartPayReturn.getNonce_str());
+	            map.put("signType", "MD5");
 	            map.put("paySign", paySign);
+	            map.put("package", wecartPayReturn.getPrepay_id());
+	            map.put("timeStamp", timestamp);
+	            map.put("orderId", String.valueOf(orderPayVo.getId()));
+	            
 	            
-		        logger.info("wwwwwwwwwwwwwwwwwwwwJSAPI订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
+	            logger.info("wwwwwwwwwwwwwwwwwwwwJSAPI订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
 	            return CallBack.success(JSON.toJSONString(map));
 			}
 	        if(WeChartType.H5.getCode().equals(toPayForm.getTrade_type())){