“添加回调日志”

src/main/java/com/sqx/modules/callBack/controller/CallBackController.java

@@ -50,6 +50,10 @@ public class CallBackController {
     @PostMapping("/open")
     public String back(String expire_time, String sign, String trade_no, String order_no, String state, String note, String courier, String longitude, String latitude, String tel, String update_time) {
 
+        log.info("状态："+state);
+        log.info("订单号："+order_no);
+        log.info("骑手手机号："+tel);
+
         UserEntity userEntity = userService.queryByPhone(tel);
         if (ObjectUtils.isEmpty(userEntity)) {
             log.info("不存在该手机号的骑手：" + tel);

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -342,39 +342,43 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         tbIndent.setShopId(order.getShopId());
         baseMapper.insert(tbIndent);
 
-        //            创建快跑者订单
-        log.info("第一次创建快跑者订单");
-        String responseBody = creatSpeedRunnerOrder(order);
-        if (ObjectUtils.isNotEmpty(responseBody)) {
-            String tradeNo= getOrderTradeNo(responseBody);
-            log.info("第一次创建订单获取的快跑者返回订单号："+tradeNo);
-            if (ObjectUtils.isNotEmpty(tradeNo)) {
-                order.setTradeNo(tradeNo);
-                appOrderService.updateById(order);
-            }else {
-                log.info("第二次创建快跑者订单");
-                String responseBody2 = creatSpeedRunnerOrder(order);
-                if (ObjectUtils.isNotEmpty(responseBody2)) {
-                    String tradeNo2= getOrderTradeNo(responseBody2);
-                    log.info("第二次创建订单获取的快跑者返回订单号："+tradeNo2);
-                    if (ObjectUtils.isNotEmpty(tradeNo2)) {
-                        order.setTradeNo(tradeNo2);
-                        appOrderService.updateById(order);
+
+        if (!tbIndent.getIndentState().equals("11")) {
+            //            创建快跑者订单
+            log.info("第一次创建快跑者订单");
+            String responseBody = creatSpeedRunnerOrder(order);
+            if (ObjectUtils.isNotEmpty(responseBody)) {
+                String tradeNo = getOrderTradeNo(responseBody);
+                log.info("第一次创建订单获取的快跑者返回订单号：" + tradeNo);
+                if (ObjectUtils.isNotEmpty(tradeNo)) {
+                    order.setTradeNo(tradeNo);
+                    appOrderService.updateById(order);
+                } else {
+                    log.info("第二次创建快跑者订单");
+                    String responseBody2 = creatSpeedRunnerOrder(order);
+                    if (ObjectUtils.isNotEmpty(responseBody2)) {
+                        String tradeNo2 = getOrderTradeNo(responseBody2);
+                        log.info("第二次创建订单获取的快跑者返回订单号：" + tradeNo2);
+                        if (ObjectUtils.isNotEmpty(tradeNo2)) {
+                            order.setTradeNo(tradeNo2);
+                            appOrderService.updateById(order);
+                        }
                     }
                 }
-            }
 
-        }else {
-            log.info("创建快跑者订单的返回信息为空，第二次创建");
-            String responseBody2 = creatSpeedRunnerOrder(order);
-            String tradeNo= getOrderTradeNo(responseBody2);
-            log.info("第二次创建订单获取的快跑者返回订单号："+tradeNo);
-            if (ObjectUtils.isNotEmpty(tradeNo)) {
-                order.setTradeNo(tradeNo);
-                appOrderService.updateById(order);
+            } else {
+                log.info("创建快跑者订单的返回信息为空，第二次创建");
+                String responseBody2 = creatSpeedRunnerOrder(order);
+                String tradeNo = getOrderTradeNo(responseBody2);
+                log.info("第二次创建订单获取的快跑者返回订单号：" + tradeNo);
+                if (ObjectUtils.isNotEmpty(tradeNo)) {
+                    order.setTradeNo(tradeNo);
+                    appOrderService.updateById(order);
+                }
             }
         }
 
+
         return Result.success();
     }