From 7ead43f1a1eba46fa324fda11219736e0fa3ced4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 14:09:44 +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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..65a4cd2 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,12 +251,12 @@
@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());
if (!check){
- throw new ServiceException("订单不存在");
+ throw new ServiceException("该订单与当前扫码门店不一致");
}
// 售后设置
@@ -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);
}
@@ -330,6 +332,11 @@
}
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"));
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
+
+ // 平台分佣
+ 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);
}
@@ -366,8 +373,6 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
@Override
@@ -592,6 +597,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
}
order.setRefundStatus(2);
--
Gitblit v1.7.1