From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 203 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 161 insertions(+), 42 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
index eb96ac3..14e1a02 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -1,15 +1,22 @@
package com.ruoyi.member.service.impl.member;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
import com.ruoyi.member.domain.dto.MemberSelectCouponDto;
import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
+import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.ruoyi.member.domain.vo.AppMemberCouponPageVo;
+import com.ruoyi.member.mapper.coupon.CouponMapper;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
+import com.ruoyi.member.service.coupon.CouponService;
+import com.ruoyi.member.service.coupon.MemberCouponRecordService;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
@@ -42,18 +49,28 @@
* @since 2023-04-25
*/
@Service
+@DS("sharding")
public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, MemberCoupon> implements MemberCouponService {
-
+
@Resource
private MemberCouponMapper memberCouponMapper;
-
+
@Resource
private RemoteGoodsService remoteGoodsService;
-
+
@Resource
private RemoteShopService remoteShopService;
-
-
+
+ @Resource
+ private CouponService couponService;
+
+ @Resource
+ private MemberCouponRecordService memberCouponRecordService;
+
+ @Resource
+ private CouponMapper couponMapper;
+
+
/**
* @description: TODO
* @author jqs34
@@ -61,11 +78,11 @@
* @version 1.0
*/
@Override
- public List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto){
+ public List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto) {
List<AppMemberCouponVo> appMemberCouponVoList = memberCouponMapper.listVoMemberCouponByUserId(merBaseDto);
return appMemberCouponVoList;
}
-
+
/**
* @description 核销优惠券
* @author jqs
@@ -74,7 +91,7 @@
* @return void
*/
@Override
- public MerVerifyCouponGetVo getVerifyCoupon(String verifyCoupon){
+ public MerVerifyCouponGetVo getVerifyCoupon(Long verifyCoupon){
MemberCoupon memberCoupon = this.getById(verifyCoupon);
// 检查是否存在该优惠券
if (memberCoupon == null) {
@@ -110,7 +127,7 @@
merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
return merVerifyCouponGetVo;
}
-
+
/**
* @description 核销优惠券
* @author jqs
@@ -119,7 +136,7 @@
* @return MerVerifyCouponGetVo
*/
@Override
- public MerVerifyCouponGetVo sureVerifyCoupon(String memberCouponId){
+ public MerVerifyCouponGetVo sureVerifyCoupon(Long memberCouponId){
MemberCoupon memberCoupon = this.getById(memberCouponId);
if(memberCoupon==null||memberCoupon.getDelFlag()==1){
throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
@@ -148,13 +165,13 @@
merVerifyCouponGetVo.setCouponFrom("平台");
}
memberCoupon.setCouponStatus(2);
-
+
memberCoupon.setUseTime(new Date());
this.saveOrUpdate(memberCoupon);
merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
return merVerifyCouponGetVo;
}
-
+
/**
* @description
* @author jqs
@@ -171,7 +188,7 @@
Integer total = this.count(queryWrapper);
return total;
}
-
+
/**
* @description 用户分页获取已领取优惠券列表
* @author jqs
@@ -186,7 +203,8 @@
if(!memberCouponPageVoList.isEmpty()){
String relGoodsIds;
HashSet<Long> shopIdSet = new HashSet<>();
- HashSet<Long> goodsIdSet = new HashSet<>();
+ HashSet<String> goodsIdSet = new HashSet<>();
+ String[] goodsIdArr;
for(AppMemberCouponPageVo appGetAbleCouponPageVo : memberCouponPageVoList){
if(appGetAbleCouponPageVo.getShopId()!=null){
shopIdSet.add(appGetAbleCouponPageVo.getShopId());
@@ -194,21 +212,29 @@
if(appGetAbleCouponPageVo.getCouponType()==4){
appGetAbleCouponPageVo.setVerifyCode("2-"+appGetAbleCouponPageVo.getMemberCouponId());
}
- if(StringUtils.isNotBlank(appGetAbleCouponPageVo.getRelGoodsIds())&&!appGetAbleCouponPageVo.getRelGoodsIds().contains(",")){
- goodsIdSet.add(Long.valueOf(appGetAbleCouponPageVo.getRelGoodsIds()));
+ if(StringUtils.isNotBlank(appGetAbleCouponPageVo.getRelGoodsIds())){
+ relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
+ goodsIdArr = relGoodsIds.split(",");
+ for(String str : goodsIdArr){
+ goodsIdSet.add(str);
+ }
}
}
//获取关联商户和商品信息并转换为Map
- String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
+ String shopJoinedString;
+ Map<Long, MgtSimpleShopVo> shopMap = null;
+ if(shopIdSet!=null&&!shopIdSet.isEmpty()) {
+ 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();
+ shopMap = simpleShopVoList.stream()
+ .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
+ }
String goodsJoinedString = null;
if(goodsIdSet!=null&&!goodsIdSet.isEmpty()){
goodsJoinedString = String.join(",", goodsIdSet.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()));
Map<String, Goods> goodsMap = null;
if(goodsJoinedString!=null){
List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsJoinedString).getData();
@@ -216,20 +242,30 @@
.collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
}
//处理返回信息
- String shopLimit = "全场通用";
- String goodsLimit = null;
+ String shopLimit = "全门店通用";
+ String goodsLimit;
+ StringJoiner goodsNameSj;
for(AppMemberCouponPageVo appGetAbleCouponPageVo : memberCouponPageVoList){
+ goodsLimit = null;
+ goodsNameSj = new StringJoiner(",");
//商户限制
if(appGetAbleCouponPageVo.getShopId()!=null){
- if(!member.getRelationShopId().equals(appGetAbleCouponPageVo.getShopId())){
- shopLimit = shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName()+"可用";
- }
+ shopLimit = shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName()+"可用";
}
appGetAbleCouponPageVo.setShopLimit(shopLimit);
//商品限制
relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
- if(StringUtils.isNotBlank(relGoodsIds)&&!relGoodsIds.contains(",")){
- goodsLimit = goodsMap.get(relGoodsIds).getGoodsName();
+ if(StringUtils.isNotBlank(relGoodsIds)){
+ relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
+ goodsIdArr = relGoodsIds.split(",");
+ for(String goodsIs : goodsIdArr){
+ if(goodsMap.get(goodsIs)!=null){
+ goodsNameSj.add(goodsMap.get(goodsIs).getGoodsName());
+ }else{
+ log.debug("用户优惠券未找到关联商品"+appGetAbleCouponPageVo.getMemberCouponId()+"-"+appGetAbleCouponPageVo.getRelGoodsIds());
+ }
+ }
+ goodsLimit = goodsNameSj.toString();
}
appGetAbleCouponPageVo.setGoodsLimit(goodsLimit);
//核销商店
@@ -240,7 +276,7 @@
}
return memberCouponPageVoList;
}
-
+
/**
* @description 定时检查优惠券过期
* @author jqs
@@ -252,7 +288,7 @@
public void timingCheckMemberCoupon(){
memberCouponMapper.timingCheckMemberCoupon();
}
-
+
/**
* @description 使用优惠券
* @author jqs
@@ -265,7 +301,7 @@
public void useMemberCoupon(String memberCouponIds){
memberCouponMapper.useMemberCoupon(memberCouponIds);
}
-
+
/**
* @description 使用优惠券
* @author jqs
@@ -277,7 +313,7 @@
public void backMemberCoupon(String memberCouponIds){
memberCouponMapper.backMemberCoupon(memberCouponIds);
}
-
+
/**
* @description
* @author jqs
@@ -290,8 +326,8 @@
List<MerMemberCouponVo> merMemberCouponVoList = memberCouponMapper.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
if(merMemberCouponVoList!=null&&merMemberCouponVoList.size()>0){
List<MemberSelectCouponDto> goodsCpuponList = merGoodsCouponListDto.getGoodsCpuponList();
- List<String> selectCouponList = new ArrayList<>();
- Map<String, String> selectCouponMap = new HashMap<>();
+ List<Long> selectCouponList = new ArrayList<>();
+ Map<Long, String> selectCouponMap = new HashMap<>();
Boolean checkSelect = false;
if(merGoodsCouponListDto.getGoodsCpuponList()!=null&&merGoodsCouponListDto.getGoodsCpuponList().size()>0) {
for (MemberSelectCouponDto couponDto : goodsCpuponList) {
@@ -326,18 +362,101 @@
}
return merMemberCouponVoList;
}
-
-
+
+
/**
- * @description 确认核销优惠券
- * @author jqs
- * @date 2023/8/15 11:21
* @param memberCouponId
* @param shopId
- * @return void
+ * @return void
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/8/15 11:21
*/
@Override
- public void sureMemberCoupon(String memberCouponId,Long shopId){
+ public void sureMemberCoupon(Long memberCouponId, Long shopId) {
memberCouponMapper.sureMemberCoupon(memberCouponId, shopId);
}
+
+ @Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+ public void insert(MemberCoupon memberCoupon) {
+ this.baseMapper.insert(memberCoupon);
+ }
+
+
+ /**
+ * 手动添加用户优惠券
+ *
+ * @param couponId
+ * @param number
+ * @return
+ */
+ @Override
+ public R addMemberCoupon(String couponId, Integer number, Long userId) {
+ Coupon coupon = couponService.getById(couponId);
+ if (null == coupon) {
+ return R.fail("优惠券不存在");
+ }
+ List<MemberCoupon> memberCouponList = new ArrayList<>();
+ MemberCoupon memberCoupon;
+ Integer sendTotal = 0;
+ Integer sendPerson = 0;
+ Integer sendUserTotal;
+ for (int i = 0; i < number; i++) {
+ memberCoupon = new MemberCoupon();
+ memberCoupon.setDelFlag(0);
+ memberCoupon.setCouponId(coupon.getCouponId());
+ memberCoupon.setUserId(userId);
+ memberCoupon.setShopId(coupon.getShopId());
+ memberCoupon.setCouponType(coupon.getCouponType());
+ if (coupon.getCouponType() == 1) {
+ memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold());
+ memberCoupon.setDiscountMoney(coupon.getDiscountMoney());
+ } else if (coupon.getCouponType() == 2) {
+ memberCoupon.setDiscountPercent(coupon.getDiscountPercent());
+ } else if (coupon.getCouponType() == 3) {
+ memberCoupon.setDiscountMoney(coupon.getDiscountMoney());
+ } else {
+ memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
+ }
+ 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.setUseScope(coupon.getUseScope());
+ if (memberCoupon.getUseScope() == 2) {
+ memberCoupon.setRelGoodsIds(coupon.getRelGoodsIds());
+ }
+ memberCoupon.setValidTimeType(coupon.getValidTimeType());
+ 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) {
+ memberCoupon.setDeadlineTime(coupon.getValidEndTime());
+ } else if (coupon.getValidTimeType() == 2) {
+ memberCoupon.setDeadlineTime(DateUtils.addDays(new Date(), coupon.getValidDay()));
+ }
+ memberCouponList.add(memberCoupon);
+ sendTotal = sendTotal + 1;
+ if (coupon.getSendType() == 1) {
+ sendUserTotal = this.totalMemberCouponByUserAndCoupon(userId, coupon.getCouponId());
+ if (sendUserTotal != null && sendUserTotal > 0) {
+ } else {
+ sendPerson = sendPerson + 1;
+ }
+ }
+ memberCouponRecordService.updateMemberCouponRecord(coupon, userId, 1);
+ }
+ this.saveBatch(memberCouponList);
+ //处理优惠券统计
+ if (sendTotal > 0) {
+ couponMapper.updateCouponTotal(coupon.getCouponId(), sendTotal, sendPerson);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1