fix 充值

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -39,5 +39,7 @@ public class OrderAddBo {
     private Long updateTime;
     @ApiModelProperty("用户ID")
     private Long userId;
+    @ApiModelProperty("公众号页面url")
+    private String url;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -182,7 +182,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        Map<String, String> result = dealGzhOrder(add,goodsList);
+        Map<String, String> result = dealGzhOrder(add,goodsList,bo.getUrl());
         return result;
     }
 
@@ -327,7 +327,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return result;
     }
 
-    public Map<String, String>  dealGzhOrder(Order add,List<OrderGoodsAddBo> goodsList){
+    public Map<String, String>  dealGzhOrder(Order add,List<OrderGoodsAddBo> goodsList,String url){
         UserVo userVo = iUserService.queryById(add.getUserId());
         String body = "中正云课堂充值";
         String price = "1";
@@ -354,7 +354,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if(!this.save(add)){
             throw new CustomException("订单数据错误");
         }
-        Map<String, String> result =  iWxPayService.paymentGzh(out_trade_no,userVo.getGzhOpenId(),body,price);
+        Map<String, String> result =  iWxPayService.paymentGzh(out_trade_no,userVo.getGzhOpenId(),body,price,url);
         return result;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/IWxPayService.java

@@ -26,7 +26,7 @@ public interface IWxPayService {
 	 */
 	Map<String, String> payment(String out_trade_no,String openid,String body,String price);
 
-	Map<String, String> paymentGzh(String out_trade_no,String openid,String body,String price);
+	Map<String, String> paymentGzh(String out_trade_no,String openid,String body,String price,String url);
 
 	String paymentCallBack(String notifyData);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -157,7 +157,7 @@ public class WxPayServiceImpl  implements IWxPayService {
     }
 
     @Override
-    public Map<String, String> paymentGzh(String out_trade_no, String openid, String body, String price) {
+    public Map<String, String> paymentGzh(String out_trade_no, String openid, String body, String price,String url) {
         WxSmallConfig config = new WxSmallConfig(gzhAppid,mchid,key);
         try {
             WXPay wxpay = new WXPay(config);
@@ -181,7 +181,7 @@ public class WxPayServiceImpl  implements IWxPayService {
             result.put("nonceStr",resp.get("nonce_str"));
             result.put("package","prepay_id="+resp.get("prepay_id"));
             result.put("signType","MD5");
-            result.put("configPaySign", wx_config_sign(result));
+            result.put("configPaySign", wx_config_sign(result,url));
             result.put("paySign", WXPayUtil.generateSignature(result, key, WXPayConstants.SignType.MD5));
              System.out.println(result);
             return result;
@@ -192,9 +192,8 @@ public class WxPayServiceImpl  implements IWxPayService {
         return null;
     }
 
-    public String wx_config_sign(Map<String, String> result) {
-        String url="https://m.xyyxt.net/";
-        String jsapi_ticket = wx_get_jsapi_ticket();
+    public String wx_config_sign(Map<String, String> result,String url) {
+        String url="https://m.xyyxt.net/";        String jsapi_ticket = wx_get_jsapi_ticket();
         String str = "jsapi_ticket="+jsapi_ticket+"&noncestr="+result.get("nonceStr")+"&timestamp="+result.get("timeStamp")+"&url="+url;
         String signature = AES.SHA1(str);
         return signature;