From 68e7d31bc6d6c4a84ffb4b423c1ccd211f16f949 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 09:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 8b042a8..579cf54 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
@@ -251,7 +251,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String id,Integer shopId, Integer technicianId) {
+ public void writeOff(String id, Integer shopId, String technicianId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
Order order = orderMapper.selectById(id);
boolean check = check(order, shopId, loginUserApplet.getUserid());
@@ -276,7 +276,9 @@
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
order.setCancellerAppUserId(loginUserApplet.getUserid());
- order.setTechnicianId(technicianId);
+ if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
+ order.setTechnicianId(Integer.valueOf(technicianId));
+ }
orderMapper.updateById(order);
}
@@ -332,17 +334,10 @@
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));
+ // 平台分佣
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), Long.valueOf(orderPageListVo.getId())).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderPageListVo.setGetCommission(reduce);
}
return pageInfo.setRecords(list);
}
@@ -603,6 +598,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
}
order.setRefundStatus(2);
--
Gitblit v1.7.1