From 07d470e55405cbfab1a7d38eeeb8907e741401df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 20:13:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 6274b40..8b042a8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -330,8 +330,19 @@
}
// RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one();
-
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
+
+ List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
+ .eq(OrderGood::getOrderId, orderPageListVo.getId()));
+ BigDecimal servuceShopCharges = BigDecimal.ZERO;
+ BigDecimal boundShopCharges = BigDecimal.ZERO;
+ for (OrderGood orderGood : orderGoods) {
+ if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){
+ servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges());
+ }
+ boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges());
+ }
+ orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges));
}
return pageInfo.setRecords(list);
}
@@ -368,8 +379,6 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
@Override
--
Gitblit v1.7.1