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-18 18:57:37 +08:00
parent 3e289d61e0
commit 1ac1c367b4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,6 +115,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
} else { } else {
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
gbOrderDetail.setGroupOrderNo(groupOrderNo); gbOrderDetail.setGroupOrderNo(groupOrderNo);
gbOrderDetail.setShopId(shopId);
} }
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
gbOrderDetail.setUsers(users); gbOrderDetail.setUsers(users);

6
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -1172,9 +1172,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
} }
else if (PaymentPayTypeEnum.SourceType.DISTRIBUTION.equals(payment.getSourceType())) { else if (PaymentPayTypeEnum.SourceType.DISTRIBUTION.equals(payment.getSourceType())) {
distributionUserService.open(payment.getSourceId(), payment.getAmount(), payment.getShopId(), payment.getId()); distributionUserService.open(payment.getSourceId(), payment.getAmount(), payment.getShopId(), payment.getId());
} else if (PaymentPayTypeEnum.SourceType.POINT.equals(payment.getSourceType())) { }
else if (PaymentPayTypeEnum.SourceType.POINT.equals(payment.getSourceType())) {
goodPayService.payCallBack(payment.getSourceId(), payment.getId()); goodPayService.payCallBack(payment.getSourceId(), payment.getId());
} else if (PaymentPayTypeEnum.SourceType.WARE.equals(payment.getSourceType())) { }
else if (PaymentPayTypeEnum.SourceType.WARE.equals(payment.getSourceType())) {
gbOrderService.payCallBack(payment.getSourceId(), payment.getId()); gbOrderService.payCallBack(payment.getSourceId(), payment.getId());
} }
} }

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

@@ -97,7 +97,7 @@
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_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 LEFT JOIN tb_shop_info shop on `order`.shop_id = shop.id
WHERE WHERE
`order`.group_order_no = #{groupOrderNo} `order`.group_order_no = #{groupOrderNo}
order by detail.create_time desc order by detail.create_time desc