From c6899e1be764cb94d340a14b08f8c8f8880fb818 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:06:50 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index 6783958..e4a8c6c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -72,7 +72,7 @@
continue;
}
List<OrderGood> orderGoods = orderGoodService.list(new LambdaQueryWrapper<OrderGood>()
- .eq(OrderGood::getGoodsId, order.getId()));
+ .eq(OrderGood::getOrderId, order.getId()));
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
//直推上级分佣金额
BigDecimal ztsj_price = BigDecimal.ZERO;
@@ -239,9 +239,9 @@
shop.setBalance(shop.getBalance().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
}
if(hxmd_point > 0){
- shopAppUser.setSharePoint(shopAppUser.getSharePoint() + hxmd_point);
shopAppUser.setLavePoint(shopAppUser.getLavePoint() + hxmd_point);
shopAppUser.setTotalPoint(shopAppUser.getTotalPoint() + hxmd_point);
+ shopAppUser.setShopSharePoint(shopAppUser.getShopSharePoint() + bdmdsj_point);
//门店返佣
shop.setShopAllPoint(shop.getShopAllPoint() + hxmd_point);
shop.setServerPoint(shop.getServerPoint() + hxmd_point);
@@ -308,26 +308,28 @@
//技师服务积分
if(order.getOrderType() == 1){
Technician technician = technicianClient.shopdetail(order.getTechnicianId()).getData();
- AppUser technicianAppUser = appUserClient.getAppUserById(technician.getAppUserId());
- Integer lavePoint = technicianAppUser.getLavePoint();
- if(js_point > 0){
- technicianAppUser.setLavePoint(technicianAppUser.getLavePoint() + js_point);
- technicianAppUser.setTotalPoint(technicianAppUser.getTotalPoint() + js_point);
- technicianAppUser.setTotalPerformancePoint(technicianAppUser.getTotalPerformancePoint() + js_point);
- }
- appUserClient.editAppUserById(technicianAppUser);
- //添加积分明细
- if(!technicianAppUser.getLavePoint().equals(lavePoint)){
- UserPoint userPoint = new UserPoint();
- userPoint.setType(10);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(js_point);
- userPoint.setBalance(technicianAppUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(technicianAppUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention(order.getOrderNumber());
- userPointClient.saveUserPoint(userPoint);
+ if(null != technician){
+ AppUser technicianAppUser = appUserClient.getAppUserById(technician.getAppUserId());
+ Integer lavePoint = technicianAppUser.getLavePoint();
+ if(js_point > 0){
+ technicianAppUser.setLavePoint(technicianAppUser.getLavePoint() + js_point);
+ technicianAppUser.setTotalPoint(technicianAppUser.getTotalPoint() + js_point);
+ technicianAppUser.setTotalPerformancePoint(technicianAppUser.getTotalPerformancePoint() + js_point);
+ }
+ appUserClient.editAppUserById(technicianAppUser);
+ //添加积分明细
+ if(!technicianAppUser.getLavePoint().equals(lavePoint)){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(10);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(js_point);
+ userPoint.setBalance(technicianAppUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(technicianAppUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention(order.getOrderNumber());
+ userPointClient.saveUserPoint(userPoint);
+ }
}
}
@@ -352,9 +354,9 @@
shop1.setBalance(shop1.getBalance().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
}
if(bdmd_point > 0){
- bdShopAppUser.setSharePoint(bdShopAppUser.getSharePoint() + bdmd_point);
bdShopAppUser.setLavePoint(bdShopAppUser.getLavePoint() + bdmd_point);
bdShopAppUser.setTotalPoint(bdShopAppUser.getTotalPoint() + bdmd_point);
+ bdShopAppUser.setShopSharePoint(bdShopAppUser.getShopSharePoint() + bdmdsj_point);
//门店返佣
shop1.setShopAllPoint(shop1.getShopAllPoint() + bdmd_point);
shop1.setSharePoint(shop1.getSharePoint() + bdmd_point);
@@ -440,13 +442,12 @@
shop2.setBalance(shop2.getBalance().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
}
if(bdmdsj_point > 0){
- sjShopAppUser.setSharePoint(sjShopAppUser.getSharePoint() + bdmdsj_point);
sjShopAppUser.setLavePoint(sjShopAppUser.getLavePoint() + bdmdsj_point);
sjShopAppUser.setTotalPoint(sjShopAppUser.getTotalPoint() + bdmdsj_point);
sjShopAppUser.setShopSharePoint(sjShopAppUser.getShopSharePoint() + bdmdsj_point);
//门店返佣
shop2.setShopAllPoint(shop2.getShopAllPoint() + bdmdsj_point);
- shop2.setSharePoint(shop2.getSharePoint() + bdmdsj_point);
+ shop2.setLowerLevelSharePoint(shop2.getLowerLevelSharePoint() + bdmdsj_point);
shop2.setLavePoint(shop2.getLavePoint() + bdmdsj_point);
}
appUserClient.editAppUserById(sjShopAppUser);
@@ -507,7 +508,8 @@
}
}
}
-
+ order.setIsCommission(1);
+ orderService.updateById(order);
}
--
Gitblit v1.7.1