diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java index 86de9266..9572f390 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java @@ -62,7 +62,7 @@ public class ApiCuMemberBonusController extends BaseController { } /** - * 新零售日结奖金:查询会员奖金列表 + * 日结奖金:查询会员奖金列表 -- 众康使用 */ @PostMapping("/query-bonus-first") public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) { @@ -80,7 +80,7 @@ public class ApiCuMemberBonusController extends BaseController { } /** - * 新零售日结奖金:查询会员昨日奖金汇总 + * 日结奖金:查询会员昨日奖金汇总 -- 众康使用 */ @PostMapping("/query-bonus-total") public TableDataInfo lisBonusTotal(@RequestBody BonusParam bonusParam) { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 8dc67205..dbe7514d 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -119,7 +119,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl + @@ -311,7 +312,8 @@ cb.global_points, cb.retail_range_income, cb.retail_same_level_income, -cb.real_income_total, + cb.real_income_total, + cb.back_points, cb.pk_rate, bc.out_exchange_rate, cm.pk_vertex, @@ -396,6 +398,7 @@ cb.real_income_total, nvl( sum( cb.global_points ), 0 ) global_points, nvl( sum( cb.retail_range_income ), 0 ) retail_range_income, nvl( sum( cb.retail_same_level_income ), 0 ) retail_same_level_income, + nvl( sum( cb.back_points ), 0 ) back_points, sum(cb.real_income_total) real_income_total, bc.out_exchange_rate from cu_member_bonus cb @@ -474,6 +477,7 @@ cb.real_income_total, sum(cb.store_income) store_income, sum(cb.retail_range_income) retail_range_income, sum(cb.retail_same_level_income) retail_same_level_income, + sum(cb.back_points) back_points, sum(cb.real_income_total) real_income_total from cu_member_bonus cb inner join cu_member_settle_period cp diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java index 73ec7b55..ec9eae94 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java @@ -20,7 +20,7 @@ public enum EBonusItems { /** * 直推收益 -- 精品专区 */ - DIRECT_INCOME(20, "直推收益", 0), + DIRECT_INCOME(20, "直推收益", 1), /** * 阶段收益 -- 精品专区、商城专区 */