--no commit message

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

@@ -112,8 +112,8 @@ public class WeChatPayImpl extends PayTypeAdapter{
 			Date start = orderPayVo.getCreateTime();
 			// 结束时间为订单创建时间的一小时后
 			Date end = DateUtils.addDateHour(start, 24);
-			String startStr = DateUtils.dateTimeToStr(start, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
-			String endStr = DateUtils.dateTimeToStr(end, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
+			//String startStr = DateUtils.dateTimeToStr(start, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
+			//String endStr = DateUtils.dateTimeToStr(end, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
 			
 			Map<String, String> data = new HashMap<String, String>();
 			data.put("trade_type", WeChartType.getName(toPayForm.getTrade_type()));
@@ -123,8 +123,8 @@ public class WeChatPayImpl extends PayTypeAdapter{
 			data.put("spbill_create_ip", WXPayUtil.getIpAddr(request));
 			data.put("notify_url", notify_url);
 
-			data.put("time_start", startStr);
-			data.put("time_expire", endStr);
+			//data.put("time_start", startStr);
+			//data.put("time_expire", endStr);
 			data.put("body", orderPayVo.getSubject());
 			data.put("out_trade_no", toPayForm.getOut_trade_no());
 			data.put("total_fee", realData);
@@ -159,25 +159,43 @@ 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("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(data, config.getKey(),SignType.MD5);
-	            String paySign = WXPayUtil.generateSignature(map, config.getKey(), SignType.MD5);
+	        	String prepay_id= resp.get("prepay_id");
+	            //String timestamp = String.valueOf(new Date().getTime()/1000);
+	            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);
 	            wecartPayReturn.setSign(paySign);
 	            wecartPayReturn.setTimestamp(timestamp);
-	            map.put("paySign", paySign);
-	            map.put("package", wecartPayReturn.getPrepay_id());
+	        	
+				/*
+				 * //拼装参数 Map<String,String> map =new HashMap<String,String>(); String timestamp
+				 * = String.valueOf(new Date().getTime()/1000); map.put("appId",
+				 * wecartPayReturn.getAppid()); map.put("nonceStr",
+				 * wecartPayReturn.getNonce_str()); map.put("package",
+				 * "prepay_id="+wecartPayReturn.getPrepay_id()); map.put("signType", "MD5");
+				 * 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(data, config.getKey(),SignType.MD5); String
+				 * paySign = WXPayUtil.generateSignature(map, config.getKey(), SignType.MD5);
+				 * wecartPayReturn.setSign(paySign); wecartPayReturn.setTimestamp(timestamp);
+				 * map.put("paySign", paySign);
+				 */
 	            
 	            logger.info("wwwwwwwwwwwwwwwwwwwwJSAPI订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
-	            return CallBack.success(JSON.toJSONString(map));
+	            return CallBack.success(JSON.toJSONString(wecartPayReturn));
 			}
 	        if(WeChartType.H5.getCode().equals(toPayForm.getTrade_type())){
 	        	logger.info("wwwwwwwwwwwwwwwwwwwwH5订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");