From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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 c9eff3b..8fac0ca 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瀹炵幇
@@ -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,7 +106,17 @@
pageWrap.getModel().setStatus(Constants.TWO);
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Refund> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- return PageData.from(refundJoinMapper.selectJoinPage(page, Refund.class,queryWrapper));
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
+ ,SystemUser::getRealname
+ ,pageWrap.getModel().getCreatorName());
+ IPage<Refund> refundIPage = refundJoinMapper.selectJoinPage(page, Refund.class, queryWrapper);
+ if (!CollectionUtils.isEmpty(refundIPage.getRecords())){
+ refundIPage.getRecords().forEach(s->{
+ s.setMoney(Constants.translateMoney(s.getMoney()));
+ s.setCanBalance(Constants.translateMoney(s.getCanBalance()));
+ });
+ }
+ return PageData.from(refundIPage);
}
@Override
public List<RefundPlatExportVO> findPlatExportPage( Refund pageWrap) {
@@ -124,6 +134,7 @@
for(Refund order : list){
RefundPlatExportVO vo = new RefundPlatExportVO();
vo.setId(order.getId());
+ vo.setObjId(order.getObjId());
vo.setOpenid(order.getOpenid());
vo.setDoneDate(order.getDoneDate());
vo.setMoney(Constants.formatDecimalNum(order.getMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
@@ -149,13 +160,22 @@
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());
+ queryWrapper.like(model.getCreatorName() !=null,SystemUser::getRealname,model.getCreatorName());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(Refund::getDoneDate);
return queryWrapper;
--
Gitblit v1.9.3