czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取消订单

Browse Source 
订单打印 单数
This commit is contained in:
wangw
2025-03-31 11:47:02 +08:00
parent fa36cd135f
commit 7ca93edc5a
9 changed files with 161 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
View File

@@ -12,6 +12,7 @@ import com.czg.order.vo.OrderInfoVo;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.order.service.PayService;
import com.czg.utils.AssertUtil;
import com.czg.utils.ServletUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
@@ -100,4 +101,17 @@ public class AdminOrderController {
public CzgResult<Boolean> printOrder(@Validated @RequestBody OrderInfoPrintDTO orderInfoPrintDTO) {
return CzgResult.success(orderInfoService.printOrder(StpKit.USER.getShopId(), orderInfoPrintDTO));
}
@PostMapping("/cancelOrder")
public CzgResult<Void> cancelOrder(@Validated @RequestBody OrderCannelDTO param) {
orderInfoService.cancelledOrder(param.getShopId(), param.getOrderId());
return CzgResult.success();
}
@PostMapping("/rmPlaceOrder")
public CzgResult<Void> cancelledPlaceOrder(@Validated @RequestBody OrderCannelDTO param) {
AssertUtil.isNull(param.getPlaceNum(), "{}不能为空", "取消单次");
orderInfoService.cancelledPlaceOrder(param.getShopId(), param.getOrderId(), param.getPlaceNum());
return CzgResult.success();
}
}

24
cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
View File

@@ -1,6 +1,8 @@
package com.czg.controller.user;
import com.czg.annotation.Debounce;
import com.czg.exception.CzgException;
import com.czg.order.dto.OrderCannelDTO;
import com.czg.order.dto.OrderInfoAddDTO;
import com.czg.order.dto.OrderInfoQueryDTO;
import com.czg.order.entity.OrderInfo;
@@ -9,11 +11,13 @@ import com.czg.order.vo.HistoryOrderVo;
import com.czg.order.vo.OrderInfoVo;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.order.enums.OrderStatusEnums;
import com.czg.utils.AssertUtil;
import com.czg.utils.ServletUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -70,10 +74,30 @@ public class UserOrderController {
public CzgResult<Void> upOrderIsDel(@PathVariable("id") Long id) {
//效验数据
AssertUtil.isNull(id, "{}不能为空", "订单Id");
OrderInfo orderInfo = orderInfoService.getById(id);
AssertUtil.isNull(orderInfo, "删除失败订单不存在");
if (orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
throw new CzgException("待支付订单不可删除");
}
orderInfoService.updateChain()
.set(OrderInfo::getIsDel, 1)
.eq(OrderInfo::getId, id)
.update();
return CzgResult.success();
}
@PostMapping("/cancelOrder")
@Debounce(value = "#param.orderId")
public CzgResult<Void> cancelOrder(@Validated @RequestBody OrderCannelDTO param) {
orderInfoService.cancelledOrder(param.getShopId(), param.getOrderId());
return CzgResult.success();
}
@PostMapping("/rmPlaceOrder")
@Debounce(value = "#param.orderId")
public CzgResult<Void> cancelledPlaceOrder(@Validated @RequestBody OrderCannelDTO param) {
AssertUtil.isNull(param.getPlaceNum(), "{}不能为空", "取消单次");
orderInfoService.cancelledPlaceOrder(param.getShopId(), param.getOrderId(), param.getPlaceNum());
return CzgResult.success();
}
}