From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
index 07658ac..aab545c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
@@ -104,18 +104,20 @@
if(Objects.isNull(discountMember)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- List<DiscountLog> discountLogList = discountLogMapper.selectJoinList(DiscountLog.class,new MPJLambdaWrapper<DiscountLog>()
- .selectAll(DiscountLog.class)
- .selectAs(SystemUser::getRealname,DiscountLog::getCreatorName)
- .eq(DiscountLog::getDiscountMemberId,discountMember.getId())
- .eq(DiscountLog::getIsdeleted,Constants.ZERO)
- .orderByDesc(DiscountLog::getId)
- );
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountLogList)){
- discountMember.setDiscountLogList(discountLogList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()));
- discountMember.setOptLogList(discountLogList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()));
- discountMember.setUseTimes(discountMember.getDiscountLogList().size());
- }
+// List<DiscountLog> discountLogList = discountLogMapper.selectJoinList(DiscountLog.class,new MPJLambdaWrapper<DiscountLog>()
+// .selectAll(DiscountLog.class)
+// .selectAs(SystemUser::getRealname,DiscountLog::getCreatorName)
+// .leftJoin(SystemUser.class,SystemUser::getId,DiscountLog::getCreator)
+// .eq(DiscountLog::getDiscountMemberId,discountMember.getId())
+// .eq(DiscountLog::getIsdeleted,Constants.ZERO)
+// .orderByDesc(DiscountLog::getId)
+// );
+// discountMember.setUseTimes(discountMember.getDiscountLogList().size());
+// if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountLogList)){
+// discountMember.setDiscountLogList(discountLogList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()));
+// discountMember.setOptLogList(discountLogList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()));
+//
+// }
return discountMember;
}
@@ -138,12 +140,15 @@
Utils.MP.blankToNull(pageWrap.getModel());
DiscountMember model = pageWrap.getModel();
queryWrapper.selectAll(DiscountMember.class)
+ .selectAs(Member::getOpenid,DiscountMember::getOpenid)
+ .select(" ( select count(1) from discount_log d where d.discount_member_id = t.id and d.type = 0 ) ",DiscountMember::getUseTimes)
.leftJoin(Member.class,Member::getId,DiscountMember::getMemberId)
.like(StringUtils.isNotBlank(model.getCode()),DiscountMember::getCode,model.getCode())
.like(StringUtils.isNotBlank(model.getName()),DiscountMember::getName,model.getName())
.like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
.eq(Objects.nonNull(model.getStatus()),DiscountMember::getStatus,model.getStatus())
- .orderByDesc(DiscountMember::getId);
+ .ne(DiscountMember::getStatus,Constants.TWO)
+ .orderByDesc(DiscountMember::getCode);
return PageData.from(discountMemberJoinMapper.selectJoinPage(page, DiscountMember.class,queryWrapper));
}
@@ -164,9 +169,12 @@
.orderByDesc(DiscountMember::getId);
List<DiscountMember> list = discountMemberJoinMapper.selectJoinList(DiscountMember.class,queryWrapper);
if(CollectionUtils.isEmpty(list)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙姤搴熺殑濂楅鍗′俊鎭�");
+ return;
}
for (DiscountMember discountMember:list) {
+ if(!Constants.equalsInteger(discountMember.getStatus(),Constants.ZERO)){
+ continue;
+ }
discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
.set(DiscountMember::getStatus,Constants.ONE)
.eq(DiscountMember::getId,discountMember.getId())
@@ -183,7 +191,6 @@
discountLog.setGoodsorderId(discountMember.getGoodsorderId());
discountLogMapper.insert(discountLog);
}
- //閫�娆炬搷浣�
}
@@ -191,7 +198,7 @@
@Override
public void adjust(DiscountMemberDTO model){
if(Objects.isNull(model)
- || Objects.isNull(model.getAddDays())){
+ || Objects.isNull(model.getAddDays())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -228,8 +235,9 @@
discountLog.setDiscountMemberId(discountMember.getId());
discountLog.setType(Constants.TWO);
discountLog.setGoodsorderId(discountMember.getGoodsorderId());
- discountLog.setEditInfo(model.getInfo());
+ discountLog.setInfo(model.getInfo());
discountLog.setEditDays(model.getAddDays());
+ discountLog.setEditInfo("灏嗘湁鏁堟湡澧炲姞"+model.getAddDays()+"澶�, 璋冩暣鍚庢湁鏁堟湡鑷�"+useEndDate);
discountLogMapper.insert(discountLog);
}
--
Gitblit v1.9.3