From 1e322c5c8d968aa6b4261d3add782818072389ff Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 19 Dec 2025 14:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UserAuthorizationController.java | 5 ----- .../com/czg/service/order/mapper/GbOrderMapper.java | 8 ++++---- .../order/service/impl/GbOrderServiceImpl.java | 12 +++++------- .../src/main/resources/mapper/GbOrderMapper.xml | 9 ++++----- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java index c6d76c8e8..5d80688b0 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java @@ -37,11 +37,6 @@ public class UserAuthorizationController { return CzgResult.success(userAuthorizationService.login(userAuthorizationLoginDTO)); } - @PostMapping("/test") - public CzgResult test() { - return CzgResult.success(StpKit.USER.getTokenValue()); - } - /** * 获取手机号 * @param getPhoneDTO 获取手机号信息 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 40854beed..808591b70 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 @@ -20,11 +20,11 @@ public interface GbOrderMapper extends BaseMapper { GbOrderCountVO countOrder(@Param("param") GbOrderQueryParam param); - List getGbOrderPage(@Param("param") GbOrderQueryParam param, Long shopId, Long mainShopId); + List getGbOrderPage(@Param("param") GbOrderQueryParam param, Long shopId); - GbOrderDetailVO getDetailByDetailId(Long mainShopId, Long shopId, Long detailId); + GbOrderDetailVO getDetailByDetailId(Long shopId, Long detailId); - GbOrderDetailVO getDetailByGroupNo(Long mainShopId, Long shopId, String groupOrderNo, Long userId); + GbOrderDetailVO getDetailByGroupNo(Long shopId, String groupOrderNo, Long userId); - List getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); + List getGbOrderDetailUsers(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 95150b825..ff445fd9f 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 @@ -96,9 +96,8 @@ public class GbOrderServiceImpl extends ServiceImpl impl @Override public Page getGbOrderPage(GbOrderQueryParam param) { - Long mainIdByShopId = shopInfoService.getMainIdByShopId(param.getShopId()); PageHelper.startPage(param.getPage(), param.getSize()); - List result = mapper.getGbOrderPage(param, param.getShopId(), mainIdByShopId); + List result = mapper.getGbOrderPage(param, param.getShopId()); return PageUtil.convert(new PageInfo<>(result)); } @@ -107,19 +106,18 @@ public class GbOrderServiceImpl extends ServiceImpl impl if (StrUtil.isBlank(groupOrderNo) && detailId == null) { throw new CzgException("参数错误"); } - Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId); GbOrderDetailVO gbOrderDetail; if (detailId != null) { - gbOrderDetail = mapper.getDetailByDetailId(mainIdByShopId, shopId, detailId); + gbOrderDetail = mapper.getDetailByDetailId(shopId, detailId); AssertUtil.isNull(gbOrderDetail, "记录不存在"); } else { - gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); + gbOrderDetail = mapper.getDetailByGroupNo(shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); } if (StrUtil.isNotBlank(groupOrderNo)) { gbOrderDetail.setGroupOrderNo(groupOrderNo); } gbOrderDetail.setShopId(shopId); - List users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); + List users = mapper.getGbOrderDetailUsers(shopId, gbOrderDetail.getGroupOrderNo()); gbOrderDetail.setUsers(users); return gbOrderDetail; } @@ -164,7 +162,7 @@ public class GbOrderServiceImpl extends ServiceImpl impl queryWrapper.orderBy(GbOrderDetail::getPayTime).asc(); GbOrderDetail detail = detailService.getOne(queryWrapper); if (detail != null) { - ShopUser userInfo = shopUserService.getUserInfo(detail.getShopId(), detail.getUserId()); + ShopUser userInfo = shopUserService.getShopUserInfo(detail.getShopId(), detail.getUserId()); if (userInfo != null) { ing.setAvatar(userInfo.getHeadImg()); ing.setNickName(userInfo.getNickName()); 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 22fd2d077..3549f8694 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -46,7 +46,7 @@ FROM `gb_order_detail` detail LEFT JOIN gb_order `order` on detail.group_order_no = `order`.group_order_no and `order`.shop_id = #{shopId} - left join tb_shop_user `user` on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id + left join tb_user_info `user` on `user`.id = detail.user_id LEFT JOIN tb_shop_info shop on detail.shop_id = shop.id WHERE detail.shop_id = #{shopId} @@ -92,7 +92,7 @@ FROM `gb_order_detail` detail LEFT JOIN gb_order `order` on detail.group_order_no = `order`.group_order_no and `order`.shop_id = #{shopId} - left join tb_shop_user `user` on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id + left join tb_user_info `user` on `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} and detail.is_del = 0 @@ -108,7 +108,7 @@ FROM gb_order `order` LEFT JOIN gb_order_detail detail on detail.group_order_no = `order`.group_order_no and `detail`.shop_id = #{shopId} and `detail`.user_id = #{userId} and `detail`.is_del = 0 - LEFT JOIN tb_shop_user `user` on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id + LEFT JOIN tb_user_info `user` on `user`.id = detail.user_id LEFT JOIN tb_shop_info shop on `order`.shop_id = shop.id WHERE `order`.group_order_no = #{groupOrderNo} @@ -117,8 +117,7 @@