Merge remote-tracking branch 'origin/test' into test

cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java

@@ -21,7 +21,7 @@ import java.util.Set;
 
 
 /**
- * 预约端-联系人列表
+ * 预约端
  *
  * @author ww
  * @description
@@ -96,6 +96,18 @@ public class BkContactListController {
         bkOrderService.upStatus(StpKit.USER.getShopId(), "已取消", bkOrder.getId(), bkOrder.getCancelReason());
         return CzgResult.success();
     }
+
+
+    /**
+     * 预约端-预约单：已到店
+     */
+//    @SaAdminCheckPermission(value = "bk:bkOrder:storeArrival", name = "预约端-预约单：已到店")
+    @PostMapping("/bkOrder/storeArrival")
+    public CzgResult<Void> storeArrival(@RequestBody BkOrderDTO bkOrder) {
+        AssertUtil.isNull(bkOrder.getId(), "已到店的预约单id不能为空");
+        bkOrderService.upStatus(StpKit.USER.getShopId(), "已到店", bkOrder.getId(), "");
+        return CzgResult.success();
+    }
 }
 
 

cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml

@@ -30,5 +30,6 @@
             </if>
         </if>
         group by o.id
+        order by o.booking_time desc
     </select>
 </mapper>

cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml

@@ -100,7 +100,16 @@
         <if test="isNoTable != null">
             AND `table`.`table_code` is null
         </if>
-        GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.place_num
+        GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.id
+        ORDER BY
+            CASE detail.sub_status
+                WHEN 'READY_TO_SERVE' THEN 1
+                WHEN 'PENDING_PREP' THEN 2
+                WHEN 'SENT_OUT' THEN 3
+                WHEN 'DELIVERED' THEN 4
+                ELSE 5
+            END ASC,
+        CASE WHEN detail.sub_status = 'READY_TO_SERVE' THEN detail.start_order_time END ASC
     </select>