From c8daa9e8958f5dd4d2e2de5f6560f7f1e3065786 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 4 ++--
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 12 ++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 4b7cb2e..a6fe964 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -175,14 +175,18 @@
@ApiModelProperty(value = "注册积分总数")
@TableField("total_register_point")
private Integer totalRegisterPoint;
-
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_achievement_point")
- private Integer shopAchievementPoint;
+
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("shop_share_point")
private Integer shopSharePoint;
+
+ @ApiModelProperty(value = "门店业绩积分")
+ @TableField("shop_achievement_point")
+ private Integer shopAchievementPoint;
@ApiModelProperty(value = "门店服务费（门店核销获得）")
@TableField("shop_service_fee")
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 e4a8c6c..8226ac2 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
@@ -241,7 +241,7 @@
if(hxmd_point > 0){
shopAppUser.setLavePoint(shopAppUser.getLavePoint() + hxmd_point);
shopAppUser.setTotalPoint(shopAppUser.getTotalPoint() + hxmd_point);
- shopAppUser.setShopSharePoint(shopAppUser.getShopSharePoint() + bdmdsj_point);
+ shopAppUser.setShopAchievementPoint(shopAppUser.getShopAchievementPoint() + bdmdsj_point);
//门店返佣
shop.setShopAllPoint(shop.getShopAllPoint() + hxmd_point);
shop.setServerPoint(shop.getServerPoint() + hxmd_point);
@@ -444,7 +444,7 @@
if(bdmdsj_point > 0){
sjShopAppUser.setLavePoint(sjShopAppUser.getLavePoint() + bdmdsj_point);
sjShopAppUser.setTotalPoint(sjShopAppUser.getTotalPoint() + bdmdsj_point);
- sjShopAppUser.setShopSharePoint(sjShopAppUser.getShopSharePoint() + bdmdsj_point);
+ sjShopAppUser.setLowerLevelSharePoint(sjShopAppUser.getLowerLevelSharePoint() + bdmdsj_point);
//门店返佣
shop2.setShopAllPoint(shop2.getShopAllPoint() + bdmdsj_point);
shop2.setLowerLevelSharePoint(shop2.getLowerLevelSharePoint() + bdmdsj_point);
--
Gitblit v1.7.1