--no commit message

app/third/src/main/java/com/zrqx/third/pay/controller/PayController.java

@@ -82,7 +82,7 @@ public class PayController {
 	 */
 	@ApiOperation("去支付")
 	@PostMapping("/to_pay")
-	public CallBack<WecartPayReturn> toPay(@RequestBody ToPayForm toPayForm){
+	public CallBack<String> toPay(@RequestBody ToPayForm toPayForm){
 		return springContext.getEnumsBindBean(PayTypeEnum.class, toPayForm.getPayType(), PayTypeInterface.class).toPay(toPayForm);	
 	}
 	

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

@@ -30,7 +30,7 @@ public interface PayTypeInterface extends EnumsBindBean<PayTypeEnum>{
 	 * 去支付
 	 * @return 跳转到的支付页面或二维码的url
 	 */
-	CallBack<WecartPayReturn> toPay(ToPayForm toPayForm);
+	CallBack<String> toPay(ToPayForm toPayForm);
 	
 	/**
 	 * 查询是否支付

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

@@ -284,7 +284,7 @@ public class AliPayImpl extends PayTypeAdapter{
 	}
 
 	@Override
-	public CallBack<WecartPayReturn> toPay(ToPayForm toPayForm) {
+	public CallBack<String> toPay(ToPayForm toPayForm) {
 		// TODO Auto-generated method stub
 		return null;
 	}

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+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;
@@ -95,7 +96,7 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	 * @date: 2019年1月15日 上午9:57:06
 	 */
 	@Override
-	public CallBack<WecartPayReturn> toPay(ToPayForm toPayForm) {
+	public CallBack<String> toPay(ToPayForm toPayForm) {
 		logger.info("wwwwwwwwwwwwwwwwwwww订单:" + toPayForm.getOut_trade_no() + "开始获取微信链接wwwwwwwwwwwwwwwwwwww");
 		OrderPayVo orderPayVo = getOrderPayVo(toPayForm.getOut_trade_no());
 		WXPay wxpay;
@@ -168,14 +169,15 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            //String paySign = WXPayUtil.generateSignature(map, config.getKey(),SignType.MD5);
 	            wecartPayReturn.setSign(paySign);
 	            wecartPayReturn.setTimestamp(timestamp);
+	            return CallBack.success(JSON.toJSONString(map));
 			}
 	        if(WeChartType.H5.getCode().equals(toPayForm.getTrade_type())){
 	        	logger.info("wwwwwwwwwwwwwwwwwwwwH5订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
-		        return CallBack.success(wecartPayReturn);
+		        return CallBack.success(wecartPayReturn.getCode_url());
 	        }
 	        
 	        logger.info("wwwwwwwwwwwwwwwwwwww订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
-	        return CallBack.success(wecartPayReturn);
+	        return CallBack.success(wecartPayReturn.getCode_url());
 		} catch (Exception e) {
 			logger.error("wwwwwwwwwwwwwwwwwwww订单:" + toPayForm.getOut_trade_no() + "获取微信链接失败wwwwwwwwwwwwwwwwwwww");
 			logger.error(e.getMessage());

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

@@ -584,7 +584,7 @@ public class YeePayImpl extends PayTypeAdapter{
 	}
 
 	@Override
-	public CallBack<WecartPayReturn> toPay(ToPayForm toPayForm) {
+	public CallBack<String> toPay(ToPayForm toPayForm) {
 		// TODO Auto-generated method stub
 		return null;
 	}