From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 14 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
index acf2630..e0d9e29 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
@@ -15,6 +15,7 @@
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.dto.MemberCouponDTO;
+import com.doumee.dao.web.request.CouponNoticeRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.response.MemberCouponResponse;
import com.doumee.dao.web.response.goods.OrderGoodsCalculateResponse;
@@ -27,6 +28,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -68,6 +70,10 @@
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private NoticeMapper noticeMapper;
+
+
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public String addBatch(MemberCouponAddDTO memberCouponAddDTO){
@@ -85,11 +91,20 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+index+"銆戜釜浼樻儬鍒告煡璇㈡棤鏁堬紝璇峰埛鏂伴〉闈㈤噸鏂帮紒");
}
for(Member member : memberList){
+ MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
- MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
+ //婊″噺鍗蜂笉浼氱敓鎴恗axPrice 闇�瑕佹牴鎹紭鎯犲埜鍑忓皯閲戦璁剧疆
+ if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
+ memberCoupon.setMaxPrice(coupon.getPrice());
+ }
//鎸ㄤ釜閫�
addList.add(memberCoupon);
}
+ //浼樻儬鍒稿彂鏀鹃�氱煡
+ Notice notice = Notice.getNotice(Constants.NoticeType.COUPON,
+ member.getId(),null);
+ notice.setContent(notice.getContent().replace("{param}",Constants.getCouponInfo(memberCoupon, (int) Constants.formatLongNum(param.getNum()))));
+ noticeMapper.insert(notice);
}
index++;
}
@@ -541,7 +556,7 @@
.in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList()))
);
if(CollectionUtils.isEmpty(goodsSkuList)||!Constants.equalsInteger(goodsSkuList.size(),requestList.size())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍟嗗搧SKU淇℃伅閿欒,璇峰埛鏂伴噸璇�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍟嗗搧SKU淇℃伅宸插け鏁�,璇峰埛鏂伴噸璇�");
}
//鏌ヨ鍟嗗搧鍒楄〃
List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
@@ -569,6 +584,7 @@
List<MemberCoupon> allCoupon = memberCouponMapper.selectList(new QueryWrapper<MemberCoupon>().lambda()
.eq(MemberCoupon::getIsdeleted,Constants.ZERO)
.eq(MemberCoupon::getStatus,Constants.ZERO)
+ .eq(MemberCoupon::getMemberId,memberId)
.apply(" LIMIT_PRICE <= " + totalAmount)
.apply(" now() between START_DATE and END_DATE "));
@@ -577,11 +593,11 @@
//閫傜敤绫诲瀷锛�0=鍏ㄥ満;1=鍝佺被锛�2=鎸囧畾鍟嗗搧
if(Constants.equalsInteger(memberCoupon.getApplyType(),Constants.ZERO)){
memberCoupon.setValidAmount(memberCoupon.getPrice());
+ memberCouponList.add(memberCoupon);
}else{
List<String> applyIdList = Arrays.asList(memberCoupon.getApplyIds().split(","));
//鑾峰彇鏈夋晥鍙互浣跨敤浼樻儬鍒哥殑鏁版嵁
- isVaildUse(applyIdList,goodsCalculateList,
- Constants.equalsInteger(memberCoupon.getApplyType(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ isVaildUse(applyIdList,goodsCalculateList,memberCoupon.getApplyType());
BigDecimal skuAmount = goodsCalculateList.stream().filter(i->i.getUseCoupon()).map(i->i.getSkuAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
if(skuAmount.compareTo(memberCoupon.getLimitPrice())>=Constants.ZERO){
//鏍规嵁閲戦璁＄畻瀹為檯鎶樻墸閲戦
@@ -618,7 +634,7 @@
.in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList()))
);
if(CollectionUtils.isEmpty(goodsSkuList)||!Constants.equalsInteger(goodsSkuList.size(),requestList.size())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍟嗗搧SKU淇℃伅閿欒,璇峰埛鏂伴噸璇�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍟嗗搧SKU淇℃伅宸插け鏁�,璇峰埛鏂伴噸璇�");
}
//鏌ヨ鍟嗗搧鍒楄〃
List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
@@ -678,8 +694,10 @@
//鏍规嵁浼樻儬鍒哥被鍨� 璁＄畻鍙互浣跨敤浼樻儬鍒哥殑鍟嗗搧淇℃伅 閫傜敤绫诲瀷锛�0=鍏ㄥ満;1=鍝佺被锛�2=鎸囧畾鍟嗗搧
if(!Constants.equalsInteger(coupon.getApplyType(),Constants.ZERO)){
List<String> applyIdList = Arrays.asList(coupon.getApplyIds().split(","));
- isVaildUse(applyIdList,goodsCalculateList,
- Constants.equalsInteger(coupon.getApplyType(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ isVaildUse(applyIdList,goodsCalculateList,coupon.getApplyType());
+ //Constants.equalsInteger(coupon.getApplyType(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ }else{
+ isVaildUse(null,goodsCalculateList,coupon.getApplyType());
}
//浣跨敤浜嗕紭鎯犲埜鐨勫晢鍝佹暟閲�
Integer countCouponNum = goodsCalculateList.stream().filter(i->i.getUseCoupon()).collect(Collectors.toList()).size();
@@ -710,13 +728,20 @@
* 鍒ゆ柇鏄惁鍙互鏈夋晥浣跨敤
* @param idList
* @param goodsList
- * @param vaildType 0=鍟嗗搧锛�1=鍝佺被
+ * @param vaildType 0=鍏ㄥ満;1=鍝佺被锛�2=鎸囧畾鍟嗗搧
* @return
*/
public void isVaildUse(List<String> idList,List<OrderGoodsCalculateResponse> goodsList,Integer vaildType){
- for (OrderGoodsCalculateResponse response:goodsList) {
- response.setUseCoupon(idList.contains(Constants.equalsInteger(vaildType,Constants.ZERO)?response.getId().toString():response.getCategoryId().toString())?true:false);
+ if(Constants.equalsInteger(vaildType,Constants.ZERO)){
+ for (OrderGoodsCalculateResponse response:goodsList) {
+ response.setUseCoupon(true);
+ }
+ }else{
+ for (OrderGoodsCalculateResponse response:goodsList) {
+ response.setUseCoupon(idList.contains(Constants.equalsInteger(vaildType,Constants.TWO)?response.getId().toString():response.getCategoryId().toString())?true:false);
+ }
}
+
}
@@ -735,10 +760,60 @@
// }
// return new HashSet<>();
// }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public void notifyExpiredCoupon(Integer days) {
+ if (days == null || days <= 0) {
+ days = 3; // 榛樿鎻愬墠 3 澶╅�氱煡
+ }
+ String afterDate = DateUtil.afterDateToStr(days);
+ // 鏌ヨ鍗冲皢杩囨湡鐨勪紭鎯犲埜锛堟湭浣跨敤涓斿湪鐩爣鏃ユ湡鑼冨洿鍐呰繃鏈燂級
+ List<MemberCoupon> expiredCoupons = memberCouponMapper.selectList(
+ new QueryWrapper<MemberCoupon>().lambda()
+ .eq(MemberCoupon::getIsdeleted, Constants.ZERO)
+ .eq(MemberCoupon::getStatus, Constants.ZERO) // 鏈娇鐢�
+ .eq(MemberCoupon::getNoticeStatus,Constants.ZERO)// 鏈�氱煡鏁版嵁
+ .ge(MemberCoupon::getEndDate, DateUtil.getCurrDateTime()) // 澶т簬绛変簬寮�濮嬫椂闂�
+ .lt(MemberCoupon::getEndDate, (afterDate+" 23:59:59") ) // 灏忎簬缁撴潫鏃堕棿
+ );
+ if (CollectionUtils.isEmpty(expiredCoupons)) {
+ return;
+ }
+ // 鎸夌敤鎴峰垎缁勭粺璁�
+ Map<Integer, List<MemberCoupon>> memberCouponMap = expiredCoupons.stream()
+ .collect(Collectors.groupingBy(MemberCoupon::getMemberId));
+
+ // 閬嶅巻姣忎釜鐢ㄦ埛鐨勪紭鎯犲埜鍙戦�侀�氱煡
+ for (Map.Entry<Integer, List<MemberCoupon>> entry : memberCouponMap.entrySet()) {
+ Integer memberId = entry.getKey();
+ List<MemberCoupon> coupons = entry.getValue();
+ if (CollectionUtils.isEmpty(coupons)) {
+ continue;
+ }
+ // 鏌ヨ鐢ㄦ埛淇℃伅
+ Member member = memberMapper.selectById(memberId);
+ if (member == null || member.getIsdeleted() == Constants.ONE) {
+ continue;
+ }
+ // 缁熻浼樻儬鍒告暟閲忓拰绫诲瀷
+ long count = coupons.size();
-
-
-
-
+ List<Integer> couponIds = coupons.stream().map(MemberCoupon::getId).collect(Collectors.toList());
+ //鍙戦�佺珯鍐呬俊 浼樻儬鍒稿嵆灏嗚繃鏈�
+ Notice notice = Notice.getNotice(
+ Constants.NoticeType.EXPIRE_COUPON,
+ member.getId(),
+ null
+ );
+ notice.setContent(notice.getContent().replace("{param}",Long.toString(count)).replace("{param1}",afterDate));
+ noticeMapper.insert(notice);
+ memberCouponMapper.update(new UpdateWrapper<MemberCoupon>().lambda()
+ .set(MemberCoupon::getNoticeStatus,Constants.ONE)
+ .set(MemberCoupon::getNoticeTime,DateUtil.getCurrDateTime())
+ .in(MemberCoupon::getId,couponIds)
+ );
+ }
+ }
}
--
Gitblit v1.9.3