From 54abb5ddf28802b9a89061e921472e71e5e974cc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 19 十月 2023 17:57:50 +0800
Subject: [PATCH] #路径拼接
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0ccacd2..061060b 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,6 +227,7 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date limit 1) as memberRidesStatus");
IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
goodsorderIPage.getRecords().forEach(s->{
@@ -523,7 +524,7 @@
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
refundDTO.setCanBalance(canBalance);
- refundDTO.setRefundAmount(money);
+ refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setCreator(principal.getId());
@@ -550,11 +551,11 @@
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
GoodsorderCanBanlanceDTO goodsorderCanBanlanceDTO = new GoodsorderCanBanlanceDTO();
- goodsorderCanBanlanceDTO.setGoodsorderMoney(goodsorder.getMoney());
- goodsorderCanBanlanceDTO.setCloseMoney(goodsorder.getCloseMoney());
+ goodsorderCanBanlanceDTO.setGoodsorderMoney( Constants.translateMoney(goodsorder.getMoney()));
+ goodsorderCanBanlanceDTO.setCloseMoney(Constants.translateMoney(goodsorder.getCloseMoney()));
BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0);
- goodsorderCanBanlanceDTO.setHasRefundMoney(reduce);
- goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney()));
+ goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce));
+ goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney()));
return goodsorderCanBanlanceDTO;
}
--
Gitblit v1.9.3