From 75e5b1458b320b048f84093d481adaf82cec2cdb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 16:02:28 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 1a298c0..fafe3d7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -444,8 +444,7 @@
}
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- orderDetailVo.setLeaderLatitude(orderInfo.getLeaderLatitude());
- orderDetailVo.setLeaderLongitude(orderInfo.getLeaderLongitude());
+
// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
// orderDetailVo.setExpressNo(expressInfo.getExpressNo());
@@ -492,7 +491,8 @@
MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
- mallLeaderAchieve.setAmount(orderInfo.getAmount());
+ BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
+ mallLeaderAchieve.setAmount(subtract);
mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
mallLeaderAchieveMapper.insert(mallLeaderAchieve);
--
Gitblit v1.9.1