From a73a5dd6687dd6231635b3272096e08cddb6af27 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 13:56:15 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 44c92d5..4f8b57c 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
@@ -13,7 +13,7 @@
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.member.domain.pojo.member.MemberCoupon;
+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;
@@ -320,7 +320,9 @@
List<MemberCoupon> memberCouponList = new ArrayList<>();
MemberCoupon memberCoupon;
Integer sendTotal = 0;
+ Integer sendPerson = 0;
String memberCouponId;
+ Integer sendUserTotal;
for(Long userId : userIdList){
memberCouponId = IdUtils.simpleUUID();
memberCoupon = new MemberCoupon();
@@ -328,6 +330,7 @@
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());
@@ -352,14 +355,18 @@
}
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;
+ }
+ }
}
memberCouponService.saveBatch(memberCouponList);
//处理优惠券统计
if(sendTotal>0){
- CouponTotal couponTotal = couponTotalService.getById(coupon.getCouponId());
- couponTotal.setSendCount(couponTotal.getSendCount()+sendTotal);
- couponTotal.setSendUserCount(couponTotal.getSendUserCount()+sendTotal);
- couponTotalService.saveOrUpdate(couponTotal);
+ couponMapper.updateCouponTotal(coupon.getCouponId(),sendTotal,sendPerson);
}
}
}
--
Gitblit v1.7.1