From af674e25a0a3e52d06e3bc56980a15d5429ed7f3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 4 Mar 2025 14:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminOrderController.java | 9 ++++++- .../controller/user/UserOrderController.java | 7 ++++++ .../com/czg/order/entity/OrderDetail.java | 4 +++ .../czg/order/service/OrderInfoService.java | 3 +++ .../service/impl/OrderInfoServiceImpl.java | 25 ++++++++++++++++--- 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index 38d8c9cb..fa7e11c6 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -16,6 +16,8 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Map; + /** * 订单管理 @@ -41,6 +43,11 @@ public class AdminOrderController { return CzgResult.success(orderInfoService.getOrderByPage(queryDTO)); } + @GetMapping("/getOrderById") + public CzgResult> getOrderById(Long orderId) { + return orderInfoService.getOrderDetails(orderId); + } + @GetMapping("/historyOrder") public CzgResult historyOrder( @RequestParam(required = false) Long orderId, @@ -59,7 +66,7 @@ public class AdminOrderController { /** * 订单全额退款 只传订单id - * 部分退款 传参refundDetailMap {"详情id":"数量","详情id":"数量"} + * 部分退款 传参refundDetail */ @PostMapping("/refundOrder") public CzgResult refundOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) { diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java index 3111e884..4d919109 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java @@ -14,6 +14,8 @@ import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; +import java.util.Map; + /** * 订单管理 @@ -38,6 +40,11 @@ public class UserOrderController { return CzgResult.success(orderInfoService.getOrderByPage(queryDTO)); } + @GetMapping("/getOrderById") + public CzgResult> getOrderById(Long orderId) { + return orderInfoService.getOrderDetails(orderId); + } + @GetMapping("/historyOrder") public CzgResult historyOrder( @RequestParam(required = false) Long orderId, diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java index 2495c715..26015c3e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java @@ -201,4 +201,8 @@ public class OrderDetail implements Serializable { public String getRefundRemark() { return StrUtil.isBlank(refundRemark) ? "" : refundRemark + " "; } + + public BigDecimal getCouponNum() { + return couponNum == null ? BigDecimal.ZERO : couponNum; + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 6bfd4466..a7e1af8a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -10,6 +10,7 @@ import com.czg.order.entity.OrderInfo; import com.czg.order.enums.PayEnums; import com.czg.order.vo.HistoryOrderVo; import com.czg.order.vo.OrderInfoVo; +import com.czg.resp.CzgResult; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import jakarta.validation.constraints.NotBlank; @@ -30,6 +31,8 @@ public interface OrderInfoService extends IService { Page getOrderByPage(OrderInfoQueryDTO param); + CzgResult> getOrderDetails(Long orderId); + HistoryOrderVo historyOrder(Long orderId, String tableCode); OrderInfo createOrder(OrderInfoAddDTO param); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index ee43f159..28e0748e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -30,6 +30,7 @@ import com.czg.order.service.OrderPaymentService; import com.czg.order.vo.HistoryOrderVo; import com.czg.order.vo.OrderDetailSmallVO; import com.czg.order.vo.OrderInfoVo; +import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.service.RedisService; import com.czg.order.dto.BigDecimalDTO; @@ -128,6 +129,18 @@ public class OrderInfoServiceImpl extends ServiceImpl> getOrderDetails(Long orderId) { + AssertUtil.isNull(orderId, "订单id不能为空"); + OrderInfo orderInfo = getById(orderId); + AssertUtil.isNull(orderInfo, "订单信息不存在"); + List orderDetails = orderDetailService.queryChain().select().eq(OrderDetail::getOrderId, orderId).list(); + Map resultMap = new HashMap<>(); + resultMap.put("orderInfo", orderInfo); + resultMap.put("orderDetails", orderDetails); + return CzgResult.success(resultMap); + } + @Override public HistoryOrderVo historyOrder(Long orderId, String tableCode) { if (orderId == null && StrUtil.isBlank(tableCode)) { @@ -212,13 +225,13 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { if (couponNum.compareTo(orderDetail.getNum()) >= 0) { orderDetail.setCouponNum(orderDetail.getNum());