From 32a43e602e4a78478781532d31fbc38755188df7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:15 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/DiscountLogServiceImpl.java | 74 +++++++++++-------------------------
1 files changed, 23 insertions(+), 51 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountLogServiceImpl.java
index bebd94a..fddabd9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountLogServiceImpl.java
@@ -1,20 +1,26 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DiscountLogMapper;
import com.doumee.dao.business.model.DiscountLog;
+import com.doumee.dao.business.model.DiscountMember;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.DiscountLogService;
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.lang.StringUtils;
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瀹炵幇
@@ -87,60 +93,26 @@
@Override
public PageData<DiscountLog> findPage(PageWrap<DiscountLog> pageWrap) {
IPage<DiscountLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<DiscountLog> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<DiscountLog> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(DiscountLog::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(DiscountLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(DiscountLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(DiscountLog::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(DiscountLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(DiscountLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(DiscountLog::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(DiscountLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(DiscountLog::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getDiscountMemberId() != null) {
- queryWrapper.lambda().eq(DiscountLog::getDiscountMemberId, pageWrap.getModel().getDiscountMemberId());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DiscountLog::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getRideTime() != null) {
- queryWrapper.lambda().eq(DiscountLog::getRideTime, pageWrap.getModel().getRideTime());
- }
- if (pageWrap.getModel().getRidePrice() != null) {
- queryWrapper.lambda().eq(DiscountLog::getRidePrice, pageWrap.getModel().getRidePrice());
- }
- if (pageWrap.getModel().getEditInfo() != null) {
- queryWrapper.lambda().eq(DiscountLog::getEditInfo, pageWrap.getModel().getEditInfo());
- }
- if (pageWrap.getModel().getEditDays() != null) {
- queryWrapper.lambda().eq(DiscountLog::getEditDays, pageWrap.getModel().getEditDays());
- }
- if (pageWrap.getModel().getGoodsorderId() != null) {
- queryWrapper.lambda().eq(DiscountLog::getGoodsorderId, pageWrap.getModel().getGoodsorderId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ DiscountLog model = pageWrap.getModel();
+ queryWrapper.selectAll(DiscountLog.class)
+ .selectAs(SystemUser::getRealname,DiscountLog::getCreatorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,DiscountLog::getCreator)
+ .eq(DiscountLog::getIsdeleted, Constants.ZERO)
+ .eq(Objects.nonNull(model.getType()),DiscountLog::getType,model.getType())
+ .eq(StringUtils.isNotBlank(model.getDiscountMemberId()),DiscountLog::getDiscountMemberId,model.getDiscountMemberId());
+ PageData<DiscountLog> pageData = PageData.from(discountLogMapper.selectJoinPage(page, DiscountLog.class,queryWrapper));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageData.getRecords())){
+ for (DiscountLog discountLog:pageData.getRecords()) {
+ if(Constants.equalsInteger(discountLog.getType(),Constants.ZERO)&&Objects.nonNull(discountLog.getRidePrice())){
+ discountLog.setRidePrice(
+ Constants.translateMoney(discountLog.getRidePrice())
+ );
+ }
}
}
- return PageData.from(discountLogMapper.selectPage(page, queryWrapper));
+ return pageData;
}
@Override
--
Gitblit v1.9.3