Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -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 {
     /**
     /**
      * 支付接口
      * 支付接口
      *
      *
-     * @param orderId
+     * @param orderSeq
      * @param ipay
      * @param ipay
      * @param userId
      * @param userId
      * @param request
      * @param request
@@ -481,7 +481,7 @@ public class DankuanController {
         /**
         /**
          * 测试后提交代码要恢复正式环境地址
          * 测试后提交代码要恢复正式环境地址
          */
          */
-        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId+"&"+"orderSeq="+orderSeq;
+        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId;
         map.put("MERCHANTURL", MERCHANTURL);
         map.put("MERCHANTURL", MERCHANTURL);
         //单宽回调后端接口地址
         //单宽回调后端接口地址
         // 正式环境
         // 正式环境

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -465,11 +465,11 @@ public class RongHeController {
             /**
             /**
              * 测试后提交代码要恢复正式环境地址
              * 测试后提交代码要恢复正式环境地址
              */
              */
-            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId+"&"+"orderSeq="+orderSeq;
+            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId;
             map.put("MERCHANTURL", MERCHANTURL);
             map.put("MERCHANTURL", MERCHANTURL);
             // 融合回调后端接口地址
             // 融合回调后端接口地址
             //正式地址
             //正式地址
-            map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/rongHe/toSubmisOrderPreser");
+//            map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/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;//商户标识
             //*	将值转换为大写	*//*
             //*	将值转换为大写	*//*