From 116a83c60384f716cb8c988a4e8f2b30bf5d6718 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 21 一月 2026 10:20:05 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
index ea1979b..83a47a4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
@@ -34,6 +34,7 @@
import com.doumee.service.business.InviteRecordService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.util.TextUtils;
import org.apache.shiro.SecurityUtils;
@@ -191,38 +192,65 @@
@Override
public PageData<InviteRecord> findPage(PageWrap<InviteRecord> pageWrap) {
IPage<InviteRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<InviteRecord> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<InviteRecord> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda().eq(pageWrap.getModel().getId() != null,InviteRecord::getId, pageWrap.getModel().getId());
- queryWrapper.lambda().eq(pageWrap.getModel().getCreator() != null,InviteRecord::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.selectAll(InviteRecord.class )
+ .select("t1.name",InviteRecord::getRecName)
+ .select("t1.nickname",InviteRecord::getRecNickname)
+ .select("t1.phone",InviteRecord::getRecPhone)
+ .select("t2.name",InviteRecord::getMemberName)
+ .select("t2.nickname",InviteRecord::getMemberNickname)
+ .select("t2.open_id",InviteRecord::getOpenid)
+ .select("t2.phone",InviteRecord::getMemberPhone)
+ .leftJoin(Member.class,Member::getId,InviteRecord::getInviteId)
+ .leftJoin(Member.class,Member::getId,InviteRecord::getMemberId) ;
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getId() != null,InviteRecord::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(pageWrap.getModel().getCreator() != null,InviteRecord::getCreator, pageWrap.getModel().getCreator());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().ge(InviteRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(InviteRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(InviteRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(InviteRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
- queryWrapper.lambda().eq(pageWrap.getModel().getEditor() != null,InviteRecord::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(pageWrap.getModel().getEditor() != null,InviteRecord::getEditor, pageWrap.getModel().getEditor());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().ge(InviteRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(InviteRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(InviteRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(InviteRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
- queryWrapper.lambda().eq(pageWrap.getModel().getIsdeleted() != null,InviteRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
- queryWrapper.lambda().eq(pageWrap.getModel().getRemark() != null,InviteRecord::getRemark, pageWrap.getModel().getRemark());
- queryWrapper.lambda().eq(pageWrap.getModel().getInviteId() != null,InviteRecord::getInviteId, pageWrap.getModel().getInviteId());
- queryWrapper.lambda().eq(pageWrap.getModel().getMemberId() != null,InviteRecord::getMemberId, pageWrap.getModel().getMemberId());
- queryWrapper.lambda().eq(pageWrap.getModel().getPhone() != null,InviteRecord::getPhone, pageWrap.getModel().getPhone());
- queryWrapper.lambda().eq(pageWrap.getModel().getFirstOrderStatus() != null,InviteRecord::getFirstOrderStatus, pageWrap.getModel().getFirstOrderStatus());
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getRecName()),w->{
+ w.like("t1.name",pageWrap.getModel().getRecName()).or()
+ .like("t1.phone",pageWrap.getModel().getRecName()).or()
+ .like("t1.nickname",pageWrap.getModel().getRecName());
+ });
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),w->{
+ w.like("t2.name",pageWrap.getModel().getMemberName()).or()
+ .like("t2.phone",pageWrap.getModel().getMemberName()).or()
+ .like("t2.nickname",pageWrap.getModel().getMemberName());
+ });
+ queryWrapper.eq(pageWrap.getModel().getIsdeleted() != null,InviteRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(pageWrap.getModel().getRemark() != null,InviteRecord::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(pageWrap.getModel().getInviteId() != null,InviteRecord::getInviteId, pageWrap.getModel().getInviteId());
+ queryWrapper.eq(pageWrap.getModel().getMemberId() != null,InviteRecord::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(pageWrap.getModel().getPhone() != null,InviteRecord::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.eq(pageWrap.getModel().getFirstOrderStatus() != null,InviteRecord::getFirstOrderStatus, pageWrap.getModel().getFirstOrderStatus());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().ge(InviteRecord::getFirstFinishDate, Utils.Date.getStart(pageWrap.getModel().getFirstFinishDate()));
- queryWrapper.lambda().le(InviteRecord::getFirstFinishDate, Utils.Date.getEnd(pageWrap.getModel().getFirstFinishDate()));
+ queryWrapper.ge(InviteRecord::getFirstFinishDate, Utils.Date.getStart(pageWrap.getModel().getFirstFinishDate()));
+ queryWrapper.le(InviteRecord::getFirstFinishDate, Utils.Date.getEnd(pageWrap.getModel().getFirstFinishDate()));
}
- queryWrapper.lambda().eq(pageWrap.getModel().getRewardIntegral() != null,InviteRecord::getRewardIntegral, pageWrap.getModel().getRewardIntegral());
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ queryWrapper.eq(pageWrap.getModel().getRewardIntegral() != null,InviteRecord::getRewardIntegral, pageWrap.getModel().getRewardIntegral());
+
+ queryWrapper.orderByDesc(InviteRecord::getCreateDate);
+ IPage<InviteRecord> result =inviteRecordMapper.selectPage(page, queryWrapper);
+ if(result!=null && result.getRecords()!=null){
+ for(InviteRecord model : result.getRecords()){
+ model.setMemberName(StringUtils.defaultString(model.getMemberNickname(),"")+" / "
+ +StringUtils.defaultString(model.getMemberName(),"-")+" / "
+ +StringUtils.defaultString(model.getMemberPhone(),"-"));
+ model.setRecName(StringUtils.defaultString(model.getRecNickname(),"")+" / "
+ +StringUtils.defaultString(model.getRecName(),"-")+" / "
+ +StringUtils.defaultString(model.getRecPhone(),"-"));
}
}
- return PageData.from(inviteRecordMapper.selectPage(page, queryWrapper));
+ return PageData.from(result);
}
@Override
@@ -230,9 +258,6 @@
QueryWrapper<InviteRecord> wrapper = new QueryWrapper<>(inviteRecord);
return inviteRecordMapper.selectCount(wrapper);
}
-
-
-
--
Gitblit v1.9.3