Merge remote-tracking branch 'origin/master'

xuhy

2025-01-17 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8

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

@@ -243,6 +243,7 @@
            byId.setLavePoint(byId.getLavePoint() - point);
            appUserService.updateById(byId);
            
            if(point > 0){
            UserPoint userPoint = new UserPoint();
            userPoint.setType(15);
            userPoint.setHistoricalPoint(lavePoint);
@@ -253,6 +254,7 @@
            userPoint.setCreateTime(LocalDateTime.now());
            userPointService.save(userPoint);
        }
        }
        //增加优惠券记录,根据时间类型设置开始结束时间
        UserCoupon userCoupon = new UserCoupon();
        userCoupon.setAppUserId(userid);