From 19d17f0f0fb02f46342d70b5180e40a0ad1b66d3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十一月 2023 18:16:13 +0800
Subject: [PATCH] MrShi
---
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 be2807e..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
@@ -106,11 +106,17 @@
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())
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
,SystemUser::getRealname
,pageWrap.getModel().getCreatorName());
-
- return PageData.from(refundJoinMapper.selectJoinPage(page, Refund.class,queryWrapper));
+ 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) {
@@ -128,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));
@@ -168,6 +175,7 @@
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