diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index 13802e1..b47c762 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -1391,4 +1391,21 @@ public class AppVerifyController extends BaseController } return toAjax(asDeviceService.refreshDeviceBySn(sn)); } + + /** + * 使用优惠券 + */ + @Log(title = "使用优惠券", businessType = BusinessType.USECOUPON) + @PostMapping("/useCoupon") + public AjaxResult useCoupon(String orderNo, Long logId) + { + logger.info("使用优惠券：【orderNo="+orderNo+"】,【logId="+logId+"】"); + if (StrUtil.isBlank(orderNo)){ + throw new ServiceException("未传orderNo"); + } + if (logId == null){ + throw new ServiceException("未传logId"); + } + return toAjax(etOrderService.useCoupon(orderNo,logId)); + } } diff --git a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 274e897..e4407de 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -201,4 +201,9 @@ public enum BusinessType * 解绑系统用户 */ UNBANDSYSUSER, + + /** + * 使用优惠券 + */ + USECOUPON, } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java index 5d88c55..f901ca8 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java @@ -70,6 +70,10 @@ public class EtOrder extends BaseEntity @Excel(name = "优惠券id") private Long couponId; + /** 用户优惠卡id */ + @Excel(name = "用户优惠卡id") + private Long logId; + /** 套餐对象 */ @TableField(exist = false) private EtFeeRule rule; @@ -304,4 +308,8 @@ public class EtOrder extends BaseEntity @Excel(name = "封顶金额") private BigDecimal cappedAmount; + /** 优惠券对象*/ + @Excel(name = "优惠券对象") + private EtCoupon coupon; + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java index c8b5427..cf58abc 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java @@ -263,4 +263,9 @@ public interface IEtOrderService * 首页统计-排行榜 */ List leaderboard(String type,String timeLimit); + + /** + * 使用优惠券 + */ + int useCoupon(String orderNo, Long logId); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index 823e836..a90359a 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -114,12 +114,6 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Resource private EtLocationLogMapper etLocationLogMapper; - @Resource - private EtCouponMapper etCouponMapper; - - @Resource - private EtCouponClaimLogMapper etCouponClaimLogMapper; - @Resource private AsUserMapper asUserMapper; @@ -1793,11 +1787,6 @@ public class AsDeviceServiceImpl extends ServiceImpl i } /** 3. 计算订单费用，保存订单总金额*/ order = calculateOrderFee(order,isInParkingArea); - /** 4. 优惠券计算价格 - * order中有couponId则有使用优惠券 */ - if(ObjectUtil.isNotNull(order.getCouponId())){ - order = calculateCoupon(order); - } /** 6.计算行车距离*/ String tripRouteStr = order.getTripRouteStr(); if(StrUtil.isNotBlank(tripRouteStr)){ @@ -1913,74 +1902,6 @@ public class AsDeviceServiceImpl extends ServiceImpl i //// } // } - /** - * 使用优惠券后的价格 - * 1. 先判断是否过期？并且是否是未使用的状态 - * 2. 再判断是哪种类型的优惠券， - * 如果是 - * 时间卡：骑行价格直接改成0 - * 贵宾卡：所有价格改成0 - * 折扣卡：总金额 * 折扣比例 次数减一 - * 抵用券：总金额 - 抵用金额 次数减一 - */ - private EtOrder calculateCoupon(EtOrder order) { - Long couponId = order.getCouponId(); - EtCoupon etCoupon = etCouponMapper.selectEtCouponByCouponId(couponId); - Long userId = order.getUserId(); - AsUser asUser = asUserMapper.selectUserById(userId); - - EtCouponUserLog etCouponUserLog = new EtCouponUserLog(); - etCouponUserLog.setUserId(userId); - etCouponUserLog.setCouponId(couponId); - etCouponUserLog.setStatus(ServiceConstants.COUPON_STATUS_UNUSED); - List etCouponUserLogs = etCouponClaimLogMapper.selectEtCouponClaimLogList(etCouponUserLog); - EtCouponUserLog etCouponUserLog1 = null; - if(etCouponUserLogs !=null && etCouponUserLogs.size()>0){ - etCouponUserLog1 = etCouponUserLogs.get(0); - } - - if(etCoupon.getType().equals(asUser.getVipType()) || asUser.getExpirationTime().compareTo(new Date()) < 0){ - throw new ServiceException("会员已过期"); - } - - if((etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER)) - && isCouponExpired(etCouponUserLog1)){ - throw new ServiceException("优惠券已过期"); - } - - if(etCouponUserLog1.getLimitNum() == 0){ - throw new ServiceException("可用次数不足"); - } - - if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_TIME_CARD)){ - order.setPayFee(order.getTotalFee().subtract(order.getRidingFee()));//会员 - order.setRidingFee(BigDecimal.ZERO); - }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VIP_CARD)){//贵宾卡 - order.setPayFee(BigDecimal.ZERO); - }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD)){//折扣卡 - order.setPayFee(order.getTotalFee().multiply(etCoupon.getDiscountPercent()).setScale(2, RoundingMode.HALF_UP)); - }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER)){//抵用券 - order.setPayFee(order.getTotalFee().subtract(etCoupon.getDiscountAmount())); - }else{ - throw new ServiceException("优惠券类型错误"); - } - - // 扣除一次使用次数 - if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER) && etCouponUserLog1.getLimitNum() > 0){ - etCouponClaimLogMapper.deductLimitNum(etCouponUserLog1.getLogId()); - } - return order; - } - - /** 判断优惠券是否过期 */ - private boolean isCouponExpired(EtCouponUserLog etCouponUserLog) { - if(etCouponUserLog!=null){ - return etCouponUserLog.getExpirationTime().compareTo(new Date()) < 0; - }else{ - return true; - } - } - /** * 计算订单费用 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 6c9700b..c7df9f9 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -121,6 +121,12 @@ public class EtOrderServiceImpl implements IEtOrderService @Autowired private ISysOperLogService operLogService; + @Resource + private EtCouponMapper etCouponMapper; + + @Resource + private EtCouponClaimLogMapper etCouponClaimLogMapper; + /** * 查询订单 * @@ -1803,6 +1809,10 @@ public class EtOrderServiceImpl implements IEtOrderService if(ObjectUtil.isNotNull(etFeeRule)){ order.setRule(etFeeRule); } + EtCoupon etCoupon = etCouponMapper.selectEtCouponByCouponId(order.getCouponId()); + if(ObjectUtil.isNotNull(etCoupon)){ + order.setCoupon(etCoupon); + } // 骑行结束并且订单金额等于0，并且未支付 if(ServiceConstants.ORDER_STATUS_RIDING_END.equals(order.getStatus()) && order.getTotalFee().compareTo(BigDecimal.ZERO) == 0 && order.getPaid().equals(ServiceConstants.ORDER_PAY_STATUS_NON_PAYMENT)){ order.setPaid(ServiceConstants.ORDER_PAY_STATUS_PAID); @@ -1977,4 +1987,96 @@ public class EtOrderServiceImpl implements IEtOrderService if(!execute)throw new ServiceException("换车开锁失败"); return Boolean.TRUE; } + + /** + * 使用优惠券 + * 1. 查询订单， + * 2. 计算使用优惠券后的金额， + * 3. 更新优惠券状态 + * 4. 更新订单状态 + */ + @Override + public int useCoupon(String orderNo, Long logId) { + EtOrder order = etOrderMapper.selectEtOrderByOrderNo(orderNo); + if(ObjectUtil.isNotNull(order)){ + order = calculateCoupon(order,logId); + }else{ + throw new ServiceException("订单不存在"); + } + order.setLogId(logId); + int updateEtOrder = etOrderMapper.updateEtOrder(order); + log.info("【使用优惠券】更新订单状态成功"); + return updateEtOrder; + } + + /** + * 使用优惠券后的价格 + * 1. 先判断是否过期？并且是否是未使用的状态 + * 2. 再判断是哪种类型的优惠券， + * 如果是 + * 时间卡：骑行价格直接改成0 + * 贵宾卡：所有价格改成0 + * 折扣卡：总金额 * 折扣比例 次数减一 + * 抵用券：总金额 - 抵用金额 次数减一 + */ + private EtOrder calculateCoupon(EtOrder order,Long logId) { + Long couponId = order.getCouponId(); + EtCoupon etCoupon = etCouponMapper.selectEtCouponByCouponId(couponId); + Long userId = order.getUserId(); + AsUser asUser = asUserMapper.selectUserById(userId); + + EtCouponUserLog etCouponUserLog1 = etCouponClaimLogMapper.selectEtCouponClaimLogByLogId(logId); + + if(etCoupon.getType().equals(asUser.getVipType()) || asUser.getExpirationTime().compareTo(new Date()) < 0){ + throw new ServiceException("会员已过期"); + } + + if((etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER)) + && isCouponExpired(etCouponUserLog1)){ + throw new ServiceException("优惠券已过期"); + } + + if(etCouponUserLog1.getLimitNum() == 0){ + throw new ServiceException("可用次数不足"); + } + + if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_TIME_CARD)){ + order.setPayFee(formatPayFee(order.getTotalFee().subtract(order.getRidingFee())));//会员 + order.setRidingFee(BigDecimal.ZERO); + }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VIP_CARD)){//贵宾卡 + order.setPayFee(BigDecimal.ZERO); + }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD)){//折扣卡 + order.setPayFee(formatPayFee(order.getTotalFee().multiply(etCoupon.getDiscountPercent()).setScale(2, RoundingMode.HALF_UP))); + }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER)){//抵用券 + order.setPayFee(formatPayFee(order.getTotalFee().subtract(etCoupon.getDiscountAmount()))); + }else{ + throw new ServiceException("优惠券类型错误"); + } + + // 扣除一次使用次数 + if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER) && etCouponUserLog1.getLimitNum() > 0){ + etCouponClaimLogMapper.deductLimitNum(etCouponUserLog1.getLogId()); + } + return order; + } + + /** + * 格式化金额方法：保留两位小数，如果金额为负数则返回0. + * + * @param amount 需要格式化的金额 + * @return 格式化后的金额 + */ + public static BigDecimal formatPayFee(BigDecimal amount) { + return amount.max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_UP); + } + + + /** 判断优惠券是否过期 */ + private boolean isCouponExpired(EtCouponUserLog etCouponUserLog) { + if(etCouponUserLog!=null){ + return etCouponUserLog.getExpirationTime().compareTo(new Date()) < 0; + }else{ + return true; + } + } } diff --git a/electripper-system/src/main/resources/mapper/system/EtCouponClaimLogMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCouponClaimLogMapper.xml index 51a553a..a667f9c 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCouponClaimLogMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCouponClaimLogMapper.xml @@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select log_id, area_id, user_id, coupon_id, create_time, gain_method, status, expiration_time from et_coupon_user_log + select log_id, area_id, user_id, coupon_id, create_time, gain_method, status, expiration_time,limit_num from et_coupon_user_log