From ed7cde0f64b01e95e11d6f66d1f27b05cea84332 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 09 七月 2023 18:13:00 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 35 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 8ddaac8..bb2aea8 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
@@ -9,23 +9,15 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.member.domain.dto.*;
-import com.ruoyi.member.domain.pojo.coupon.Coupon;
-import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
-import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
-import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.member.domain.pojo.coupon.*;
+import com.ruoyi.member.service.coupon.*;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.coupon.CouponMapper;
-import com.ruoyi.member.service.coupon.CouponRelGoodsService;
-import com.ruoyi.member.service.coupon.CouponRelUserService;
-import com.ruoyi.member.service.coupon.CouponService;
-import com.ruoyi.member.service.coupon.CouponTotalService;
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.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
import com.ruoyi.system.api.service.RemoteActivityService;
@@ -75,6 +67,9 @@
@Resource
private RemoteActivityService remoteActivityService;
+ @Resource
+ private MemberCouponRecordService memberCouponRecordService;
+
/**
* @description 平台获取优惠券列表
* @author jqs
@@ -88,7 +83,7 @@
List<MgtCouponPageVo> mgtCouponPageVoList = couponMapper.pageMgtCoupon(page, mgtCouponPageDto);
//处理使用限制和有效期
if(mgtCouponPageVoList!=null&&!mgtCouponPageVoList.isEmpty()){
- Integer couponType;
+ String couponType;
Integer validTimeType;
Date validStartTime;
Date validEndTime;
@@ -101,20 +96,10 @@
for(MgtCouponPageVo mgtCouponPageVo : mgtCouponPageVoList){
//处理使用限制
couponType = mgtCouponPageVo.getCouponType();
- switch (couponType){
- case 1:
- moneyThreshold = mgtCouponPageVo.getMoneyThreshold();
- discountMoney = mgtCouponPageVo.getDiscountMoney();
- useLimit = "满" + moneyThreshold.toString() + "减" + discountMoney.toString() + "元";
- break;
- case 2:
- break;
- case 3:
- break;
- case 4:
- break;
- default:
- break;
+ if(couponType.equals("满减")){
+ moneyThreshold = mgtCouponPageVo.getMoneyThreshold();
+ discountMoney = mgtCouponPageVo.getDiscountMoney();
+ useLimit = "满" + moneyThreshold.toString() + "减" + discountMoney.toString() + "元";
}
mgtCouponPageVo.setUseLimit(useLimit);
//处理有效期
@@ -160,19 +145,20 @@
mgtCouponGoodsListVo.setGoodsId(goods.getGoodsId());
mgtCouponGoodsListVo.setGoodsName(goods.getGoodsName());
mgtCouponGoodsListVo.setGoodsNo(goods.getGoodsNo());
+ mgtCouponGoodsListVo.setGoodsType(goods.getGoodsType());
//商品类型1周期2服务3体验4单品
switch (goods.getGoodsType()){
case 1:
- mgtCouponGoodsListVo.setGoodsType("周期");
+ mgtCouponGoodsListVo.setGoodsTypeName("周期");
break;
case 2:
- mgtCouponGoodsListVo.setGoodsType("服务");
+ mgtCouponGoodsListVo.setGoodsTypeName("服务");
break;
case 3:
- mgtCouponGoodsListVo.setGoodsType("体验");
+ mgtCouponGoodsListVo.setGoodsTypeName("体验");
break;
case 4:
- mgtCouponGoodsListVo.setGoodsType("单品");
+ mgtCouponGoodsListVo.setGoodsTypeName("单品");
break;
default:
break;
@@ -401,6 +387,7 @@
sendPerson = sendPerson + 1;
}
}
+ memberCouponRecordService.updateMemberCouponRecord(coupon,userId,1);
}
memberCouponService.saveBatch(memberCouponList);
//处理优惠券统计
@@ -445,7 +432,7 @@
queryWrapper.eq(Coupon::getCouponStatus,1);
queryWrapper.eq(Coupon::getSendTimeType,2);
queryWrapper.eq(Coupon::getAuditStatus,2);
- queryWrapper.eq(Coupon::getSendTime,new Date());
+ queryWrapper.eq(Coupon::getSendTime,DateUtils.getNowDate());
List<Coupon> couponList = couponMapper.selectList(queryWrapper);
if(couponList!=null&&!couponList.isEmpty()){
List<CouponRelUser> couponRelUserList;
@@ -544,19 +531,20 @@
mgtCouponGoodsListVo.setGoodsId(goods.getGoodsId());
mgtCouponGoodsListVo.setGoodsName(goods.getGoodsName());
mgtCouponGoodsListVo.setGoodsNo(goods.getGoodsNo());
+ mgtCouponGoodsListVo.setGoodsType(goods.getGoodsType());
//商品类型1周期2服务3体验4单品
switch (goods.getGoodsType()){
case 1:
- mgtCouponGoodsListVo.setGoodsType("周期");
+ mgtCouponGoodsListVo.setGoodsTypeName("周期");
break;
case 2:
- mgtCouponGoodsListVo.setGoodsType("服务");
+ mgtCouponGoodsListVo.setGoodsTypeName("服务");
break;
case 3:
- mgtCouponGoodsListVo.setGoodsType("体验");
+ mgtCouponGoodsListVo.setGoodsTypeName("体验");
break;
case 4:
- mgtCouponGoodsListVo.setGoodsType("单品");
+ mgtCouponGoodsListVo.setGoodsTypeName("单品");
break;
default:
break;
@@ -832,4 +820,75 @@
coupon.setUpdateTime(new Date());
this.saveOrUpdate(coupon);
}
+
+ /**
+ * @description 发送用户优惠券礼物
+ * @author jqs
+ * @date 2023/7/7 19:54
+ * @param giftSendDtoList
+ * @return void
+ */
+ @Override
+ public void sendCouponGift(List<BirthdayGiftSendDto> giftSendDtoList){
+ Long userId = giftSendDtoList.get(0).getUserId();
+ Long shopId = giftSendDtoList.get(0).getShopId();
+ String couponId;
+ Coupon coupon;
+ List<MemberCoupon> memberCouponList = new ArrayList<>();
+ MemberCoupon memberCoupon;
+ String memberCouponId;
+ for(BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList){
+ couponId = birthdayGiftSendDto.getCouponId();
+ coupon = this.getById(couponId);
+ for(int i=0;i<birthdayGiftSendDto.getCouponNumber();i++){
+ memberCoupon = new MemberCoupon();
+ memberCouponId = IdUtils.simpleUUID();
+ memberCoupon.setId(memberCouponId);
+ memberCoupon.setDelFlag(0);
+ memberCoupon.setCouponId(couponId);
+ memberCoupon.setUserId(userId);
+ memberCoupon.setShopId(shopId);
+ memberCoupon.setCouponType(coupon.getCouponType());
+ memberCoupon.setCouponStatus(coupon.getCouponStatus());
+ memberCoupon.setCouponName(coupon.getCouponName());
+ memberCoupon.setSendType(coupon.getSendType());
+ 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.setReceiveTime(new Date());
+ //有效期处理1.时间段2.领取之日起
+ if(coupon.getValidTimeType()==1){
+ memberCoupon.setDeadlineTime(coupon.getValidEndTime());
+ }else if(coupon.getValidTimeType()==2){
+ memberCoupon.setDeadlineTime(DateUtils.addDays(new Date(),coupon.getValidDay()));
+ }
+ memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
+ memberCouponList.add(memberCoupon);
+ }
+ memberCouponRecordService.updateMemberCouponRecord(coupon,userId,birthdayGiftSendDto.getCouponNumber());
+ }
+ memberCouponService.saveBatch(memberCouponList);
+ }
+
+ /**
+ * @description 用户分页获取可领取优惠券列表
+ * @author jqs
+ * @date 2023/7/9 16:16
+ * @param page
+ * @param appPageDto
+ * @return List<AppUnGetCouponPageVo>
+ */
+ @Override
+ public List<AppUnGetCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto){
+
+
+ return null;
+ }
}
--
Gitblit v1.7.1