合并代码

Pu Zhibing

2024-09-24 a736a3d09dd52bb81fa922861fc8938c8eb26550

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -97,10 +97,16 @@
    @Resource
    private CouponCityService cityService;

    @Autowired
    @Resource
    private AppUserClient appUserClient;
    @Autowired

    @Resource
    private StudentClient studentClient;






    /**
     * 查询注册赠送优惠券 判断当前优惠券限领数量
@@ -122,8 +128,7 @@
            // 优惠券已领取数量
            int couponId = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
            // 用户已领取该优惠券数量
            int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()
            ).eq("userId", userId));
            int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()).eq("userId", userId));
            if (couponId >= quantityIssued) {
                continue;
            }
@@ -228,7 +233,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<CouponPackageResp>> queryAppuserCouponList(CouponPackageReq req) {
    public ResultUtil<List<CouponPackageResp>> queryCouponPackage(CouponPackageReq req) {
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if (null == uid) {