From 2e9c442b4961dc30423e8b8fa1361c45e63ef620 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 16 八月 2023 19:52:00 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 450 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 364 insertions(+), 86 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 61a5e66..9d959a4 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
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.pojo.coupon.*;
import com.ruoyi.member.domain.vo.*;
@@ -16,20 +17,27 @@
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.constant.DelayTaskEnum;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.config.DelayTask;
import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.member.Member;
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;
+import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -70,6 +78,15 @@
@Resource
private MemberCouponRecordService memberCouponRecordService;
+ @Resource
+ private RemoteShopService remoteShopService;
+
+ @Resource
+ private RedisService redisService;
+
+ @Resource
+ private RemoteConfigService remoteConfigService;
+
/**
* @description 平台获取优惠券列表
* @author jqs
@@ -94,6 +111,7 @@
BigDecimal discountPercent;
String useLimit = "";
for(MgtCouponPageVo mgtCouponPageVo : mgtCouponPageVoList){
+ useLimit = null;
//处理使用限制
couponType = mgtCouponPageVo.getCouponType();
if(couponType.equals("满减")){
@@ -101,13 +119,22 @@
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();
if(validTimeType==1){
validStartTime = mgtCouponPageVo.getValidStartTime();
validEndTime = mgtCouponPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy-MM-dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy-MM-dd",validEndTime);
}else if(validTimeType==2){
validDay = mgtCouponPageVo.getValidDay();
validTime = "领取之日起" + validDay.toString() + "天";
@@ -171,7 +198,7 @@
}
}
//判断优惠券是否指定发放用户
- if(coupon.getSendType()==5&&coupon.getRelationType()==1){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){
//获取优惠券发放用户
List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId());
mgtCouponGetVo.setRelUserList(relUserList);
@@ -183,31 +210,30 @@
* @description 平台获取优惠券编辑信息
* @author jqs
* @date 2023/6/13 14:29
- * @param couponId
+ * @param merBaseGetDto
* @return MgtCouponGetVo
*/
@Override
- public MerCouponGetVo getMerCouponVo(String couponId){
+ public MerCouponGetVo getMerCouponVo(MerBaseGetDto merBaseGetDto){
MerCouponGetVo merCouponGetVo = new MerCouponGetVo();
- Coupon coupon = this.getById(couponId);
+ Coupon coupon = this.getById(merBaseGetDto.getId());
BeanUtils.copyProperties(coupon, merCouponGetVo);
- if(merCouponGetVo.getSendType()>1){
- merCouponGetVo.setSendType(2);
- merCouponGetVo.setSendTarget(merCouponGetVo.getSendType());
- }
//判断优惠券是否为指定商品
if(coupon.getUseScope()==2){
String relGoodsIds = coupon.getRelGoodsIds();
if(StringUtils.isNotBlank(relGoodsIds)){
//获取指定商品列表
- List<MerGoodsPriceListVo> goodsList = remoteGoodsService.listGoodsPriceByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
+ MerGoodsPriceListDto merGoodsPriceListDto = new MerGoodsPriceListDto();
+ merGoodsPriceListDto.setGoodsIds(relGoodsIds);
+ merGoodsPriceListDto.setShopId(merBaseGetDto.getShopId());
+ List<MerGoodsPriceListVo> goodsList = remoteGoodsService.listGoodsPriceByGoodsId(merGoodsPriceListDto).getData();
+ if(goodsList!=null&&!goodsList.isEmpty()){
merCouponGetVo.setRelGoodsList(goodsList);
}
}
}
//判断优惠券是否指定发放用户
- if(coupon.getSendType()==5&&coupon.getRelationType()==1){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){
//获取优惠券发放用户
List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId());
merCouponGetVo.setRelUserList(relUserList);
@@ -245,6 +271,8 @@
coupon.setCreateUserId(mgtCouponEditDto.getUserId());
coupon.setCouponFrom(1);
coupon.setAuditStatus(2);
+ coupon.setLimitNumber(0);
+ coupon.setSendFlag(0);
//创建优惠券统计
couponTotal = new CouponTotal();
couponTotal.setCouponId(couponId);
@@ -256,6 +284,7 @@
coupon.setCouponType(mgtCouponEditDto.getCouponType());
coupon.setCouponName(mgtCouponEditDto.getCouponName());
coupon.setSendType(mgtCouponEditDto.getSendType());
+ coupon.setSendTarget(mgtCouponEditDto.getSendTarget());
coupon.setSendTimeType(mgtCouponEditDto.getSendTimeType());
coupon.setSendTime(mgtCouponEditDto.getSendTime());
coupon.setMoneyThreshold(mgtCouponEditDto.getMoneyThreshold());
@@ -271,6 +300,7 @@
coupon.setRelationType(mgtCouponEditDto.getRelationType());
coupon.setRelationActivityType(mgtCouponEditDto.getRelationActivityType());
coupon.setRelationActivityId(mgtCouponEditDto.getRelationActivityId());
+ coupon.setPropagandaPoster(mgtCouponEditDto.getPropagandaPoster());
//判断是否指定商品
if(coupon.getUseScope()==2&&!mgtCouponEditDto.getRelGoodsIdList().isEmpty()){
List<String> relGoodsIdList = mgtCouponEditDto.getRelGoodsIdList();
@@ -289,23 +319,29 @@
}
//判断是否指定用户
List<Long> relUserIdList = null;
- if(coupon.getSendType()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){
relUserIdList = mgtCouponEditDto.getRelUserIdList();
- List<CouponRelUser> couponRelUserList = relUserIdList.stream()
- .map(str -> {
- CouponRelUser couponRelUser = new CouponRelUser();
- couponRelUser.setDelFlag(0);
- couponRelUser.setCouponId(coupon.getCouponId());
- couponRelUser.setUserId(str);
- return couponRelUser;
- })
- .collect(Collectors.toList());
+ List<CouponRelUser> couponRelUserList = new ArrayList<>();
+ CouponRelUser couponRelUser;
+ StringJoiner userIdSj = new StringJoiner(",");
+ for(Long userId : relUserIdList){
+ couponRelUser = new CouponRelUser();
+ couponRelUser.setDelFlag(0);
+ couponRelUser.setCouponId(coupon.getCouponId());
+ couponRelUser.setUserId(userId);
+ couponRelUserList.add(couponRelUser);
+ userIdSj.add(userId.toString());
+ }
couponRelUserService.saveBatch(couponRelUserList);
+ coupon.setRelUserIds(userIdSj.toString());
}
- this.saveOrUpdate(coupon);
//处理优惠券发放
- if(coupon.getSendTimeType()==1){
+ if(coupon.getSendType()==2&&coupon.getSendTimeType()==1){
sendCoupon(coupon,relUserIdList);
+ coupon.setSendFlag(1);
+ this.saveOrUpdate(coupon);
+ }else{
+ this.saveOrUpdate(coupon);
}
}
@@ -321,15 +357,147 @@
protected void sendCoupon(Coupon coupon, List<Long> relUserIdList){
//1.手动领取2.全部用户3.会员用户4非会员用户5自定义
Date nowTime = new Date();
- Integer sendType = coupon.getSendType();
+ Integer sendTarget = coupon.getSendTarget();
List<Long> userIdList = new ArrayList<>();
Long shopId = null;
- if(coupon.getCouponFrom()==2 && sendType==3){
+ if(coupon.getCouponFrom()==2 && sendTarget==3){
shopId = coupon.getShopId();
}
- if(sendType >= 2 && sendType <= 4){
- userIdList = memberService.listIdBySendType(sendType,shopId);
- }else if(sendType == 5){
+ if(sendTarget >= 2 && sendTarget <= 4){
+ userIdList = memberService.listIdBySendType(sendTarget,shopId);
+ }else if(sendTarget == 5){
+ //关联类型1.用户管理筛选2.活动管理筛选
+ if(coupon.getRelationType()==2){
+ Integer relationActivityType = coupon.getRelationActivityType();
+ //关联活动类型1秒杀活动
+ switch(relationActivityType){
+ case 1:
+ userIdList = remoteActivityService.listUserIdByActivityId(coupon.getRelationActivityId()).getData();
+ break;
+ default:
+ break;
+ }
+ }else if(coupon.getRelationType()==1){
+ userIdList = relUserIdList;
+ }
+ }
+ if(userIdList!=null&&!userIdList.isEmpty()){
+ List<MemberCoupon> memberCouponList = new ArrayList<>();
+ MemberCoupon memberCoupon;
+ Integer sendTotal = 0;
+ Integer sendPerson = 0;
+ String memberCouponId;
+ Integer sendUserTotal;
+ for(Long userId : userIdList){
+ 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);
+ }
+ }
+ memberCouponService.saveBatch(memberCouponList);
+ //处理优惠券统计
+ if(sendTotal>0){
+ couponMapper.updateCouponTotal(coupon.getCouponId(),sendTotal,sendPerson);
+ }
+ }
+ }
+
+
+ private void sendCouponNow(Coupon coupon, List<Long> relUserIdList){
+ //1.手动领取2.全部用户3.会员用户4非会员用户5自定义
+ Date nowTime = new Date();
+ Integer sendTarget = coupon.getSendTarget();
+ List<Long> userIdList = new ArrayList<>();
+ Long shopId = null;
+ if(coupon.getCouponFrom()==2 && sendTarget==3){
+ shopId = coupon.getShopId();
+ }
+ if(sendTarget >= 2 && sendTarget <= 4){
+ userIdList = memberService.listIdBySendType(sendTarget,shopId);
+ }else if(sendTarget == 5){
//关联类型1.用户管理筛选2.活动管理筛选
if(coupon.getRelationType()==2){
Integer relationActivityType = coupon.getRelationActivityType();
@@ -359,11 +527,14 @@
memberCoupon.setDelFlag(0);
memberCoupon.setCouponId(coupon.getCouponId());
memberCoupon.setUserId(userId);
- memberCoupon.setShopId(coupon.getShopId());
+ if(coupon.getCouponFrom()==2){
+ 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());
@@ -374,6 +545,7 @@
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.领取之日起
@@ -385,11 +557,11 @@
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;
- }
+ sendUserTotal = memberCouponService.totalMemberCouponByUserAndCoupon(userId,coupon.getCouponId());
+ if(sendUserTotal!=null&&sendUserTotal>0){
+ }else{
+ sendPerson = sendPerson + 1;
+ }
}
memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
}
@@ -431,31 +603,61 @@
*/
@Override
public void timingSendCoupon(){
+ //获取1小时内需要发送的优惠券
LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Coupon::getDelFlag,0);
queryWrapper.eq(Coupon::getCouponStatus,1);
queryWrapper.eq(Coupon::getSendTimeType,2);
queryWrapper.eq(Coupon::getAuditStatus,2);
- queryWrapper.eq(Coupon::getSendTime,DateUtils.getNowDate());
+ queryWrapper.eq(Coupon::getSendFlag,0);
+ Date checkTime = DateUtils.addMinutes(new Date(),61);
+ queryWrapper.le(Coupon::getSendTime, checkTime);
List<Coupon> couponList = couponMapper.selectList(queryWrapper);
if(couponList!=null&&!couponList.isEmpty()){
- List<CouponRelUser> couponRelUserList;
- List<Long> userIdList = new ArrayList<>();
- for(Coupon coupon : couponList){
- if(coupon.getSendType()==5&&coupon.getRelationType()==1){
- couponRelUserList = couponRelUserService.list(new LambdaQueryWrapper<CouponRelUser>().eq(CouponRelUser::getDelFlag,0).eq(CouponRelUser::getCouponId,coupon.getCouponId()));
- if(couponRelUserList!=null&&!couponRelUserList.isEmpty()){
- userIdList = couponRelUserList.stream()
- .map(CouponRelUser::getUserId)
- .collect(Collectors.toList());
- }else{
- userIdList = new ArrayList<>();
- }
+ for(Coupon coupon : couponList) {
+ String couponId = coupon.getCouponId();
+ Date sendTime = coupon.getSendTime();
+ long currentTimeMillis = System.currentTimeMillis();
+ long timeDifference = currentTimeMillis - sendTime.getTime();
+ DelayTask delayTask = remoteConfigService.getDelayTask(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode()+"-"+couponId).getData();
+ if(delayTask==null){
+ //创建延时任务控制优惠券定时发放
+ redisService.setCacheObject(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode()+"-"+couponId,sendTime,timeDifference, TimeUnit.MILLISECONDS);
+ delayTask = new DelayTask();
+ delayTask.setDelFlag(0);
+ delayTask.setCreateTime(new Date());
+ delayTask.setEndTime(sendTime);
+ delayTask.setRedisKey(DelayTaskEnum.COUPON_SEND_DELAY_TASK.getCode()+"-"+couponId);
+ remoteConfigService.addDelayTask(delayTask);
}
- //发送优惠券
- sendCoupon(coupon, userIdList);
}
}
+ }
+
+ /**
+ * @description 定时发送优惠券
+ * @author jqs
+ * @date 2023/7/12 12:01
+ * @param couponId
+ * @return void
+ */
+ @Override
+ public void autoTimeSendCoupon(String couponId){
+ List<CouponRelUser> couponRelUserList;
+ List<Long> userIdList = new ArrayList<>();
+ Coupon coupon = this.getById(couponId);
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){
+ couponRelUserList = couponRelUserService.list(new LambdaQueryWrapper<CouponRelUser>().eq(CouponRelUser::getDelFlag,0).eq(CouponRelUser::getCouponId,coupon.getCouponId()));
+ if(couponRelUserList!=null&&!couponRelUserList.isEmpty()){
+ userIdList = couponRelUserList.stream()
+ .map(CouponRelUser::getUserId)
+ .collect(Collectors.toList());
+ }else{
+ userIdList = new ArrayList<>();
+ }
+ }
+ //发送优惠券
+ sendCouponNow(coupon, userIdList);
}
/**
@@ -492,18 +694,33 @@
Date validEndTime;
Integer validDay;
String validTime = "";
+ HashSet<Long> shopIdSet = new HashSet<>();
for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
//处理有效期
validTimeType = mgtCouponAuditPageVo.getValidTimeType();
if(validTimeType==1){
validStartTime = mgtCouponAuditPageVo.getValidStartTime();
validEndTime = mgtCouponAuditPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy-MM-dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy-MM-dd",validEndTime);
}else if(validTimeType==2){
validDay = mgtCouponAuditPageVo.getValidDay();
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;
@@ -561,7 +778,7 @@
}
}
//判断优惠券是否指定发放用户
- if(coupon.getSendType()==5&&coupon.getRelationType()==1){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){
//获取优惠券发放用户
List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId());
mgtCouponAuditGetVo.setRelUserList(relUserList);
@@ -580,16 +797,15 @@
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());
coupon.setAuditReason(mgtCouponAuditDto.getAuditReason());
coupon.setUpdateTime(new Date());
coupon.setUpdateUserId(mgtCouponAuditDto.getUserId());
- this.saveOrUpdate(coupon);
//审核通过后判断是否立即发放
- 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()){
@@ -599,7 +815,9 @@
}
//发放优惠券
sendCoupon(coupon, userIdList);
+ coupon.setSendFlag(1);
}
+ this.saveOrUpdate(coupon);
}
/**
@@ -649,12 +867,13 @@
if(validTimeType==1){
validStartTime = merCouponPageVo.getValidStartTime();
validEndTime = merCouponPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy.MM.dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy.MM.dd",validEndTime);
}else if(validTimeType==2){
validDay = merCouponPageVo.getValidDay();
validTime = "领取之日起" + validDay.toString() + "天";
}
merCouponPageVo.setValidTime(validTime);
+ merCouponPageVo.setCouponCode("https://hongruitang.oss-cn-beijing.aliyuncs.com/2023/8/3/couponCode.jpg");
}
}
return couponPageVoList;
@@ -707,7 +926,7 @@
if(validTimeType==1){
validStartTime = merCouponPageVo.getValidStartTime();
validEndTime = merCouponPageVo.getValidEndTime();
- validTime = DateUtils.dateTime(validStartTime) + '-' + DateUtils.dateTime(validEndTime);
+ validTime = DateUtils.parseDateToStr("yyyy.MM.dd",validStartTime) + '-' + DateUtils.parseDateToStr("yyyy.MM.dd",validEndTime);
}else if(validTimeType==2){
validDay = merCouponPageVo.getValidDay();
validTime = "领取之日起" + validDay.toString() + "天";
@@ -749,6 +968,8 @@
coupon.setCreateTime(new Date());
coupon.setCreateUserId(merCouponEditDto.getUserId());
coupon.setCouponFrom(2);
+ coupon.setSendFlag(0);
+ coupon.setLimitNumber(merCouponEditDto.getLimitNumber());
//创建优惠券统计
couponTotal = new CouponTotal();
couponTotal.setCouponId(couponId);
@@ -761,10 +982,9 @@
coupon.setCouponType(merCouponEditDto.getCouponType());
coupon.setCouponName(merCouponEditDto.getCouponName());
coupon.setSendType(merCouponEditDto.getSendType());
- if(merCouponEditDto.getSendType()!=1){
- coupon.setSendType(merCouponEditDto.getSendTarget());
- }
- coupon.setSendTimeType(merCouponEditDto.getSendTimeType());
+ coupon.setSendTarget(merCouponEditDto.getSendTarget());
+ //商户端默认立即发放
+ coupon.setSendTimeType(1);
coupon.setSendTime(merCouponEditDto.getSendTime());
coupon.setMoneyThreshold(merCouponEditDto.getMoneyThreshold());
coupon.setDiscountMoney(merCouponEditDto.getDiscountMoney());
@@ -773,10 +993,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();
@@ -795,18 +1017,21 @@
}
//判断是否指定用户
List<Long> relUserIdList = null;
- if(coupon.getSendType()==5&&coupon.getRelationType()==1&&!merCouponEditDto.getRelUserIdList().isEmpty()){
+ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!merCouponEditDto.getRelUserIdList().isEmpty()){
relUserIdList = merCouponEditDto.getRelUserIdList();
- List<CouponRelUser> couponRelUserList = relUserIdList.stream()
- .map(str -> {
- CouponRelUser couponRelUser = new CouponRelUser();
- couponRelUser.setDelFlag(0);
- couponRelUser.setCouponId(coupon.getCouponId());
- couponRelUser.setUserId(str);
- return couponRelUser;
- })
- .collect(Collectors.toList());
+ List<CouponRelUser> couponRelUserList = new ArrayList<>();
+ CouponRelUser couponRelUser;
+ StringJoiner userIdSj = new StringJoiner(",");
+ for(Long userId : relUserIdList){
+ couponRelUser = new CouponRelUser();
+ couponRelUser.setDelFlag(0);
+ couponRelUser.setCouponId(coupon.getCouponId());
+ couponRelUser.setUserId(userId);
+ couponRelUserList.add(couponRelUser);
+ userIdSj.add(userId.toString());
+ }
couponRelUserService.saveBatch(couponRelUserList);
+ coupon.setRelUserIds(userIdSj.toString());
}
this.saveOrUpdate(coupon);
}
@@ -847,6 +1072,9 @@
for(BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList){
couponId = birthdayGiftSendDto.getCouponId();
coupon = this.getById(couponId);
+ if(coupon==null||coupon.getCouponStatus()!=1){
+ throw new ServiceException(AppErrorConstant.COUPON_GET_ERROR);
+ }
for(int i=0;i<birthdayGiftSendDto.getCouponNumber();i++){
memberCoupon = new MemberCoupon();
memberCouponId = IdUtils.simpleUUID();
@@ -859,6 +1087,7 @@
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());
@@ -869,6 +1098,7 @@
memberCoupon.setValidStartTime(coupon.getValidStartTime());
memberCoupon.setValidEndTime(coupon.getValidEndTime());
memberCoupon.setValidDay(coupon.getValidDay());
+ memberCoupon.setCouponFrom(coupon.getCouponFrom());
memberCoupon.setReceiveTime(new Date());
//有效期处理1.时间段2.领取之日起
if(coupon.getValidTimeType()==1){
@@ -893,27 +1123,42 @@
* @return List<AppUnGetCouponPageVo>
*/
@Override
- public List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Long shopId){
+ public List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Member member){
//获取当前已领取完优惠券
List<String> unGetList = couponMapper.listUserUnGetCoupon(appPageDto.getUserId());
- List<AppGetAbleCouponPageVo> getAbleCouponPageVoList = couponMapper.getAbleCouponPageVoList(page, shopId, unGetList);
+ List<AppGetAbleCouponPageVo> getAbleCouponPageVoList = couponMapper.getAbleCouponPageVoList(page, member.getRelationShopId(),member.getUserId(),member.getBindingFlag(), unGetList);
//处理商品限制
if(!getAbleCouponPageVoList.isEmpty()){
String relGoodsIds;
List<Goods> goodsList;
- List<String> goodsLimitList;
+ List<String> goodsLimitList = null;
+ Shop shop = null;
for(AppGetAbleCouponPageVo appGetAbleCouponPageVo : getAbleCouponPageVoList){
relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
- goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
- goodsLimitList = goodsList.stream().map(goods -> {
- String goodsName = goods.getGoodsName();
- goodsName = "限制" + goodsName + "适用";
- return goodsName;
- }).collect(Collectors.toList());
- appGetAbleCouponPageVo.setGoodsLimitList(goodsLimitList);
+ if(StringUtils.isNotBlank(relGoodsIds)){
+ goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
+ if(goodsList!=null&&!goodsList.isEmpty()){
+ goodsLimitList = goodsList.stream().map(goods -> {
+ String goodsName = goods.getGoodsName();
+ goodsName = "限制" + goodsName + "适用";
+ return goodsName;
+ }).collect(Collectors.toList());
+ }
+ }else{
+ goodsLimitList = new ArrayList<>();
+ if(appGetAbleCouponPageVo.getShopId()!=null){
+ if(shop!=null&&shop.getShopId().equals(appGetAbleCouponPageVo.getShopId())){
+ }else{
+ shop = remoteShopService.getShop(appGetAbleCouponPageVo.getShopId()).getData();
+ }
+ goodsLimitList.add(shop.getShopName()+"通用");
+ }else{
+ goodsLimitList.add("全场通用");
+ }
}
+ appGetAbleCouponPageVo.setGoodsLimitList(goodsLimitList);
}
+
}
return getAbleCouponPageVoList;
}
@@ -945,11 +1190,14 @@
memberCoupon.setDelFlag(0);
memberCoupon.setCouponId(couponId);
memberCoupon.setUserId(userId);
- memberCoupon.setShopId(shopId);
+ if(coupon.getCouponFrom()==2){
+ memberCoupon.setShopId(shopId);
+ }
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());
@@ -960,6 +1208,7 @@
memberCoupon.setValidStartTime(coupon.getValidStartTime());
memberCoupon.setValidEndTime(coupon.getValidEndTime());
memberCoupon.setValidDay(coupon.getValidDay());
+ memberCoupon.setCouponFrom(coupon.getCouponFrom());
memberCoupon.setReceiveTime(new Date());
//有效期处理1.时间段2.领取之日起
if(coupon.getValidTimeType()==1){
@@ -971,4 +1220,33 @@
memberCouponService.save(memberCoupon);
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