Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-27 49c1552ab77c0aca7f1f726a89fdccb7ddd428b2

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

@@ -121,7 +121,8 @@
        Long userid = tokenService.getLoginUserApplet().getUserid();
        AppUser byId = appUserService.getById(userid);

        CouponInfo data = couponClient.detail(couponId).getData();
        R<CouponInfo> detail = couponClient.detail(couponId);
        CouponInfo data = detail.getData();
        //检验当前优惠券是否存在
        if (data==null){
            return  R.fail("当前优惠券不存在，请刷新后重试");