From 000c62b9a5b19197fcd93db6382841cedb0c4537 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 18:37:27 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java |  134 ++++++--------------------------------------
 1 files changed, 20 insertions(+), 114 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 135d83f..a67d18e 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
@@ -4,17 +4,24 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.DiscountMemberMapper;
+import com.doumee.dao.business.join.DiscountMemberJoinMapper;
+import com.doumee.dao.business.model.Discount;
 import com.doumee.dao.business.model.DiscountMember;
+import com.doumee.dao.business.model.Member;
 import com.doumee.service.business.DiscountMemberService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 鐢ㄦ埛楠戣濂楅鍗″叧鑱旇〃Service瀹炵幇
@@ -26,6 +33,9 @@
 
     @Autowired
     private DiscountMemberMapper discountMemberMapper;
+
+    @Autowired
+    private DiscountMemberJoinMapper discountMemberJoinMapper;
 
     @Override
     public String create(DiscountMember discountMember) {
@@ -87,121 +97,17 @@
     @Override
     public PageData<DiscountMember> findPage(PageWrap<DiscountMember> pageWrap) {
         IPage<DiscountMember> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<DiscountMember> queryWrapper = new QueryWrapper<>();
+        MPJLambdaWrapper<DiscountMember> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getId, pageWrap.getModel().getId());
-        }
-        if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(DiscountMember::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
-        }
-        if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getCreator, pageWrap.getModel().getCreator());
-        }
-        if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(DiscountMember::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
-        }
-        if (pageWrap.getModel().getEditor() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getEditor, pageWrap.getModel().getEditor());
-        }
-        if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getIsdeleted, pageWrap.getModel().getIsdeleted());
-        }
-        if (pageWrap.getModel().getInfo() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getInfo, pageWrap.getModel().getInfo());
-        }
-        if (pageWrap.getModel().getCode() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getCode, pageWrap.getModel().getCode());
-        }
-        if (pageWrap.getModel().getName() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getName, pageWrap.getModel().getName());
-        }
-        if (pageWrap.getModel().getType() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getType, pageWrap.getModel().getType());
-        }
-        if (pageWrap.getModel().getLimitType() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getLimitType, pageWrap.getModel().getLimitType());
-        }
-        if (pageWrap.getModel().getLimitTime() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getLimitTime, pageWrap.getModel().getLimitTime());
-        }
-        if (pageWrap.getModel().getPrice() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getPrice, pageWrap.getModel().getPrice());
-        }
-        if (pageWrap.getModel().getLinePrice() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getLinePrice, pageWrap.getModel().getLinePrice());
-        }
-        if (pageWrap.getModel().getChannel() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getChannel, pageWrap.getModel().getChannel());
-        }
-        if (pageWrap.getModel().getImgurl() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getImgurl, pageWrap.getModel().getImgurl());
-        }
-        if (pageWrap.getModel().getDescs() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getDescs, pageWrap.getModel().getDescs());
-        }
-        if (pageWrap.getModel().getContent() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getContent, pageWrap.getModel().getContent());
-        }
-        if (pageWrap.getModel().getStartDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
-            queryWrapper.lambda().le(DiscountMember::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
-        }
-        if (pageWrap.getModel().getEndDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
-            queryWrapper.lambda().le(DiscountMember::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
-        }
-        if (pageWrap.getModel().getUseType() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getUseType, pageWrap.getModel().getUseType());
-        }
-        if (pageWrap.getModel().getUseStartDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getUseStartDate, Utils.Date.getStart(pageWrap.getModel().getUseStartDate()));
-            queryWrapper.lambda().le(DiscountMember::getUseStartDate, Utils.Date.getEnd(pageWrap.getModel().getUseStartDate()));
-        }
-        if (pageWrap.getModel().getUseEndDate() != null) {
-            queryWrapper.lambda().ge(DiscountMember::getUseEndDate, Utils.Date.getStart(pageWrap.getModel().getUseEndDate()));
-            queryWrapper.lambda().le(DiscountMember::getUseEndDate, Utils.Date.getEnd(pageWrap.getModel().getUseEndDate()));
-        }
-        if (pageWrap.getModel().getUseDays() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getUseDays, pageWrap.getModel().getUseDays());
-        }
-        if (pageWrap.getModel().getUseHoliday() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getUseHoliday, pageWrap.getModel().getUseHoliday());
-        }
-        if (pageWrap.getModel().getUseWorkday() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getUseWorkday, pageWrap.getModel().getUseWorkday());
-        }
-        if (pageWrap.getModel().getSaleLimit() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getSaleLimit, pageWrap.getModel().getSaleLimit());
-        }
-        if (pageWrap.getModel().getSaleDayLimit() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getSaleDayLimit, pageWrap.getModel().getSaleDayLimit());
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getStatus, pageWrap.getModel().getStatus());
-        }
-        if (pageWrap.getModel().getMemberId() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getMemberId, pageWrap.getModel().getMemberId());
-        }
-        if (pageWrap.getModel().getGoodsorderId() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getGoodsorderId, pageWrap.getModel().getGoodsorderId());
-        }
-        if (pageWrap.getModel().getIsbike() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getIsbike, pageWrap.getModel().getIsbike());
-        }
-        if (pageWrap.getModel().getIselecbike() != null) {
-            queryWrapper.lambda().eq(DiscountMember::getIselecbike, pageWrap.getModel().getIselecbike());
-        }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
-        return PageData.from(discountMemberMapper.selectPage(page, queryWrapper));
+        DiscountMember model = pageWrap.getModel();
+        queryWrapper.selectAll(DiscountMember.class)
+                .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);
+        return PageData.from(discountMemberJoinMapper.selectJoinPage(page, DiscountMember.class,queryWrapper));
     }
 
     @Override

--
Gitblit v1.9.3