From 37235c82903aaf4e7efe3096174f4a4f6430caef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 09:41:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 6 +++---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
index fff54b2..6545aff 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
@@ -76,7 +76,7 @@
@ApiModelProperty(value = "获取返佣积分上级类型（1=直推上级，2=直帮上级）")
@TableField("superior_type")
- private Integer superiorType;
+ private String superiorType;
@ApiModelProperty(value = "获取分佣金额上级类型（1=直推上级，2=直帮上级）")
@TableField("superior_price_type")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
index dbf7ed5..df3d45f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -56,7 +56,7 @@
/**
* 获取返佣积分上级类型（1=直推上级，2=直帮上级）
*/
- private Integer superiorType;
+ private String superiorType;
/**
* 核销门店可获得服务费
*/
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java
index 729ea24..c834d14 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java
@@ -41,7 +41,7 @@
/**
* 获取返佣积分上级类型（1=直推上级，2=直帮上级）
*/
- private Integer superiorType;
+ private String superiorType;
/**
* 核销门店可获得服务费
*/
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 b31cce9..4bedbeb 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
@@ -95,8 +95,8 @@
for (OrderGood og : v) {// 累计分销金额
// 直推上级分佣金额
- Integer superiorType = og.getSuperiorType();
- if (superiorType == 1 && inviteUser != null){
+ String superiorType = og.getSuperiorType();
+ if (superiorType.contains("1") && inviteUser != null){
// 分佣金额
BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
BigDecimal totalDistributionAmount = inviteUser.getTotalDistributionAmount();
@@ -112,7 +112,7 @@
appUserClient.editAppUserById(inviteUser);
}else
// 直帮上级分佣金额
- if (superiorType == 2 && superiorLeader != null){
+ if (superiorType.contains("2") && superiorLeader != null){
// 分佣金额
BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
BigDecimal totalDistributionAmount = superiorLeader.getTotalDistributionAmount();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 9519d05..08a06b7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -258,7 +258,7 @@
price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints());
price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsSeckill.getSuperiorRebatePoints());
- price.setSuperiorType(goodsSeckill.getSuperiorType());
+ price.setSuperiorType(String.valueOf(goodsSeckill.getSuperiorType()));
price.setServuceShopCharges(goodsSeckill.getServuceShopCharges());
price.setServuceShopPoints(goodsSeckill.getServuceShopPoints());
price.setTechnicianPoints(goodsSeckill.getTechnicianPoints());
--
Gitblit v1.7.1