1.代客下单 删除订单接口

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

@@ -92,9 +92,9 @@ public class TbPlaceController {
     @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> getCart(
-            @RequestParam Long tableId,
             @RequestParam(defaultValue = "1") Integer page,
             @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam Long tableId,
             @RequestParam Integer shopId,
             @RequestParam(required = false) Integer vipUserId,
             @RequestParam String masterId
@@ -139,17 +139,6 @@ public class TbPlaceController {
 
     @AnonymousAccess
 
-    @GetMapping("/car")
-    @Log("代客下单 查询购物车")
-    @ApiOperation("代客下单 查询购物车 /shop/table")
-    public ResponseEntity<Object> getCar(
-            @RequestParam Integer shopId
-    ) {
-        return ResponseEntity.ok(tbShopTableService.getCar(shopId));
-    }
-
-    @AnonymousAccess
-
     @GetMapping("/payType")
     @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
@@ -170,5 +159,15 @@ public class TbPlaceController {
     ) {
         return ResponseEntity.ok(tbShopTableService.pay(payDTO));
     }
+    @AnonymousAccess
+
+    @DeleteMapping("/order")
+    @Log("代客下单 删除订单")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> delete(
+            @Validated @RequestBody DeleteOrderDTO deleteOrderDTO
+    ) {
+        return ResponseEntity.ok(tbShopTableService.deleteOrder(deleteOrderDTO));
+    }
 
 }

eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/DeleteOrderDTO.java

@@ -0,0 +1,9 @@
+package cn.ysk.cashier.dto.shoptable;
+
+import lombok.Data;
+
+@Data
+public class DeleteOrderDTO {
+    private Integer shopId;
+    private Integer orderId;
+}

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java

@@ -648,7 +648,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         }
         redisTemplate.opsForValue().set("SHOP:CODE:" + clientType + ":" + shopId + ":" + day, String.valueOf(Integer.parseInt(orderCode) + 1));
         boolean flag = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent("SHOP:CODE:SET" + clientType + ":" + shopId + ":" + day, orderCode));
-        if (flag) {
+        if (!flag) {
             return generateOrderCode(day, clientType, shopId);
         }
         // 增加计数器
@@ -879,7 +879,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         cashierCart.setStatus(pendingDTO.getIsPending() ? "refund" : "create");
         cashierCartMapper.update(cashierCart, new LambdaUpdateWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getOrderId, orderId));
-        return orderInfo;
+        return orderInfoMapper.selectById(orderId);
     }
 
     @Override
@@ -965,4 +965,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         rabbitTemplate.convertAndSend(RabbitConstants.EXCHANGE_STOCK_RECORD, RabbitConstants.ROUTING_STOCK_RECORD_SALE, mqData.toJSONString(), new CorrelationData(UUID.randomUUID().toString()));
         return null;
     }
+
+    @Override
+    public Object deleteOrder(DeleteOrderDTO deleteOrderDTO) {
+        int count1 = orderInfoMapper.delete(new LambdaQueryWrapper<TbOrderInfo>()
+                .eq(TbOrderInfo::getShopId, deleteOrderDTO.getShopId())
+                .eq(TbOrderInfo::getId, deleteOrderDTO.getOrderId()));
+
+        int count2 = orderDetailMapper.delete(new LambdaQueryWrapper<TbOrderDetail>()
+                .eq(TbOrderDetail::getShopId, deleteOrderDTO.getShopId())
+                .eq(TbOrderDetail::getOrderId, deleteOrderDTO.getOrderId()));
+
+        int count3 = cashierCartMapper.delete(new LambdaQueryWrapper<TbCashierCart>()
+                .eq(TbCashierCart::getShopId, deleteOrderDTO.getShopId())
+                .eq(TbCashierCart::getOrderId, deleteOrderDTO.getOrderId()));
+        return count1 > 0 && count2 > 0 && count3 > 0;
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java

@@ -119,4 +119,6 @@ public interface TbShopTableService {
     Object getPayType(Integer shopId);
 
     Object pay(PayDTO payDTO);
+
+    Object deleteOrder(DeleteOrderDTO deleteOrderDTO);
 }