From 0046d701fb2878895359b0ffe7a5354c4ccab7e4 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 18 十月 2023 16:07:09 +0800
Subject: [PATCH] 管理端
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 28ec670..2ed8c62 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -227,7 +227,15 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
+ IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
+ if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
+ goodsorderIPage.getRecords().forEach(s->{
+ s.setMoney(Constants.translateMoney(s.getMoney()));
+ s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
+ s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ });
+ }
+ return PageData.from(goodsorderIPage);
}
@@ -633,7 +641,7 @@
memberRidesResponse.setUnitTime(s.getUnitTime());
if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
//濡傛灉鏄獞琛屼腑
- s.setDuration(rideTime> finalFreeTime ?(rideTime- finalFreeTime):0);
+ s.setDuration(rideTime> finalFreeTime ?(rideTime):0);
}
s.setRideTime(rideTime);
return memberRidesResponse;
--
Gitblit v1.9.3