From a8e56f03a22c722ccf3f67a408919e6c8f256de3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 10 八月 2023 01:45:01 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 201 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 151 insertions(+), 50 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 ba04ab2..4205722 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
@@ -25,6 +25,7 @@
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.service.RemoteActivityService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteGoodsService;
@@ -34,11 +35,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringJoiner;
+import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -118,6 +117,15 @@
moneyThreshold = mgtCouponPageVo.getMoneyThreshold();
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);
//处理有效期
@@ -215,7 +223,7 @@
if(StringUtils.isNotBlank(relGoodsIds)){
//获取指定商品列表
List<MerGoodsPriceListVo> goodsList = remoteGoodsService.listGoodsPriceByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
+ if(goodsList!=null&&!goodsList.isEmpty()){
merCouponGetVo.setRelGoodsList(goodsList);
}
}
@@ -306,7 +314,7 @@
}
//判断是否指定用户
List<Long> relUserIdList = null;
- if(coupon.getSendTarget()==2&&coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){
relUserIdList = mgtCouponEditDto.getRelUserIdList();
List<CouponRelUser> couponRelUserList = new ArrayList<>();
CouponRelUser couponRelUser;
@@ -323,7 +331,7 @@
coupon.setRelUserIds(userIdSj.toString());
}
//处理优惠券发放
- if(coupon.getSendTimeType()==1){
+ if(coupon.getSendType()==2&&coupon.getSendTimeType()==1){
sendCoupon(coupon,relUserIdList);
coupon.setSendFlag(1);
this.saveOrUpdate(coupon);
@@ -376,47 +384,93 @@
String memberCouponId;
Integer sendUserTotal;
for(Long userId : userIdList){
- memberCouponId = IdUtils.simpleUUID();
- memberCoupon = new MemberCoupon();
- memberCoupon.setId(memberCouponId);
- memberCoupon.setDelFlag(0);
- memberCoupon.setCouponId(coupon.getCouponId());
- memberCoupon.setUserId(userId);
- memberCoupon.setShopId(coupon.getShopId());
- memberCoupon.setCouponType(coupon.getCouponType());
- memberCoupon.setCouponStatus(coupon.getCouponStatus());
- memberCoupon.setCouponName(coupon.getCouponName());
- memberCoupon.setSendType(coupon.getSendType());
- memberCoupon.setSendTarget(coupon.getSendTarget());
- memberCoupon.setSendTimeType(coupon.getSendTimeType());
- memberCoupon.setSendTime(coupon.getSendTime());
- memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold());
- memberCoupon.setDiscountMoney(coupon.getDiscountMoney());
- memberCoupon.setDiscountPercent(coupon.getDiscountPercent());
- memberCoupon.setUseScope(coupon.getUseScope());
- memberCoupon.setValidTimeType(coupon.getValidTimeType());
- memberCoupon.setValidStartTime(coupon.getValidStartTime());
- memberCoupon.setValidEndTime(coupon.getValidEndTime());
- memberCoupon.setValidDay(coupon.getValidDay());
- memberCoupon.setCouponFrom(coupon.getCouponFrom());
- memberCoupon.setReceiveTime(nowTime);
- memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
- //有效期处理1.时间段2.领取之日起
- if(coupon.getValidTimeType()==1){
- memberCoupon.setDeadlineTime(coupon.getValidEndTime());
- }else if(coupon.getValidTimeType()==2){
- memberCoupon.setDeadlineTime(DateUtils.addDays(nowTime,coupon.getValidDay()));
+ if(coupon.getCouponFrom()==2){
+ for(int i=0;i<coupon.getLimitNumber();i++){
+ memberCouponId = IdUtils.simpleUUID();
+ memberCoupon = new MemberCoupon();
+ memberCoupon.setId(memberCouponId);
+ memberCoupon.setDelFlag(0);
+ memberCoupon.setCouponId(coupon.getCouponId());
+ memberCoupon.setUserId(userId);
+ memberCoupon.setShopId(coupon.getShopId());
+ memberCoupon.setCouponType(coupon.getCouponType());
+ memberCoupon.setCouponStatus(coupon.getCouponStatus());
+ memberCoupon.setCouponName(coupon.getCouponName());
+ memberCoupon.setSendType(coupon.getSendType());
+ memberCoupon.setSendTarget(coupon.getSendTarget());
+ memberCoupon.setSendTimeType(coupon.getSendTimeType());
+ memberCoupon.setSendTime(coupon.getSendTime());
+ memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold());
+ memberCoupon.setDiscountMoney(coupon.getDiscountMoney());
+ memberCoupon.setDiscountPercent(coupon.getDiscountPercent());
+ memberCoupon.setUseScope(coupon.getUseScope());
+ memberCoupon.setValidTimeType(coupon.getValidTimeType());
+ memberCoupon.setValidStartTime(coupon.getValidStartTime());
+ memberCoupon.setValidEndTime(coupon.getValidEndTime());
+ memberCoupon.setValidDay(coupon.getValidDay());
+ memberCoupon.setCouponFrom(coupon.getCouponFrom());
+ memberCoupon.setReceiveTime(nowTime);
+ memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
+ //有效期处理1.时间段2.领取之日起
+ if(coupon.getValidTimeType()==1){
+ memberCoupon.setDeadlineTime(coupon.getValidEndTime());
+ }else if(coupon.getValidTimeType()==2){
+ memberCoupon.setDeadlineTime(DateUtils.addDays(nowTime,coupon.getValidDay()));
+ }
+ memberCouponList.add(memberCoupon);
+ sendTotal = sendTotal + 1;
+ if(coupon.getSendType()==1){
+ sendUserTotal = memberCouponService.totalMemberCouponByUserAndCoupon(userId,coupon.getCouponId());
+ if(sendUserTotal!=null&&sendUserTotal>0){
+ }else{
+ sendPerson = sendPerson + 1;
+ }
+ }
+ memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
+ }
+ }else{
+ memberCouponId = IdUtils.simpleUUID();
+ memberCoupon = new MemberCoupon();
+ memberCoupon.setId(memberCouponId);
+ memberCoupon.setDelFlag(0);
+ memberCoupon.setCouponId(coupon.getCouponId());
+ memberCoupon.setUserId(userId);
+ memberCoupon.setShopId(coupon.getShopId());
+ memberCoupon.setCouponType(coupon.getCouponType());
+ memberCoupon.setCouponStatus(coupon.getCouponStatus());
+ memberCoupon.setCouponName(coupon.getCouponName());
+ memberCoupon.setSendType(coupon.getSendType());
+ memberCoupon.setSendTarget(coupon.getSendTarget());
+ memberCoupon.setSendTimeType(coupon.getSendTimeType());
+ memberCoupon.setSendTime(coupon.getSendTime());
+ memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold());
+ memberCoupon.setDiscountMoney(coupon.getDiscountMoney());
+ memberCoupon.setDiscountPercent(coupon.getDiscountPercent());
+ memberCoupon.setUseScope(coupon.getUseScope());
+ memberCoupon.setValidTimeType(coupon.getValidTimeType());
+ memberCoupon.setValidStartTime(coupon.getValidStartTime());
+ memberCoupon.setValidEndTime(coupon.getValidEndTime());
+ memberCoupon.setValidDay(coupon.getValidDay());
+ memberCoupon.setCouponFrom(coupon.getCouponFrom());
+ memberCoupon.setReceiveTime(nowTime);
+ memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
+ //有效期处理1.时间段2.领取之日起
+ if(coupon.getValidTimeType()==1){
+ memberCoupon.setDeadlineTime(coupon.getValidEndTime());
+ }else if(coupon.getValidTimeType()==2){
+ memberCoupon.setDeadlineTime(DateUtils.addDays(nowTime,coupon.getValidDay()));
+ }
+ memberCouponList.add(memberCoupon);
+ sendTotal = sendTotal + 1;
+ if(coupon.getSendType()==1){
+ sendUserTotal = memberCouponService.totalMemberCouponByUserAndCoupon(userId,coupon.getCouponId());
+ if(sendUserTotal!=null&&sendUserTotal>0){
+ }else{
+ sendPerson = sendPerson + 1;
+ }
+ }
+ memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
}
- memberCouponList.add(memberCoupon);
- sendTotal = sendTotal + 1;
- if(coupon.getSendType()==1){
- sendUserTotal = memberCouponService.totalMemberCouponByUserAndCoupon(userId,coupon.getCouponId());
- if(sendUserTotal!=null&&sendUserTotal>0){
- }else{
- sendPerson = sendPerson + 1;
- }
- }
- memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
}
memberCouponService.saveBatch(memberCouponList);
//处理优惠券统计
@@ -633,6 +687,7 @@
Date validEndTime;
Integer validDay;
String validTime = "";
+ HashSet<Long> shopIdSet = new HashSet<>();
for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
//处理有效期
validTimeType = mgtCouponAuditPageVo.getValidTimeType();
@@ -645,6 +700,20 @@
validTime = "领取之日起" + validDay.toString() + "天";
}
mgtCouponAuditPageVo.setValidTime(validTime);
+ if(mgtCouponAuditPageVo.getShopId()!=null){
+ shopIdSet.add(mgtCouponAuditPageVo.getShopId());
+ }
+ }
+ String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
+ MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
+ mgtBaseBathDto.setIds(shopJoinedString);
+ List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
+ Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
+ .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
+ for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
+ if(mgtCouponAuditPageVo.getShopId()!=null){
+ mgtCouponAuditPageVo.setShopName(shopMap.get(mgtCouponAuditPageVo.getShopId()).getShopName());
+ }
}
}
return mgtCouponAuditPageVoList;
@@ -721,7 +790,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());
@@ -729,7 +798,7 @@
coupon.setUpdateTime(new Date());
coupon.setUpdateUserId(mgtCouponAuditDto.getUserId());
//审核通过后判断是否立即发放
- if(coupon.getCouponStatus()==2&&coupon.getSendTimeType()==1){
+ if(coupon.getAuditStatus()==2&&coupon.getSendType()==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()){
@@ -797,6 +866,7 @@
validTime = "领取之日起" + validDay.toString() + "天";
}
merCouponPageVo.setValidTime(validTime);
+ merCouponPageVo.setCouponCode("https://hongruitang.oss-cn-beijing.aliyuncs.com/2023/8/3/couponCode.jpg");
}
}
return couponPageVoList;
@@ -906,7 +976,8 @@
coupon.setCouponName(merCouponEditDto.getCouponName());
coupon.setSendType(merCouponEditDto.getSendType());
coupon.setSendTarget(merCouponEditDto.getSendTarget());
- coupon.setSendTimeType(merCouponEditDto.getSendTimeType());
+ //商户端默认立即发放
+ coupon.setSendTimeType(1);
coupon.setSendTime(merCouponEditDto.getSendTime());
coupon.setMoneyThreshold(merCouponEditDto.getMoneyThreshold());
coupon.setDiscountMoney(merCouponEditDto.getDiscountMoney());
@@ -915,10 +986,12 @@
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());
coupon.setRelationType(1);
+ coupon.setPropagandaPoster(merCouponEditDto.getPropagandaPoster());
//判断是否指定商品
if(coupon.getUseScope()==2&&!merCouponEditDto.getRelGoodsIdList().isEmpty()){
List<String> relGoodsIdList = merCouponEditDto.getRelGoodsIdList();
@@ -1136,4 +1209,32 @@
memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
}
+ /**
+ * @description 获取商户优惠券审核统计
+ * @author jqs
+ * @date 2023/7/28 11:30
+ * @param shopId
+ * @return MetAuditCouponTotalVo
+ */
+ @Override
+ public MetAuditCouponTotalVo getMetAuditCouponTotal(Long shopId){
+ MetAuditCouponTotalVo metAuditCouponTotalVo = new MetAuditCouponTotalVo();
+ LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Coupon::getDelFlag,0);
+ queryWrapper.eq(Coupon::getCouponFrom,2);
+ queryWrapper.eq(Coupon::getShopId,shopId);
+ queryWrapper.eq(Coupon::getCouponStatus,1);
+ queryWrapper.eq(Coupon::getAuditStatus,1);
+ Integer unAuditTotal = this.count(queryWrapper);
+ queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Coupon::getDelFlag,0);
+ queryWrapper.eq(Coupon::getCouponFrom,2);
+ queryWrapper.eq(Coupon::getShopId,shopId);
+ queryWrapper.eq(Coupon::getCouponStatus,1);
+ queryWrapper.eq(Coupon::getAuditStatus,3);
+ Integer refuseTotal = this.count(queryWrapper);
+ metAuditCouponTotalVo.setUnAuditTotal(unAuditTotal);
+ metAuditCouponTotalVo.setRefuseTotal(refuseTotal);
+ return metAuditCouponTotalVo;
+ }
}
--
Gitblit v1.7.1