1.数据报表导出cpu拉高问题修复

2.代客下单相关接口

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java

@@ -2,10 +2,7 @@ package cn.ysk.cashier.controller.product;
 
 import cn.ysk.cashier.annotation.AnonymousAccess;
 import cn.ysk.cashier.annotation.Log;
-import cn.ysk.cashier.dto.shoptable.AddCartDTO;
-import cn.ysk.cashier.dto.shoptable.ClearCartDTO;
-import cn.ysk.cashier.dto.shoptable.RemoveCartDTO;
-import cn.ysk.cashier.dto.shoptable.UpdateCartDTO;
+import cn.ysk.cashier.dto.shoptable.*;
 import cn.ysk.cashier.pojo.order.TbCashierCart;
 import cn.ysk.cashier.service.product.TbProductService;
 import cn.ysk.cashier.service.shop.TbShopTableService;
@@ -63,6 +60,14 @@ public class TbPlaceController {
         return ResponseEntity.ok(tbShopTableService.updateCart(updateCartDTO));
     }
 
+    @AnonymousAccess
+    @PutMapping("/pack")
+    @Log("代客下单")
+    @ApiOperation("代客下单/shop/table")
+    public ResponseEntity<TbCashierCart> pack(@Valid @RequestBody PackCartDTO packCartDTO) {
+        tbShopTableService.pack(packCartDTO);
+        return ResponseEntity.ok(null);
+    }
 
     @AnonymousAccess
     @DeleteMapping("/removeCart")
@@ -95,4 +100,27 @@ public class TbPlaceController {
         return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId));
     }
 
+    @AnonymousAccess
+
+    @GetMapping("/masterId")
+    @Log("代客下单 查询购物车")
+    @ApiOperation("代客下单 ")
+    public ResponseEntity<Object> getMasterId(
+            @RequestParam Long tableId,
+            @RequestParam Integer shopId
+    ) {
+        return ResponseEntity.ok(tbShopTableService.getMasterId(tableId, shopId));
+    }
+
+    @AnonymousAccess
+
+    @PostMapping("/order")
+    @Log("代客下单 查询购物车")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> createOrder(
+           @RequestBody CreateOrderDTO createOrderDTO
+    ) {
+        return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO));
+    }
+
 }