From 533d26dae76cb5e54e84d6105f7aee42dcb9f76b Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:15:25 +0800
Subject: [PATCH] 接入微信支付
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index b0da398..e45d371 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -118,6 +118,15 @@
discountMoney = mgtCouponPageVo.getDiscountMoney();
useLimit = "满" + moneyThreshold.toString() + "减" + discountMoney.toString() + "元";
}
+ if(couponType.equals("折扣")){
+ moneyThreshold = mgtCouponPageVo.getMoneyThreshold();
+ discountPercent = mgtCouponPageVo.getDiscountPercent();
+ useLimit = discountPercent.toString() + "折";
+ }
+ if(couponType.equals("抵扣")){
+ discountMoney = mgtCouponPageVo.getDiscountMoney();
+ useLimit = discountMoney.toString();
+ }
mgtCouponPageVo.setUseLimit(useLimit);
//处理有效期
validTimeType = mgtCouponPageVo.getValidTimeType();
@@ -735,7 +744,7 @@
public void auditMgtCoupon(MgtCouponAuditDto mgtCouponAuditDto){
Coupon coupon = this.getById(mgtCouponAuditDto.getCouponId());
//判断优惠券是否审核
- if(coupon.getCouponStatus()!=1){
+ if(coupon.getAuditStatus()!=1){
throw new ServiceException(AppErrorConstant.COUPON_AUDIT_DOUBLE);
}
coupon.setAuditStatus(mgtCouponAuditDto.getAuditStatus());
@@ -743,7 +752,7 @@
coupon.setUpdateTime(new Date());
coupon.setUpdateUserId(mgtCouponAuditDto.getUserId());
//审核通过后判断是否立即发放
- if(coupon.getCouponStatus()==2&&coupon.getSendTimeType()==1){
+ if(coupon.getAuditStatus()==2&&coupon.getSendTimeType()==1){
List<CouponRelUser> couponRelUserList = couponRelUserService.list(new LambdaQueryWrapper<CouponRelUser>().eq(CouponRelUser::getDelFlag,0).eq(CouponRelUser::getCouponId,coupon.getCouponId()));
List<Long> userIdList = new ArrayList<>();
if(couponRelUserList!=null&&!couponRelUserList.isEmpty()){
@@ -930,6 +939,7 @@
coupon.setValidTimeType(merCouponEditDto.getValidTimeType());
coupon.setValidStartTime(merCouponEditDto.getValidStartTime());
coupon.setValidEndTime(merCouponEditDto.getValidEndTime());
+ coupon.setLimitNumber(merCouponEditDto.getLimitNumber());
coupon.setValidDay(merCouponEditDto.getValidDay());
coupon.setUpdateTime(new Date());
coupon.setUpdateUserId(merCouponEditDto.getUserId());
--
Gitblit v1.7.1