Commit f2a3077f by 陈浩建

单宽支付bug

parent d5b122c6
...@@ -296,7 +296,7 @@ public class DankuanController { ...@@ -296,7 +296,7 @@ public class DankuanController {
dataMapping.put("status", "已支付"); dataMapping.put("status", "已支付");
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
Wrapper<Order> objectEntityWrapper = new EntityWrapper<>(); Wrapper<Order> objectEntityWrapper = new EntityWrapper<>();
objectEntityWrapper.eq("order_number", orderseq); objectEntityWrapper.eq("kd_order_id", orderseq);
Map<String, Object> dataMapping2 = new HashMap<>(); Map<String, Object> dataMapping2 = new HashMap<>();
dataMapping2.put("order_status", "未下单"); dataMapping2.put("order_status", "未下单");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper);
...@@ -415,7 +415,7 @@ public class DankuanController { ...@@ -415,7 +415,7 @@ public class DankuanController {
/** /**
* 支付接口 * 支付接口
* *
* @param orderId * @param orderSeq
* @param ipay * @param ipay
* @param userId * @param userId
* @param request * @param request
...@@ -480,7 +480,7 @@ public class DankuanController { ...@@ -480,7 +480,7 @@ public class DankuanController {
// if (Constant.Payment1.equals(ipay)) { // if (Constant.Payment1.equals(ipay)) {
// //支付成功回调的页面 // //支付成功回调的页面
// // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id; // // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id;
String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId+"&"+"orderSeq="+orderSeq; String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
// } // }
//单宽回调后端接口地址 //单宽回调后端接口地址
......
...@@ -467,7 +467,7 @@ public class RongHeController { ...@@ -467,7 +467,7 @@ public class RongHeController {
/* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/ /* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
/* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/ /* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
// 正式地址 // 正式地址
String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id; String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId;
// String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id; // String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
// } // }
...@@ -475,7 +475,7 @@ public class RongHeController { ...@@ -475,7 +475,7 @@ public class RongHeController {
// map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser");
// map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser"); // map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
//正式地址 //正式地址
map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/rongHe/toSubmisOrderPreser"); map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
//* 将值转换为大写 *//* //* 将值转换为大写 *//*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment