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 |    2 +-
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java                    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index a4d8e97..afc03e9 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -98,9 +98,9 @@
     @TableField("shop_all_point")
     private Integer shopAllPoint;
 
-    @ApiModelProperty(value = "门店业绩积分")
-    @TableField("shop_point")
-    private Integer shopPoint;
+    @ApiModelProperty(value = "绑定下级门店分佣积分")
+    @TableField("lower_level_share_point")
+    private Integer lowerLevelSharePoint;
 
     @ApiModelProperty(value = "门店返佣积分")
     @TableField("share_point")
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 d55f36b..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
@@ -447,7 +447,7 @@
                         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);

--
Gitblit v1.7.1