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/MemberTotalServiceImpl.java | 65 ++++----------------------------
1 files changed, 9 insertions(+), 56 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java
index 3d9fb1f..ac469f2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java
@@ -4,8 +4,9 @@
import com.ruoyi.member.domain.pojo.member.MemberTotal;
import com.ruoyi.member.mapper.member.MemberTotalMapper;
import com.ruoyi.member.service.member.MemberTotalService;
-import com.ruoyi.system.api.domain.dto.MemberTotalChangeDto;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -18,66 +19,18 @@
@Service
public class MemberTotalServiceImpl extends ServiceImpl<MemberTotalMapper, MemberTotal> implements MemberTotalService {
+ @Resource
+ private MemberTotalMapper memberTotalMapper;
/**
- * @description 会员统计变动
+ * @description 重启积分标记
* @author jqs
- * @date 2023/6/28 14:34
- * @param memberTotalChangeDto
+ * @date 2023/7/20 15:31
+ * @param
* @return void
*/
@Override
- public void changeMemberTotal(MemberTotalChangeDto memberTotalChangeDto){
- MemberTotal memberTotal = this.getById(memberTotalChangeDto.getMemberId());
- //积分变动
- if(memberTotalChangeDto.getChangeIntegral()!=null){
- if(memberTotalChangeDto.getTypeIntegral()==2){
- memberTotal.setUseableIntegral(memberTotal.getUseableIntegral()-memberTotalChangeDto.getChangeIntegral());
- memberTotal.setUsedIntegral(memberTotal.getUsedIntegral()+memberTotalChangeDto.getChangeIntegral());
- }else{
- memberTotal.setUseableIntegral(memberTotal.getUseableIntegral()+memberTotalChangeDto.getChangeIntegral());
- memberTotal.setTotalIntegral(memberTotal.getTotalIntegral()+memberTotalChangeDto.getChangeIntegral());
- }
- }
- //消费变动
- if(memberTotalChangeDto.getPayMoney()!=null){
- memberTotal.setTotalPayMoney(memberTotal.getTotalPayMoney().add(memberTotalChangeDto.getPayMoney()));
- memberTotal.setTotalPayCount(memberTotal.getTotalPayCount()+1);
- memberTotal.setLastPayMoney(memberTotalChangeDto.getPayMoney());
- memberTotal.setLastPayTime(memberTotalChangeDto.getPayTime());
- }
- //服务次数变动
- if(memberTotalChangeDto.getServiceCount()!=null){
- if(memberTotalChangeDto.getTypeService()==2){
- memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount()-memberTotalChangeDto.getServiceCount());
- memberTotal.setUsedServiceCount(memberTotal.getUsedServiceCount()+memberTotalChangeDto.getServiceCount());
- }else{
- memberTotal.setUseableIntegral(memberTotal.getUseableIntegral()+memberTotalChangeDto.getServiceCount());
- memberTotal.setTotalServiceCount(memberTotal.getTotalServiceCount()+memberTotalChangeDto.getServiceCount());
- }
- }
- //跟进时间
- if(memberTotalChangeDto.getNextTaskTime()!=null){
- memberTotal.setNextTaskTime(memberTotalChangeDto.getNextTaskTime());
- }
- //活动次数变动
- if(memberTotalChangeDto.getActivityTime()!=null){
- memberTotal.setTotalActivityCount(memberTotal.getTotalActivityCount()+1);
- memberTotal.setLastActivityTime(memberTotalChangeDto.getActivityTime());
- }
- //订单数量变动
- if(memberTotalChangeDto.getCycleOrderChange()!=null){
- memberTotal.setTotalCycleOrder(memberTotal.getTotalCycleOrder()+memberTotalChangeDto.getCycleOrderChange());
- }
- if(memberTotalChangeDto.getExperienceOrderChange()!=null){
- memberTotal.setTotalExperienceOrder(memberTotal.getTotalExperienceOrder()+memberTotalChangeDto.getExperienceOrderChange());
- }
- if(memberTotalChangeDto.getServiceOrderChange()!=null){
- memberTotal.setTotalServiceOrder(memberTotal.getTotalServiceOrder()+memberTotalChangeDto.getServiceOrderChange());
- }
- if(memberTotalChangeDto.getGoodsOrderChange()!=null){
- memberTotal.setTotalGoodsOrder(memberTotal.getTotalGoodsOrder()+memberTotalChangeDto.getGoodsOrderChange());
- }
- this.saveOrUpdate(memberTotal);
+ public void initIntegralFlag(){
+ memberTotalMapper.initIntegralFlag();
}
}
--
Gitblit v1.7.1