From 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期五, 03 十一月 2023 15:36:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 4 ++-- 1 files changed, 2 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 220ff41..bcf3b1e 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 @@ -176,7 +176,7 @@ goodsorderExportVOIPage.getRecords().forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); - s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); + s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); }); } return PageData.from(goodsorderExportVOIPage); @@ -189,7 +189,7 @@ if (!CollectionUtils.isEmpty(goodsorderList)){ goodsorderList.forEach(s->{ s.setMoney(Constants.translateMoney(s.getMoney())); - s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); + s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()).compareTo(s.getMoney()) > 0 ? s.getMoney() : Constants.translateMoney(s.getCloseMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); }); } -- Gitblit v1.9.3