Merge remote-tracking branch 'origin/master'

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

@@ -311,9 +311,6 @@ public class DankuanController {
         orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
         Wrapper<Order> objectEntityWrapper = new EntityWrapper<>();
         objectEntityWrapper.eq("kd_order_id", orderseq);
-        Map<String, Object> dataMapping2 = new HashMap<>();
-        dataMapping2.put("order_status", "未下单");
-        orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper);
         Map<String, Object> stringObjectMap = orderMapper.selectKdOrder(orderseq);
 
         if (stringObjectMap != null) {
@@ -503,7 +500,7 @@ public class DankuanController {
         /**
          * 测试后提交代码要恢复正式环境地址
          */
-        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?id="+userId + "&kdId=" + orderSeq;
+        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
         map.put("MERCHANTURL", MERCHANTURL);
         //单宽回调后端接口地址
         // 正式环境

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

@@ -477,7 +477,7 @@ public class RongHeController {
             /**
              * 测试后提交代码要恢复正式环境地址
              */
-            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?id="+userId + "&kdId=" + orderSeq;
+            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
             map.put("MERCHANTURL", MERCHANTURL);
             // 融合回调后端接口地址
             //正式地址

common/src/main/java/com/winsun/utils/XbkUtil.java

@@ -56,7 +56,7 @@ public class XbkUtil {
         map.put("prodId", xbId);
         map.put("coUserId", netId);
         map.put("phoneNumber", businessNumber);
-        map.put("isDelivery", "0");
+        map.put("isDelivery", "1");
         map.put("custName", customerName);
         map.put("idCardNo", idCard);
         map.put("contactNumber", contactNumber);