Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-13 3eac3116ce54c2593f09a74feed370cf0800028e

 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);
@@ -374,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();
    }
}