From 87d786c8a13d0032d55ac86f79f01d37da80731e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 18 Dec 2025 09:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E5=8D=95=E5=8F=B7=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UGbOrderController.java | 7 +++++-- .../com/czg/order/service/GbOrderService.java | 2 +- .../service/order/mapper/GbOrderMapper.java | 4 +++- .../order/service/impl/GbOrderServiceImpl.java | 15 ++++++++++++--- .../main/resources/mapper/GbOrderMapper.xml | 18 ++++++++++++++++-- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java index 7ccfb0057..457ccb1aa 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java @@ -79,8 +79,11 @@ public class UGbOrderController { * 拼团订单详情 */ @GetMapping("/record/detail") - public CzgResult getGoodsRecordDetail(@RequestParam Long shopId, @RequestParam Long detailId) { - return CzgResult.success(orderService.getGoodsRecordDetail(shopId, detailId)); + public CzgResult getGoodsRecordDetail( + @RequestParam Long shopId, + @RequestParam(required = false) Long detailId, + @RequestParam(required = false) String groupOrderNo) { + return CzgResult.success(orderService.getGoodsRecordDetail(shopId, detailId, groupOrderNo)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/GbOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/GbOrderService.java index 6bc519249..2afc974c8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/GbOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/GbOrderService.java @@ -26,7 +26,7 @@ public interface GbOrderService extends IService { Page getGbOrderPage(GbOrderQueryParam param); //拼团订单详情 - GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId); + GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId, String groupOrderNo); //商品详情 GbWareVO getWareDetail(Long shopId, Long wareId, Long userId); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java index 9ee655609..c7dad9880 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java @@ -18,7 +18,9 @@ public interface GbOrderMapper extends BaseMapper { List getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId); - GbOrderDetailVO getGbOrderDetail(Long mainShopId, Long shopId, Long detailId); + GbOrderDetailVO getDetailByDetailId(Long mainShopId, Long shopId, Long detailId); + + GbOrderDetailVO getDetailByGroupNo(Long mainShopId, Long shopId, String groupOrderNo, Long userId); List getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index 32662cbf5..ad35d89b0 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -99,10 +99,19 @@ public class GbOrderServiceImpl extends ServiceImpl impl } @Override - public GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId) { + public GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId, String groupOrderNo) { + if (StrUtil.isBlank(groupOrderNo) && detailId == null) { + throw new CzgException("参数错误"); + } Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId); - GbOrderDetailVO gbOrderDetail = mapper.getGbOrderDetail(mainIdByShopId, shopId, detailId); - AssertUtil.isNull(gbOrderDetail, "记录不存在"); + GbOrderDetailVO gbOrderDetail; + if (detailId != null) { + gbOrderDetail = mapper.getDetailByDetailId(mainIdByShopId, shopId, detailId); + AssertUtil.isNull(gbOrderDetail, "记录不存在"); + } else { + gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); + gbOrderDetail.setGroupOrderNo(groupOrderNo); + } List users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); gbOrderDetail.setUsers(users); return gbOrderDetail; diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml index c7d7fa242..d63093d7d 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -42,7 +42,7 @@ order by detail.create_time desc - SELECT detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`order`.group_people_num as groupPeopleNum,`order`.ware_group_price as wareGroupPrice, `order`.ware_original_price as wareOriginalPrice,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress @@ -52,7 +52,21 @@ left join tb_shop_user `user` on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id LEFT JOIN tb_shop_info shop on detail.shop_id = shop.id WHERE - detail.shop_id = #{shopId} and detail.id=#{detailId} + detail.shop_id = #{shopId} and detail.id=#{detailId} and detail.is_del = 0 + order by detail.create_time desc + + +