From d06c577a634528b11bc4b83c2769f48992913cad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十月 2023 09:07:30 +0800
Subject: [PATCH] 修复bug
---
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index 4218801..be2807e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -6,9 +6,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.join.RefundJoinMapper;
-import com.doumee.dao.business.model.Goodsorder;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Refund;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.RefundPlatExportVO;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.system.model.SystemUser;
@@ -18,6 +16,7 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +25,7 @@
import java.sql.Ref;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 閫�娆句俊鎭〃Service瀹炵幇
@@ -88,7 +88,7 @@
@Override
public Refund findOne(Refund refund) {
QueryWrapper<Refund> wrapper = new QueryWrapper<>(refund);
- return refundMapper.selectOne(wrapper);
+ return refundMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -96,7 +96,7 @@
QueryWrapper<Refund> wrapper = new QueryWrapper<>(refund);
return refundMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Refund> findPlatPage(PageWrap<Refund> pageWrap) {
pageWrap.getModel().setTypeList(new ArrayList<>());
@@ -106,6 +106,10 @@
pageWrap.getModel().setStatus(Constants.TWO);
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Refund> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
+ ,SystemUser::getRealname
+ ,pageWrap.getModel().getCreatorName());
+
return PageData.from(refundJoinMapper.selectJoinPage(page, Refund.class,queryWrapper));
}
@Override
@@ -149,10 +153,18 @@
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId ,Refund::getCreator);
//鏃堕棿娈电瓫閫�
- queryWrapper.ge(model.getStartDate()!=null, Refund::getDoneDate, model.getStartDate());
- queryWrapper.le(model.getEndDate()!=null, Refund::getDoneDate, model.getEndDate());
+ if (Objects.nonNull(model.getStartDate())) {
+ queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
+ }
+ if (Objects.nonNull(model.getEndDate())) {
+ queryWrapper.le(Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
+ }
+// queryWrapper.ge(model.getStartDate()!=null, Refund::getDoneDate, model.getStartDate());
+// queryWrapper.le(model.getEndDate()!=null, Refund::getDoneDate, model.getEndDate());
queryWrapper.eq(model.getCreator() !=null,Refund::getCreator,model.getCreator());
queryWrapper.eq(model.getStatus() !=null,Refund::getStatus,model.getStatus());
+ queryWrapper.in(model.getTypeList() !=null,Refund::getType,model.getTypeList());
+ queryWrapper.eq(model.getType() !=null,Refund::getType,model.getType());
queryWrapper.like(model.getPayOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getPayOnlineOrderid());
queryWrapper.like(model.getOnlineOrderid() !=null,Refund::getOnlineOrderid,model.getOnlineOrderid());
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
--
Gitblit v1.9.3