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-12-19 14:29:27 +08:00
parent 8d7d408031
commit 1e322c5c8d
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java
View File

@@ -37,11 +37,6 @@ public class UserAuthorizationController {
return CzgResult.success(userAuthorizationService.login(userAuthorizationLoginDTO)); return CzgResult.success(userAuthorizationService.login(userAuthorizationLoginDTO));
} }
@PostMapping("/test")
public CzgResult<String> test() {
return CzgResult.success(StpKit.USER.getTokenValue());
}
/** /**
* 获取手机号 * 获取手机号
* @param getPhoneDTO 获取手机号信息 * @param getPhoneDTO 获取手机号信息

8
cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
View File

@@ -20,11 +20,11 @@ public interface GbOrderMapper extends BaseMapper<GbOrder> {
GbOrderCountVO countOrder(@Param("param") GbOrderQueryParam param); GbOrderCountVO countOrder(@Param("param") GbOrderQueryParam param);
List<GbOrderDetailVO> getGbOrderPage(@Param("param") GbOrderQueryParam param, Long shopId, Long mainShopId); List<GbOrderDetailVO> 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<GbOrderUserVO> getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); List<GbOrderUserVO> getGbOrderDetailUsers(Long shopId, String groupOrderNo);
} }

12
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
View File

@@ -96,9 +96,8 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
@Override @Override
public Page<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param) { public Page<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param) {
Long mainIdByShopId = shopInfoService.getMainIdByShopId(param.getShopId());
PageHelper.startPage(param.getPage(), param.getSize()); PageHelper.startPage(param.getPage(), param.getSize());
List<GbOrderDetailVO> result = mapper.getGbOrderPage(param, param.getShopId(), mainIdByShopId); List<GbOrderDetailVO> result = mapper.getGbOrderPage(param, param.getShopId());
return PageUtil.convert(new PageInfo<>(result)); return PageUtil.convert(new PageInfo<>(result));
} }
@@ -107,19 +106,18 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
if (StrUtil.isBlank(groupOrderNo) && detailId == null) { if (StrUtil.isBlank(groupOrderNo) && detailId == null) {
throw new CzgException("参数错误"); throw new CzgException("参数错误");
} }
Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId);
GbOrderDetailVO gbOrderDetail; GbOrderDetailVO gbOrderDetail;
if (detailId != null) { if (detailId != null) {
gbOrderDetail = mapper.getDetailByDetailId(mainIdByShopId, shopId, detailId); gbOrderDetail = mapper.getDetailByDetailId(shopId, detailId);
AssertUtil.isNull(gbOrderDetail, "记录不存在"); AssertUtil.isNull(gbOrderDetail, "记录不存在");
} else { } else {
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); gbOrderDetail = mapper.getDetailByGroupNo(shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
} }
if (StrUtil.isNotBlank(groupOrderNo)) { if (StrUtil.isNotBlank(groupOrderNo)) {
gbOrderDetail.setGroupOrderNo(groupOrderNo); gbOrderDetail.setGroupOrderNo(groupOrderNo);
} }
gbOrderDetail.setShopId(shopId); gbOrderDetail.setShopId(shopId);
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(shopId, gbOrderDetail.getGroupOrderNo());
gbOrderDetail.setUsers(users); gbOrderDetail.setUsers(users);
return gbOrderDetail; return gbOrderDetail;
} }
@@ -164,7 +162,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
queryWrapper.orderBy(GbOrderDetail::getPayTime).asc(); queryWrapper.orderBy(GbOrderDetail::getPayTime).asc();
GbOrderDetail detail = detailService.getOne(queryWrapper); GbOrderDetail detail = detailService.getOne(queryWrapper);
if (detail != null) { if (detail != null) {
ShopUser userInfo = shopUserService.getUserInfo(detail.getShopId(), detail.getUserId()); ShopUser userInfo = shopUserService.getShopUserInfo(detail.getShopId(), detail.getUserId());
if (userInfo != null) { if (userInfo != null) {
ing.setAvatar(userInfo.getHeadImg()); ing.setAvatar(userInfo.getHeadImg());
ing.setNickName(userInfo.getNickName()); ing.setNickName(userInfo.getNickName());

9
cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
View File

@@ -46,7 +46,7 @@
FROM FROM
`gb_order_detail` detail `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 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 LEFT JOIN tb_shop_info shop on detail.shop_id = shop.id
WHERE WHERE
detail.shop_id = #{shopId} detail.shop_id = #{shopId}
@@ -92,7 +92,7 @@
FROM FROM
`gb_order_detail` detail `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 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 LEFT JOIN tb_shop_info shop on detail.shop_id = shop.id
WHERE WHERE
detail.shop_id = #{shopId} and detail.id=#{detailId} and detail.is_del = 0 detail.shop_id = #{shopId} and detail.id=#{detailId} and detail.is_del = 0
@@ -108,7 +108,7 @@
FROM FROM
gb_order `order` 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 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 LEFT JOIN tb_shop_info shop on `order`.shop_id = shop.id
WHERE WHERE
`order`.group_order_no = #{groupOrderNo} `order`.group_order_no = #{groupOrderNo}
@@ -117,8 +117,7 @@
<select id="getGbOrderDetailUsers" resultType="com.czg.order.vo.GbOrderUserVO"> <select id="getGbOrderDetailUsers" resultType="com.czg.order.vo.GbOrderUserVO">
select `user`.nick_name as userName, `user`.phone as userPhone, `user`.head_img as userAvatar select `user`.nick_name as userName, `user`.phone as userPhone, `user`.head_img as userAvatar
from gb_order_detail detail from gb_order_detail detail
left join tb_shop_user `user` left join tb_user_info `user` on `user`.id = detail.user_id
on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id
where detail.shop_id = #{shopId} where detail.shop_id = #{shopId}
and detail.group_order_no = #{groupOrderNo} and detail.group_order_no = #{groupOrderNo}
and (detail.status = '待成团' or detail.status = '待核销' or detail.status = '退款中') and (detail.status = '待成团' or detail.status = '待核销' or detail.status = '退款中')