From bbb91a74286c6b9d08d65f1f043eb6f00119a542 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 12 Jun 2025 15:22:38 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=9B=B4=E6=8E=A8=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E3=80=81=E5=B9=B3=E7=BA=A7=E6=94=B6=E7=9B=8A=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberBonusController.java | 64 +-- .../bonus/service/impl/BonusSettleHandle.java | 52 +-- .../service/impl/BonusSettleRangeHandle.java | 24 +- .../hzs/bonus/bonus/vo/CuMemberBonusVO.java | 426 +++--------------- .../bonus/bonus/CuMemberBonusMapper.xml | 11 +- .../manage/BdBonusItemsController.java | 168 +++---- .../core/constant/msg/BonusMsgConstants.java | 15 +- .../common/core/enums/EBonusIncomeStatus.java | 8 +- .../domain/member/bonus/CuMemberBonus.java | 4 +- .../member/statis/CuBonusVertexStatis.java | 2 +- .../system/config/ext/BdBonusItemsExt.java | 18 +- 11 files changed, 185 insertions(+), 607 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java index a345f65d..0dd971d8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java @@ -76,11 +76,11 @@ public class CuMemberBonusController extends BaseController { */ @AccessPermissions("totalBonus") @PostMapping("/query-bonus-total") - @Log(module = EOperationModule.BONUS_TOTAL,business = EOperationBusiness.BONUS_TOTAL , method = EOperationMethod.SELECT) + @Log(module = EOperationModule.BONUS_TOTAL, business = EOperationBusiness.BONUS_TOTAL, method = EOperationMethod.SELECT) @ColumnAuthority(perms = "totalBonus") - public TableDataInfo listBonusTotal(@RequestBody BonusParam bonusParam){ - List pkVertex=new ArrayList<>(); - if(StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())){ + public TableDataInfo listBonusTotal(@RequestBody BonusParam bonusParam) { + List pkVertex = new ArrayList<>(); + if (StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())) { pkVertex = Arrays.stream(bonusParam.getPkBdVertexStr().split(",")) .map(Integer::parseInt) .collect(Collectors.toList()); @@ -99,10 +99,10 @@ public class CuMemberBonusController extends BaseController { * 分页查询会员某个时间段内的奖金汇总 */ @PostMapping("/export-bonus-total") - @Log(module = EOperationModule.BONUS_TOTAL,business = EOperationBusiness.BONUS_TOTAL , method = EOperationMethod.EXPORT) - public void exportBonusTotal(HttpServletResponse response, BonusParam bonusParam){ - List pkVertex=new ArrayList<>(); - if(StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())){ + @Log(module = EOperationModule.BONUS_TOTAL, business = EOperationBusiness.BONUS_TOTAL, method = EOperationMethod.EXPORT) + public void exportBonusTotal(HttpServletResponse response, BonusParam bonusParam) { + List pkVertex = new ArrayList<>(); + if (StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())) { pkVertex = Arrays.stream(bonusParam.getPkBdVertexStr().split(",")) .map(Integer::parseInt) .collect(Collectors.toList()); @@ -121,7 +121,7 @@ public class CuMemberBonusController extends BaseController { List totalVoList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { BonusTotalVO bonusTotalVO = BeanUtil.copyProperties(cuMemberBonus, BonusTotalVO.class); - for(String key : CuMemberBonusVO.INCOME_ARRAY){ + for (String key : CuMemberBonusVO.INCOME_ARRAY) { ReflectUtils.invokeSetter(bonusTotalVO, key + BonusFieldConstants.INCOME_SUFFIX, ComputeUtil.computeMultiply(ReflectUtils.invokeGetter(cuMemberBonus, key), cuMemberBonus.getOutExchangeRate())); } totalVoList.add(bonusTotalVO); @@ -135,9 +135,9 @@ public class CuMemberBonusController extends BaseController { @AccessPermissions("BonusDetail") @PostMapping("/query-bonus-detail") @Log(module = EOperationModule.BONUS_DETAIL, method = EOperationMethod.SELECT) - public TableDataInfo listBonus(@RequestBody BonusParam bonusParam){ - List pkVertex=new ArrayList<>(); - if(StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())){ + public TableDataInfo listBonus(@RequestBody BonusParam bonusParam) { + List pkVertex = new ArrayList<>(); + if (StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())) { pkVertex = Arrays.stream(bonusParam.getPkBdVertexStr().split(",")) .map(Integer::parseInt) .collect(Collectors.toList()); @@ -145,16 +145,16 @@ public class CuMemberBonusController extends BaseController { bonusParam.setPkVertexList(pkVertex); bonusParam.setPkCountry(SecurityUtils.getPkCountry()); //获取管理员权限《角色地区范围、 体系列表、团队列表) - Date date=DateUtils.currentDate(); - if(bonusParam.getStartDate()==null||bonusParam.getEndDate()==null){ + Date date = DateUtils.currentDate(); + if (null == bonusParam.getStartDate() || null == bonusParam.getEndDate()) { bonusParam.setStartDate(DateUtils.currentMonthFirstDate()); - bonusParam.setEndDate(DateUtils.beforeDate(1, ChronoUnit.DAYS,date)); + bonusParam.setEndDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); } packageBonusParam(bonusParam); startPage(); List cuMemberBonusExtList = cuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam); - CuMemberBonusExt cmb =cuMemberBonusService.queryMemberBonusByConditionForServerSum(bonusParam); - if(cmb!=null){ + CuMemberBonusExt cmb = cuMemberBonusService.queryMemberBonusByConditionForServerSum(bonusParam); + if (cmb != null) { cmb.setMemberCode("合计"); cuMemberBonusExtList.add(cmb); } @@ -169,9 +169,9 @@ public class CuMemberBonusController extends BaseController { */ @PostMapping("/export-bonus-detail") @Log(module = EOperationModule.BONUS_DETAIL, method = EOperationMethod.SELECT) - public void exportBonusDetail(HttpServletResponse response, BonusParam bonusParam){ - List pkVertex=new ArrayList<>(); - if(StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())){ + public void exportBonusDetail(HttpServletResponse response, BonusParam bonusParam) { + List pkVertex = new ArrayList<>(); + if (StringUtils.isNotEmpty(bonusParam.getPkBdVertexStr())) { pkVertex = Arrays.stream(bonusParam.getPkBdVertexStr().split(",")) .map(Integer::parseInt) .collect(Collectors.toList()); @@ -182,20 +182,20 @@ public class CuMemberBonusController extends BaseController { List cuMemberBonusExtList = cuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam); CuMemberBonusExt cuMemberBonusExt = cuMemberBonusService.initCuMemberBonus(); cuMemberBonusExt.setMemberCode("小计："); - if(CollectionUtil.isNotEmpty(cuMemberBonusExtList)) { + if (CollectionUtil.isNotEmpty(cuMemberBonusExtList)) { cuMemberBonusExt.setOutExchangeRate(cuMemberBonusExtList.get(0).getOutExchangeRate()); for (CuMemberBonusExt memberBonusExt : cuMemberBonusExtList) { cuMemberBonusService.calculateBonusTotal(cuMemberBonusExt, memberBonusExt); } } cuMemberBonusExtList.add(cuMemberBonusExt); - List cuMemberBonusVoList = getBonusDetail(cuMemberBonusExtList); + List cuMemberBonusVoList = getBonusDetail(cuMemberBonusExtList); Map bonusDetail = menuColumnServiceApi.queryMenuColumn("BonusDetail", SecurityUtils.getUserId()).getData(); - ExcelUtil util = new ExcelUtil<>(CuMemberBonusVO.class,bonusDetail); + ExcelUtil util = new ExcelUtil<>(CuMemberBonusVO.class, bonusDetail); util.exportExcel(response, cuMemberBonusVoList, "奖金明细导出"); } - private List getBonusDetail(List cuMemberBonusExtList) { + private List getBonusDetail(List cuMemberBonusExtList) { List cuMemberBonusVoList = new ArrayList<>(cuMemberBonusExtList.size()); for (CuMemberBonusExt cuMemberBonusExt : cuMemberBonusExtList) { CuMemberBonusVO cuMemberBonusVO = BeanUtil.copyProperties(cuMemberBonusExt, CuMemberBonusVO.class); @@ -203,7 +203,7 @@ public class CuMemberBonusController extends BaseController { cuMemberBonusVO.setMemberCode(cuMemberBonusExt.getMemberCode()); cuMemberBonusVO.setMemberName(cuMemberBonusExt.getMemberName()); - for(String key :CuMemberBonusVO.INCOME_ARRAY){ + for (String key : CuMemberBonusVO.INCOME_ARRAY) { ReflectUtils.invokeSetter(cuMemberBonusVO, key + BonusFieldConstants.INCOME_SUFFIX, ComputeUtil.computeMultiply(ReflectUtils.invokeGetter(cuMemberBonusExt, key), cuMemberBonusExt.getOutExchangeRate())); } cuMemberBonusVoList.add(cuMemberBonusVO); @@ -217,7 +217,7 @@ public class CuMemberBonusController extends BaseController { @AccessPermissions("sourceBonus") @PostMapping("/query-bonus-source") @Log(module = EOperationModule.BONUS_SOURCE, business = EOperationBusiness.BONUS_SOURCE, method = EOperationMethod.SELECT) - public TableDataInfo listBonusSource(@RequestBody BonusParam bonusParam){ + public TableDataInfo listBonusSource(@RequestBody BonusParam bonusParam) { bonusParam.setPkCountry(SecurityUtils.getPkCountry()); packageBonusParam(bonusParam); startPage(); @@ -230,7 +230,7 @@ public class CuMemberBonusController extends BaseController { */ @PostMapping("/export-bonus-source") @Log(module = EOperationModule.BONUS_SOURCE, business = EOperationBusiness.BONUS_SOURCE, method = EOperationMethod.EXPORT) - public void exportBonusSource(HttpServletResponse response, BonusParam bonusParam){ + public void exportBonusSource(HttpServletResponse response, BonusParam bonusParam) { bonusParam.setPkCountry(SecurityUtils.getPkCountry()); packageBonusParam(bonusParam); TableDataInfo tableDataInfo = cuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam); @@ -239,20 +239,20 @@ public class CuMemberBonusController extends BaseController { Map transactionMap = transactionCommonService.exportEnumTransaction(EOrderType.values(), EBonusIncomeStatus.values()); Map transactionLongMap = transactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); for (MemberBonusDetailSerVO memberBonusDetailSerVO : memberBonusDetailSerVOList) { - if(transactionMap.containsKey(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType().toString())) { + if (transactionMap.containsKey(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType().toString())) { memberBonusDetailSerVO.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType())); } - if(transactionMap.containsKey(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())){ + if (transactionMap.containsKey(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())) { memberBonusDetailSerVO.setIncomeStatusVal(transactionMap.get(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())); } - if(transactionLongMap.containsKey(memberBonusDetailSerVO.getPkSettleGrade())){ + if (transactionLongMap.containsKey(memberBonusDetailSerVO.getPkSettleGrade())) { memberBonusDetailSerVO.setPkSettleGradeVal(transactionLongMap.get(memberBonusDetailSerVO.getPkSettleGrade())); } - if(transactionLongMap.containsKey(memberBonusDetailSerVO.getPkAwards())){ + if (transactionLongMap.containsKey(memberBonusDetailSerVO.getPkAwards())) { memberBonusDetailSerVO.setPkAwardsVal(transactionLongMap.get(memberBonusDetailSerVO.getPkAwards())); } } - ExcelUtil util = new ExcelUtil<>(MemberBonusDetailSerVO.class,menuColumnServiceApi.queryMenuColumn("sourceBonus", SecurityUtils.getUserId()).getData()); + ExcelUtil util = new ExcelUtil<>(MemberBonusDetailSerVO.class, menuColumnServiceApi.queryMenuColumn("sourceBonus", SecurityUtils.getUserId()).getData()); util.exportExcel(response, memberBonusDetailSerVOList, "奖金来源导出"); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 03663c1b..843f87da 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -45,11 +45,11 @@ import java.util.*; public abstract class BonusSettleHandle { @DubboReference - protected ISaOrderServiceApi saOrderServiceApi; + ISaOrderServiceApi saOrderServiceApi; @DubboReference - protected IBonusItemsServiceApi bonusItemsServiceApi; + IBonusItemsServiceApi bonusItemsServiceApi; @DubboReference - private ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi currencyServiceApi; protected ICuMemberTreeService cuMemberTreeService; @@ -655,33 +655,12 @@ public abstract class BonusSettleHandle { } /** + * 获得 直推级差收益的备注 + * * @param saOrderExt 订单编号 * @param cuMemberBonusRange 报单服务费 * @param sourceMemberRangeExt 提供奖金的人 * @param targetMemberRangeExt 获得奖金的人 - * @Description: 获得 报单服务费收益的备注 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 - */ - protected void rangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRangeExt sourceMemberRangeExt, - CuMemberRangeExt targetMemberRangeExt) { - String remark = String.format(BonusMsgConstants.RANGE, saOrderExt.getOrderCode(), - sourceMemberRangeExt.getMemberCode() + sourceMemberRangeExt.getMemberName(), - targetMemberRangeExt.getMemberCode() + targetMemberRangeExt.getMemberName(), - cuMemberBonusRange.getCalAchieve(), sourceMemberRangeExt.getRangeAwardsValue(), targetMemberRangeExt.getRangeAwardsValue()); - cuMemberBonusRange.setRemark(remark); - } - - /** - * @param saOrderExt 订单编号 - * @param cuMemberBonusRange 报单服务费 - * @param sourceMemberRangeExt 提供奖金的人 - * @param targetMemberRangeExt 获得奖金的人 - * @Description: 获得 报单服务费收益的备注 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void rangeRetailRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRetailRangeExt sourceMemberRangeExt, CuMemberRetailRangeExt targetMemberRangeExt) { @@ -710,32 +689,13 @@ public abstract class BonusSettleHandle { } /** - * 获得 报单服务费收益的备注 + * 获得 平级收益的备注 * * @param saOrderExt 订单编号 * @param cuMemberBonusRange 报单服务费 * @param sourceMemberRangeExt 提供奖金的人 * @param targetMemberRangeExt 获得奖金的人 */ - protected void oriRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRangeExt sourceMemberRangeExt, - CuMemberRangeExt targetMemberRangeExt) { - String remark = String.format(BonusMsgConstants.ORI_RANGE, saOrderExt.getOrderCode(), - sourceMemberRangeExt.getMemberCode() + sourceMemberRangeExt.getMemberName(), - targetMemberRangeExt.getMemberCode() + targetMemberRangeExt.getMemberName(), - cuMemberBonusRange.getCalAchieve(), targetMemberRangeExt.getRangeAwardsValue()); - cuMemberBonusRange.setRemark(remark); - } - - /** - * @param saOrderExt 订单编号 - * @param cuMemberBonusRange 报单服务费 - * @param sourceMemberRangeExt 提供奖金的人 - * @param targetMemberRangeExt 获得奖金的人 - * @Description: 获得 报单服务费收益的备注 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 - */ protected void oriRetailRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRetailRangeExt sourceMemberRangeExt, CuMemberRetailRangeExt targetMemberRangeExt) { String remark = String.format(BonusMsgConstants.ORI_RANGE, saOrderExt.getOrderCode(), diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index 5510c335..1725dd6f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -1278,10 +1278,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // // 直推级差收益 // BigDecimal calBonusIncome = BigDecimal.ZERO; - // 商品价格（没有乘商品数量） + // 商品最终价格 BigDecimal waresPrice = saOrderItems.getWaresPrice(); // 商品数量 - Integer waresQuantity = saOrderItems.getWaresQuantity(); + BigDecimal waresQuantityBig = new BigDecimal(saOrderItems.getWaresQuantity()); // 前一个会员等级 int beforeGradeValue = 0; // 前一个会员等级的平级收益人数 @@ -1320,19 +1320,19 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 前一个会员等级为0，肯定为第一次处理，直接处理直推级差收益 if (EGrade.HAI_FAN.getValue() == calGradeValue) { // VIP，拿1份40 - rangeBonusIncome = RetailConstants.RANGE_BONUS; + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig); } else if (EGrade.YOU_KE.getValue() == calGradeValue) { // SVIP，拿2份40 - rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(new BigDecimal("2")); + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig).multiply(new BigDecimal("2")); } else if (EGrade.MAKER.getValue() == calGradeValue) { // 卓越，拿3份40 - rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(new BigDecimal("3")); + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig).multiply(new BigDecimal("3")); } else if (EGrade.VIP.getValue() == calGradeValue) { // 首席，拿4份40 - rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(new BigDecimal("4")); + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig).multiply(new BigDecimal("4")); } else if (EGrade.S_VIP.getValue() == calGradeValue) { // 合伙人，拿5份40 - rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(new BigDecimal("5")); + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig).multiply(new BigDecimal("5")); } // 赋值前一个会员等级 beforeGradeValue = calGradeValue; @@ -1361,7 +1361,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { int tmpGradeVal = (calGradeValue - beforeGradeValue) / 10; // 新等级的直推级差收益 - rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(new BigDecimal(tmpGradeVal)); + rangeBonusIncome = RetailConstants.RANGE_BONUS.multiply(waresQuantityBig).multiply(new BigDecimal(tmpGradeVal)); // 直推级差收益 = 新等级的直推级差收益 - 上一等级的平级收益 rangeBonusIncome = rangeBonusIncome.subtract(beforeSameBonus); @@ -1382,7 +1382,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMemberRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_RANGE_INCOME.getValue()); CuMemberBonusRange cuMemberBonusRange = getCuMemberRetailBonusRange(saOrderExt, targetMemberRangeExt, cuMemberBonus, pkBonusItems); cuMemberBonusRange.setCalValue(BigDecimal.ZERO); - cuMemberBonusRange.setPretaxIncome(rangeBonusIncome.multiply(new BigDecimal(waresQuantity))); + cuMemberBonusRange.setCalAchieve(waresPrice); + cuMemberBonusRange.setPretaxIncome(rangeBonusIncome); cuMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); @@ -1400,8 +1401,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { targetMemberRangeExt.getIncomeStatus(), targetMemberRangeExt.getPkSettleCountry(), targetMemberRangeExt.getPkRate() == null ? saOrderExt.getPkRate() : targetMemberRangeExt.getPkRate()); int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMemberRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_SAME_LEVEL_INCOME.getValue()); CuMemberBonusRange oriMemberBonusRange = getCuMemberRetailBonusRange(saOrderExt, targetMemberRangeExt, cuMemberBonus, pkBonusItems); - oriMemberBonusRange.setCalValue(BigDecimal.valueOf(2)); - oriMemberBonusRange.setPretaxIncome(sameBonusIncome.multiply(new BigDecimal(waresQuantity))); + oriMemberBonusRange.setCalValue(RetailConstants.SAME_RATIO); + oriMemberBonusRange.setCalAchieve(waresPrice); + oriMemberBonusRange.setPretaxIncome(sameBonusIncome); oriMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java index 9e365ec7..78ee14c5 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java @@ -9,27 +9,11 @@ import java.math.BigDecimal; import java.util.Date; /** - * @description: 奖金明细表 - * @author: sui q - * @time: 2023/5/20 15:31 - * @classname: CuMemberBonusVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 + * 奖金明细表 */ @Data public class CuMemberBonusVO implements Serializable { -// /** -// * 需要转换人民币的 -// */ -// public static final String[] INCOME_ARRAY = new String[]{ -// "directIncome", "expandIncome", "expandNoCapping", "expandCapping", -// "coachIncome", "shareIncome", "serviceIncome", "cloudDirectIncome", -// "cloudPurIncome", "cloudRepurIncome", "repurPushIncome", "repurRangeIncome", "repurExpandIncome", -// "repurCoupon", "repurCouponShare", "backPoints", "serviceSpend", -// "globalPoints", "carAwardPoints", "storeIncome", "hiFunIncome", -// "makerDirectIncome", "makerShareIncome", "makerRealSubtotal", "purRealSubtotal", -// "cloudRealSubtotal", "repurRealSubtotal", "repurCouponSubtotal", "realIncomeTotal"}; /** * 主键 */ @@ -102,185 +86,60 @@ public class CuMemberBonusVO implements Serializable { */ private Integer grantStatus; -// /** -// * 直推收益 -// */ -// @Excel(name = "直推收益", scale = 2) -// private BigDecimal directIncomeOri; -// -// /** -// * 直推收益 -// */ -// @Excel(name = "直推收益($)", scale = 2) -// private BigDecimal directIncome; -// -// /** -// * 拓展收益 -// */ -// @Excel(name = "拓展收益", scale = 2) -// private BigDecimal expandIncomeOri; -// -// /** -// * 拓展收益 -// */ -// @Excel(name = "拓展收益($)", scale = 2) -// private BigDecimal expandIncome; -// -// /** -// * 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶) -// */ -// private BigDecimal expandNoCapping; -// -// /** -// * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) -// */ -// private BigDecimal expandCapping; -// -// -// /** -// * 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶) -// */ -// private BigDecimal expandNoCappingOri; -// -// /** -// * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) -// */ -// private BigDecimal expandCappingOri; -// -// /** -// * 辅导收益 -// */ -// @Excel(name = "辅导收益", scale = 2) -// private BigDecimal coachIncomeOri; -// -// /** -// * 辅导收益 -// */ -// @Excel(name = "辅导收益($)", scale = 2) -// private BigDecimal coachIncome; -// -// /** -// * 分红收益 -// */ -// @Excel(name = "分红收益", scale = 2) -// private BigDecimal shareIncomeOri; -// -// /** -// * 分红收益 -// */ -// @Excel(name = "分红收益($)", scale = 2) -// private BigDecimal shareIncome; -// -// /** -// * 报单收益 -// */ -// @Excel(name = "报单收益", scale = 2) -// private BigDecimal serviceIncomeOri; -// -// /** -// * 报单收益 -// */ -// @Excel(name = "服务收益($)", scale = 2) -// private BigDecimal serviceIncome; -// -// -// /** -// * 云代直推收益 -// */ -// @Excel(name = "云代直推收益", scale = 2) -// private BigDecimal cloudDirectIncomeOri; -// -// /** -// * 云代直推收益 -// */ -// @Excel(name = "云代直推收益($)", scale = 2) -// private BigDecimal cloudDirectIncome; -// -// /** -// * 云代首购收益 -// */ -// @Excel(name = "云代首购收益", scale = 2) -// private BigDecimal cloudPurIncomeOri; -// -// /** -// * 云代首购收益 -// */ -// @Excel(name = "云代首购收益($)", scale = 2) -// private BigDecimal cloudPurIncome; -// -// /** -// * 云代复购收益 -// */ -// @Excel(name = "云代复购收益", scale = 2) -// private BigDecimal cloudRepurIncomeOri; -// -// /** -// * 云代复购收益 -// */ -// @Excel(name = "云代复购收益($)", scale = 2) -// private BigDecimal cloudRepurIncome; -// -// /** -// * 复购级差收益 -// */ -// @Excel(name = "复购推荐收益", scale = 2) -// private BigDecimal repurPushIncomeOri; -// -// /** -// * 复购级差收益 -// */ -// @Excel(name = "复购推荐收益", scale = 2) -// private BigDecimal repurPushIncome; -// -// /** -// * 复购级差收益 -// */ -// @Excel(name = "复购级差收益", scale = 2) -// private BigDecimal repurRangeIncomeOri; -// -// /** -// * 复购级差收益 -// */ -// @Excel(name = "复购级差收益($)", scale = 2) -// private BigDecimal repurRangeIncome; -// -// -// /** -// * 复购拓展收益 -// */ -// @Excel(name = "复购拓展收益", scale = 2) -// private BigDecimal repurExpandIncomeOri; -// -// /** -// * 复购拓展收益 -// */ -// @Excel(name = "复购拓展收益($)", scale = 2) -// private BigDecimal repurExpandIncome; -// -// /** -// * 复购卷 -// */ -// @Excel(name = "复购卷", scale = 2) -// private BigDecimal repurCouponOri; -// -// /** -// * 复购卷 -// */ -// @Excel(name = "复购卷($)", scale = 2) -// private BigDecimal repurCoupon; -// -// /** -// * 复购券均分收益 -// */ -// @Excel(name = "复购券均分", scale = 2) -// private BigDecimal repurCouponShareOri; -// -// /** -// * 复购券均分收益 -// */ -// @Excel(name = "复购券均分($)", scale = 2) -// private BigDecimal repurCouponShare; -// + /** + * 需要转换人民币的 + */ + public static final String[] INCOME_ARRAY = new String[]{ + "backPoints", "retailRangeIncome", "retailSameLevelIncome", "retailAreaIncome", + "retailBenefitRangeIncome", "retailBenefitAvgIncome", + "retailBenefitIncome", "retailRealSubtotal", "realIncomeTotal"}; + + + private BigDecimal retailRangeIncome; + /** + * 直推收益 + */ + @Excel(name = "直推收益", scale = 2) + private BigDecimal retailRangeIncomeOri; + + private BigDecimal retailSameLevelIncome; + /** + * 平级收益 + */ + @Excel(name = "平级收益", scale = 2) + private BigDecimal retailSameLevelIncomeOri; + + private BigDecimal retailAreaIncome; + /** + * 区域分红 + */ + @Excel(name = "区域分红", scale = 2) + private BigDecimal retailAreaIncomeOri; + + /** + * 新零售福利极差收益 + */ + private BigDecimal retailBenefitRangeIncome; + + @Excel(name = " 福利极差收益", scale = 2) + private BigDecimal retailBenefitRangeIncomeOri; + + /** + * 新零售福利平均收益 + */ + private BigDecimal retailBenefitAvgIncome; + + @Excel(name = " 福利平均收益", scale = 2) + private BigDecimal retailBenefitAvgIncomeOri; + + /** + * 新零售福利加权收益 + */ + private BigDecimal retailBenefitIncome; + + @Excel(name = " 福利加权收益", scale = 2) + private BigDecimal retailBenefitIncomeOri; + /** * 商城重消 */ @@ -290,184 +149,11 @@ public class CuMemberBonusVO implements Serializable { /** * 商城重消 */ - @Excel(name = "商城重消($)", scale = 2) private BigDecimal backPoints; -// -// /** -// * 平台服务费 -// */ -// @Excel(name = "平台服务费", scale = 2) -// private BigDecimal serviceSpendOri; -// -// /** -// * 平台服务费 -// */ -// @Excel(name = "平台服务费($)", scale = 2) -// private BigDecimal serviceSpend; -// -// /** -// * 环球积分 -// */ -// @Excel(name = "直推极差", scale = 2) -// private BigDecimal globalPointsOri; -// -// /** -// * 环球积分 -// */ -// @Excel(name = "直推极差($)", scale = 2) -// private BigDecimal globalPoints; -// -// /** -// * 车奖积分 -// */ -// @Excel(name = "车奖积分", scale = 2) -// private BigDecimal carAwardPointsOri; -// -// -// /** -// * 车奖积分 -// */ -// @Excel(name = "车奖积分($)", scale = 2) -// private BigDecimal carAwardPoints; -// -// /** -// * 店铺收益 -// */ -// @Excel(name = "店铺收益", scale = 2) -// private BigDecimal storeIncomeOri; -// -// /** -// * 店铺收益 -// */ -// @Excel(name = "店铺收益($)", scale = 2) -// private BigDecimal storeIncome; -// -// /** -// * 嗨粉推荐收益 -// */ -// @Excel(name = "嗨粉推荐收益", scale = 2) -// private BigDecimal hiFunIncomeOri; -// -// /** -// * 嗨粉推荐收益 -// */ -// @Excel(name = "嗨粉推荐收益($)", scale = 2) -// private BigDecimal hiFunIncome; -// -// /** -// * 首购实发小计 -// */ -// @Excel(name = "首购实发小计", scale = 2) -// private BigDecimal purRealSubtotalOri; -// -// /** -// * 首购实发小计 -// */ -// @Excel(name = "首购实发小计($)", scale = 2) -// private BigDecimal purRealSubtotal; -// -// /** -// * 云代实发小计 -// */ -// @Excel(name = "云代实发小计", scale = 2) -// private BigDecimal cloudRealSubtotalOri; -// -// /** -// * 云代实发小计 -// */ -// @Excel(name = "云代实发小计($)", scale = 2) -// private BigDecimal cloudRealSubtotal; -// -// /** -// * 复购实发小计 -// */ -// @Excel(name = "复购实发小计", scale = 2) -// private BigDecimal repurRealSubtotalOri; -// -// /** -// * 复购实发小计 -// */ -// @Excel(name = "复购实发小计($)", scale = 2) -// private BigDecimal repurRealSubtotal; -// -// /** -// * 复购券小计 -// */ -// @Excel(name = "复购券实发小计", scale = 2) -// private BigDecimal repurCouponSubtotalOri; -// -// /** -// * 复购券小计 -// */ -// @Excel(name = "复购券实发小计($)", scale = 2) -// private BigDecimal repurCouponSubtotal; - - /** - * 需要转换人民币的 - */ - public static final String[] INCOME_ARRAY = new String[]{ - "backPoints","retailRangeIncome", "retailSameLevelIncome", "retailAreaIncome", - "retailBenefitRangeIncome","retailBenefitAvgIncome", - "retailBenefitIncome","retailRealSubtotal","realIncomeTotal"}; - - /** - * 新零售极差收益 - */ - @Excel(name = "新零售极差收益($)", scale = 2) - private BigDecimal retailRangeIncome; - - @Excel(name = " 新零售极差收益", scale = 2) - private BigDecimal retailRangeIncomeOri; - - /** - * 新零售平级收益 - */ - @Excel(name = "平级收益($)", scale = 2) - private BigDecimal retailSameLevelIncome; - - @Excel(name = " 平级收益", scale = 2) - private BigDecimal retailSameLevelIncomeOri; - - /** - * 新零售区域收益 - */ - @Excel(name = "区域收益($)", scale = 2) - private BigDecimal retailAreaIncome; - - @Excel(name = " 区域收益", scale = 2) - private BigDecimal retailAreaIncomeOri; - - /** - * 新零售福利极差收益 - */ - @Excel(name = "福利极差收益($)", scale = 2) - private BigDecimal retailBenefitRangeIncome; - - @Excel(name = " 福利极差收益", scale = 2) - private BigDecimal retailBenefitRangeIncomeOri; - - /** - * 新零售福利平均收益 - */ - @Excel(name = "福利平均收益($)", scale = 2) - private BigDecimal retailBenefitAvgIncome; - - @Excel(name = " 福利平均收益", scale = 2) - private BigDecimal retailBenefitAvgIncomeOri; - - /** - * 新零售福利加权收益 - */ - @Excel(name = "福利加权收益($)", scale = 2) - private BigDecimal retailBenefitIncome; - - @Excel(name = " 福利加权收益", scale = 2) - private BigDecimal retailBenefitIncomeOri; /** * 新零售收益小计 */ - @Excel(name = "收益小计($)", scale = 2) private BigDecimal retailRealSubtotal; @Excel(name = " 收益小计", scale = 2) @@ -479,10 +165,8 @@ public class CuMemberBonusVO implements Serializable { @Excel(name = "实发收益总计", scale = 2) private BigDecimal realIncomeTotalOri; - /** * 实发收益总计 */ - @Excel(name = "实发收益总计($)", scale = 2) private BigDecimal realIncomeTotal; } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml index 064b3d49..e5d49d48 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml @@ -298,8 +298,11 @@ order by cp.settle_date desc +