czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张松
2025-02-27 17:48:51 +08:00
parent 7218bc928b acbd346690
commit d38276e6e2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,8 @@ public class UserShopCouponController {
public CzgResult<Page<ShopActivateCouponRecord>> findByUserId( public CzgResult<Page<ShopActivateCouponRecord>> findByUserId(
@RequestParam Long userId, @RequestParam Long userId,
@RequestParam(required = false) Integer status, @RequestParam(required = false) Integer status,
@RequestParam(required = false) Long orderId) { @RequestParam(required = false) Long shopId) {
return CzgResult.success(couponService.find(userId, orderId, status)); return CzgResult.success(couponService.find(userId, shopId, status));
} }
/** /**

2
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java
View File

@@ -35,7 +35,7 @@ public interface ShopCouponService extends IService<ShopCoupon> {
Page<CouponReceiveVo> queryReceive(QueryReceiveDto param); Page<CouponReceiveVo> queryReceive(QueryReceiveDto param);
Page<ShopActivateCouponRecord> find(Long userId, Long orderId, Integer status); Page<ShopActivateCouponRecord> find(Long userId,Long shopId, Integer status);
List<UserCouponVo> findCoupon(Long shopId, Long shopUserId); List<UserCouponVo> findCoupon(Long shopId, Long shopUserId);

7
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java
View File

@@ -85,8 +85,11 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
@Override @Override
public Page<ShopActivateCouponRecord> find(Long userId, Long orderId, Integer status) { public Page<ShopActivateCouponRecord> find(Long userId, Long shopId, Integer status) {
List<Long> shopUserIds = shopUserService.queryChain().eq(ShopUser::getUserId, userId).select(ShopUser::getId).listAs(Long.class); List<Long> shopUserIds = shopUserService.queryChain()
.eq(ShopUser::getUserId, userId)
.eq(ShopUser::getShopId, shopId)
.select(ShopUser::getId).listAs(Long.class);
if (CollectionUtil.isNotEmpty(shopUserIds)) { if (CollectionUtil.isNotEmpty(shopUserIds)) {
return couponRecordService.findByUser(PageUtil.buildPage(), shopUserIds, status); return couponRecordService.findByUser(PageUtil.buildPage(), shopUserIds, status);
} }