From dbddcc6d450759987c0af44ccab8cd5269ae08e8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 14:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
index 0ba089a..071a850 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
@@ -27,6 +27,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.NoticeService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -66,6 +67,9 @@
@Autowired
private ShopMapper shopMapper;
+
+ @Autowired
+ private NoticeService noticeService;
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
@Override
@@ -166,6 +170,14 @@
}else{
memberMapper.subtractIntegral(member.getId(),dealIntegralRequest.getIntegralNum());
}
+
+ //绔欏唴淇�
+ noticeService.saveMemberIntegralNotice(
+ dealIntegralRequest.getIntegralObjType(),Constants.ZERO,member.getId(),dealIntegralRequest.getIntegralNum(),
+ integral.getId(), dealIntegralRequest.getParam1()
+ );
+
+
return integral.getId();
}
@@ -317,14 +329,14 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(Integral.class);
- queryWrapper.selectAs(Member::getNickname, Fund::getNickName);
- queryWrapper.selectAs(Member::getImgurl, Fund::getImgurl);
- queryWrapper.selectAs(Member::getPhone, Fund::getPhone);
-
+ queryWrapper.selectAs(Member::getNickname, Integral::getNickName);
+ queryWrapper.selectAs(Member::getImgurl, Integral::getImgurl);
+ queryWrapper.selectAs(Member::getPhone, Integral::getPhone);
queryWrapper.leftJoin(Member.class, Member::getId, Integral::getMemberId);
-
queryWrapper.eq(pageWrap.getModel().getMemberId() != null, Integral::getMemberId, pageWrap.getModel().getMemberId());
queryWrapper.eq(pageWrap.getModel().getType() != null, Integral::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(pageWrap.getModel().getUserType() != null, Integral::getUserType, pageWrap.getModel().getUserType());
+ queryWrapper.eq( pageWrap.getModel().getObjType() !=null, Integral::getObjType, pageWrap.getModel().getObjType());
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNickName()), ms -> ms.like(Member::getNickname, pageWrap.getModel().getNickName())
.or().like(Member::getPhone, pageWrap.getModel().getNickName())
);
@@ -416,7 +428,7 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(result.getRecords())){
for (Integral integral:result.getRecords()) {
- integral.setStrType(Constants.IntegralObjType.getName(integral.getObjType()));
+ integral.setStrObjType(Constants.IntegralObjType.getName(integral.getObjType()));
}
}
return PageData.from(result);
@@ -436,7 +448,7 @@
Date date = new Date();
Integral integral = new Integral();
Constants.IntegralObjType integralObjType =null;
- if(Constants.equalsInteger(param.getUserType(), Constants.ZERO)){
+ if(Constants.equalsInteger(param.getUserType(), Constants.ZERO)){//鐢ㄦ埛璐﹀彿
MPJLambdaWrapper<Member> queryWrapper =new MPJLambdaWrapper<>();
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Shop::getName,Member::getShopName);
@@ -463,8 +475,9 @@
.setSql(param.getType() == 1,"integral = ifnull(integral,0)-" + param.getNum()));
integralObjType = param.getType()==0?Constants.IntegralObjType.SYSTEM_RECHARGE:Constants.IntegralObjType.SYSTEM_DEDUCT;
- integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(integral.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(integral.getNum()));
- }else{
+ integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(param.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(param.getNum()));
+ integral.setUserType(Constants.ZERO);
+ }else{//缁忛攢鍟嗚处鎴�
Shop model = shopMapper.selectById(param.getMemberId());
if(model == null ||Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"缁忛攢鍟嗕俊鎭煡璇㈡棤鏁堬紒");
@@ -483,9 +496,9 @@
.setSql(param.getType() == 0,"total_integral = ifnull(total_integral,0)+" + num)//绱澧炲姞
.setSql(param.getType() == 0,"integral = ifnull(integral,0)+" + param.getNum())
.setSql(param.getType() == 1,"integral = ifnull(integral,0)-" + param.getNum()));
-
- integralObjType = param.getType()==0?Constants.IntegralObjType.SHOP_SYSTEM_RECHARGE:Constants.IntegralObjType.SHOP_SYSTEM_DEDUCT;
- integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(integral.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(integral.getNum()));
+ integralObjType = param.getType()==0?Constants.IntegralObjType.SHOP_SYSTEM_RECHARGE:Constants.IntegralObjType.SHOP_SYSTEM_DEDUCT;
+ integral.setTotalNum(param.getType() == 0? Constants.formatBigdecimal(model.getIntegral()).add(param.getNum()):Constants.formatBigdecimal(model.getIntegral()).subtract(param.getNum()));
+ integral.setUserType(Constants.ONE);
}
integral.setCreateDate(new Date());
integral.setCreator(user.getId());
@@ -499,7 +512,6 @@
integral.setType(param.getType());
integral.setRemark(param.getRemark());
integral.setOrderCode(null);
- integral.setUserType(Constants.ZERO);
integralMapper.insert(integral);
}
@Override
--
Gitblit v1.9.3