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-02-25 14:15:13 +08:00
parent fd7ebd0d75
commit 691f12753e
10 changed files with 127 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,14 @@
package com.czg.controller.admin;
import com.czg.order.dto.OrderInfoAddDTO;
import com.czg.order.dto.OrderInfoQueryDTO;
import com.czg.order.dto.OrderInfoRefundDTO;
import com.czg.order.entity.OrderInfo;
import com.czg.order.service.OrderInfoService;
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.utils.ServletUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -32,31 +27,24 @@ public class AdminOrderController {
/**
* 订单列表
*/
@PostMapping
public CzgResult<Page<OrderInfoVo>> getOrderPage(@RequestBody OrderInfoQueryDTO queryDTO) {
queryDTO.setShopId(StpKit.USER.getShopId());
return CzgResult.success(orderInfoService.getOrderByPage(queryDTO));
}
@GetMapping("/historyOrder")
public CzgResult<HistoryOrderVo> historyOrder(Long orderId) {
return CzgResult.success(orderInfoService.historyOrder(orderId));
}
@PostMapping("/createOrder")
public CzgResult<OrderInfo> createOrder(@Validated @RequestBody OrderInfoAddDTO addDto) {
addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
addDto.setStaffId(StpKit.USER.getLoginIdAsLong());
addDto.setShopId(StpKit.USER.getShopId());
addDto.setOrderType("cash");
return CzgResult.success(orderInfoService.createOrder(addDto));
}
// @PostMapping("/updateOrder")
// public CzgResult<OrderInfo> updateOrder(@Validated @RequestBody OrderInfoUpDTO upDTO) {
// AssertUtil.isListEmpty(upDTO.getDetailList(), "订单详情不能为空");
// orderInfoService.updateOrder(upDTO);
// return CzgResult.success();
// @PostMapping
// public CzgResult<Page<OrderInfoVo>> getOrderPage(@RequestBody OrderInfoQueryDTO queryDTO) {
// queryDTO.setShopId(StpKit.USER.getShopId());
// return CzgResult.success(orderInfoService.getOrderByPage(queryDTO));
// }
//
// @GetMapping("/historyOrder")
// public CzgResult<HistoryOrderVo> historyOrder(Long orderId) {
// return CzgResult.success(orderInfoService.historyOrder(orderId));
// }
//
// @PostMapping("/createOrder")
// public CzgResult<OrderInfo> createOrder(@Validated @RequestBody OrderInfoAddDTO addDto) {
// addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
// addDto.setStaffId(StpKit.USER.getLoginIdAsLong());
// addDto.setShopId(StpKit.USER.getShopId());
// addDto.setOrderType("cash");
// return CzgResult.success(orderInfoService.createOrder(addDto));
// }
/**

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

@@ -33,7 +33,7 @@ public class UserOrderController {
*/
@PostMapping
public CzgResult<Page<OrderInfoVo>> getOrderPage(@RequestBody OrderInfoQueryDTO queryDTO) {
queryDTO.setIsDel(1);
queryDTO.setIsDel(0);
queryDTO.setUserId(StpKit.USER.getLoginIdAsLong());
return CzgResult.success(orderInfoService.getOrderByPage(queryDTO));
}