修改bug

无关风月

2025-01-14 a448d1716d59fbce1c2b4b82a95d339d5b37d8ae

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java

@@ -105,8 +105,8 @@
                            goodNames.add(datum.getName());
                        }
                    }
                    vo.setGoodNames(goodNames);
                }
                vo.setGoodNames(goodNames);
            }

            record.setCouponInfoVo(vo);
@@ -129,11 +129,26 @@

    @GetMapping("/mine/list1")
    @ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
    public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status, Integer id) {
    public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
                                     @ApiParam("1未使用2已使用3已过期") Integer status,
                                     String phone,
                                     Integer id) {

        Long appUserId = null;
        if (!StringUtils.isEmpty(phone)){
            AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
                    .like(AppUser::getPhone, phone));
            if (appUser1 != null){
                appUserId = appUser1.getId();
            }
        }

        Page<UserCoupon> page = userCouponService.lambdaQuery()
                .isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
                .isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
                .eq(UserCoupon::getCouponId, id)
                .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
                .lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
        for (UserCoupon record : page.getRecords()) {
            record.setIdStr(record.getId().toString());
@@ -359,5 +374,18 @@
        userCouponService.updateById(userCoupon);
        return R.ok();
    }


    /**
     * 编辑用户优惠券使用时间
     * @param userCoupon
     * @return
     */
    @PostMapping("/editReturnUse")
    public R editReturnUse(@RequestBody UserCoupon userCoupon){
        userCouponService.update(new LambdaUpdateWrapper<UserCoupon>().eq(UserCoupon::getId, userCoupon.getId())
                .set(UserCoupon::getUseTime, userCoupon.getUseTime()));
        return R.ok();
    }
}