From ea6bf9042d9ad4faaf328bdc68a41ef36b47f13d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 20:09:55 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 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 e6a2346..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
@@ -328,8 +328,21 @@
orderPageListVo.setUserName(appUser.getName());
orderPageListVo.setPhone(appUser.getPhone());
}
- 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.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);
}
@@ -366,8 +379,6 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
@Override
--
Gitblit v1.7.1