更新快跑者回调

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

@@ -107,9 +107,13 @@ public class CallBackController {
             tbIndentService.orderIndentReceiving(userEntity.getUserId(), tbOrder.getOrderId()+"");
         } else if ("5".equals(state)) {//取餐
             log.info("骑手取餐：" + order_no);
-            tbOrder.setStatus(3);
-            appOrderService.updateOrder(tbOrder);
-            if ("2".equals(tbIndent.getIndentState())) {
+//            判断订单是否完成
+            if (tbOrder.getStatus()!=4) {
+                tbOrder.setStatus(3);
+                appOrderService.updateOrder(tbOrder);
+            }
+            //            判断跑腿订单是否完成
+            if (!"6".equals(tbIndent.getIndentState())) {
                 tbIndent.setIndentState("4"); // 4：骑手已取货/购买
                 String receiveTimeStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
                 tbIndent.setRiderUserId(userEntity.getUserId());
@@ -120,6 +124,17 @@ public class CallBackController {
             tbIndentService.riderBuyGoods(tbIndent);
         } else if ("6".equals(state)) {//完成订单
             log.info("骑手完成订单：" + order_no);
+            if (tbOrder.getStatus()!=3) {
+                tbOrder.setStatus(3);
+                appOrderService.updateOrder(tbOrder);
+            }
+            if (!"4".equals(tbIndent.getIndentState())) {
+                tbIndent.setIndentState("4"); // 4：骑手已取货/购买
+                String receiveTimeStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+                tbIndent.setRiderUserId(userEntity.getUserId());
+                tbIndent.setReceivingTime(receiveTimeStr);
+                tbIndentService.updateById(tbIndent);
+            }
             tbIndentService.finalizeOrder(userEntity.getUserId(), tbIndent);
         }
         return "success";