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:25:37 +08:00
parent 691f12753e
commit d6966b9b07
5 changed files with 140 additions and 131 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,14 +1,20 @@
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.service.order.service.PayService;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
@@ -23,29 +29,31 @@ public class AdminOrderController {
@Resource
private OrderInfoService orderInfoService;
@Resource
private PayService payService;
/**
* 订单列表
*/
// @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
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));
}
/**
* 订单全额退款 只传订单id
@@ -54,6 +62,6 @@ public class AdminOrderController {
*/
@PostMapping("/refundOrder")
public CzgResult<Object> refundOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
return orderInfoService.refundOrder(refundDTO);
return payService.refundOrderBefore(refundDTO);
}
}