From c384e04f81caf681647c602d5896cc10b289582e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 14:59:16 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a2fe488..cad8f60 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -253,13 +253,13 @@
.or().like(Member::getName,pageWrap.getModel().getNickname())
.or().like(Member::getPhone,pageWrap.getModel().getNickname())
);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getStatus,pageWrap.getModel().getShopName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getName,pageWrap.getModel().getShopName());
queryWrapper.eq(pageWrap.getModel().getStatus()!=null,Member::getStatus,pageWrap.getModel().getStatus());
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.ge(pageWrap.getModel().getStarttime()!=null, Member::getCreateDate,pageWrap.getModel().getStarttime());
queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Member::getCreateDate, pageWrap.getModel().getEndtime());
- queryWrapper.orderByDesc(Member::getCreateDate);
+ queryWrapper.orderByDesc(Member::getId);
IPage<Member> result = memberJoinMapper.selectJoinPage(page, Member.class, queryWrapper);
@@ -269,6 +269,10 @@
for(Member model:result.getRecords()){
if(StringUtils.isNotBlank(model.getImgurl())){
model.setImgFullUrl(path);
+ }
+ model.setTotalReduceIntegral(Constants.formatBigdecimal(model.getTotalIntegral()).subtract(Constants.formatBigdecimal(model.getIntegral())));
+ if(model.getTotalReduceIntegral().compareTo(new BigDecimal(0)) <=0){
+ model.setTotalReduceIntegral(new BigDecimal(0));
}
}
}
@@ -425,7 +429,7 @@
dealIntegralRequest.setDealType(Constants.ZERO);
dealIntegralRequest.setMemberId(member.getId());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.REGISTER);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//寮�鍚敞鍐岄�佷紭鎯犲埜
if(Constants.equalsInteger(platformConfigDTO.getRegCouponRewardStatus(),Constants.ZERO)){
@@ -480,7 +484,7 @@
dealIntegralRequest.setMemberId(member.getRecId());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
dealIntegralRequest.setParam1(member.getNickname());
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
}
@@ -735,7 +739,7 @@
dealIntegralRequest.setObjId(s.getId());
dealIntegralRequest.setOrderCode(null);
dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
});
// integralService.dealIntegral()
} catch (Exception e) {
@@ -769,7 +773,7 @@
dealIntegralRequest.setObjId(memberRechargeDTO.getMemberId());
dealIntegralRequest.setOrderCode(null);
dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
- Integer integer = integralService.dealIntegral(dealIntegralRequest);
+ Integer integer = integralService.dealIntegral(dealIntegralRequest,null);
return integer;
}
--
Gitblit v1.9.3