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 a37cd1e7..03663c1b 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 @@ -192,7 +192,7 @@ public abstract class BonusSettleHandle { */ protected Boolean validatePkBonusItems(BonusConfigDTO bonusConfigDTO, Integer pkCountry, Integer bonusItems) { BdBonusItemsExt bdBonusItemsExt = bonusConfigDTO.getBonusItemsExtMap().get(pkCountry.toString() + bonusItems); - return bdBonusItemsExt == null || bdBonusItemsExt.getPkId() == null; + return null == bdBonusItemsExt || null == bdBonusItemsExt.getPkId(); } /** @@ -1124,10 +1124,7 @@ public abstract class BonusSettleHandle { } /** - * @Description: 云代计算 扣项，小计，总计 - * @return: void - * @Author: sui q - * @Date: 2023/1/11 13:59 + * 扣项，小计，总计 */ protected void setRetailTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) { setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail); @@ -1137,23 +1134,7 @@ public abstract class BonusSettleHandle { } /** - * @Description: 云代计算 扣项，小计，总计 - * @return: void - * @Author: sui q - * @Date: 2023/1/11 13:59 - */ - protected void setMakerTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) { - setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail); - BigDecimal realIncome = ReflectUtils.invokeGetter(bonusDetail, BonusFieldConstants.REAL_INCOME); - cuMemberBonus.setMakerRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getMakerRealSubtotal(), realIncome)); - cuMemberBonus.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonus.getRealIncomeTotal(), realIncome)); - } - - /** - * @Description: 云代计算 扣项，小计，总计 - * @return: void - * @Author: sui q - * @Date: 2023/1/11 13:59 + * 扣项，小计，总计 */ protected void setRepurchaseCouponTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) { setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail); 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 fe8cc744..639a5326 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 @@ -130,17 +130,18 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 计算自消费奖衔 CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); // 先算等级 注册、升级计算等级 - // 订单指定产品盒数（计算等级使用） - int boxNum = saOrderExt.getBoxNum(); -// int boxNum = 0; -// for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { -// for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { -// if (saOrderItems.getWaresCode().equals(waresCode)) { -// boxNum += saOrderItems.getWaresQuantity(); -// break; -// } -// } -// } + // 订单指定产品盒数 + int boxNum = 0; + for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { + for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { + if (saOrderItems.getWaresCode().equals(waresCode)) { + boxNum += saOrderItems.getWaresQuantity(); + break; + } + } + } + saOrderExt.setBoxNum(boxNum); + // 订单业绩 BigDecimal orderAchieve = saOrderExt.getOrderAchieve(); if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType() @@ -163,7 +164,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 计算团队业绩、盒数，计算等级、奖衔 cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, boxNum, cuMemberGradeList)); - // TODO new 奖金处理 List cuMemberBonusRangeList = new ArrayList<>(); // 计算奖金 计算平级收益 @@ -184,8 +184,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); countyRangeExtList.forEach(cuMemberRetailRangeExt -> countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); + // 计算区域奖 - CuMemberBonusDetail cuMemberBonusDetail = calculateRetailAreaBonus(countyRangeExtMap, saOrderExt, bonusConfigDTO, currentPeriod, memberRangeExtMap, cuMemberBonusMap); + CuMemberBonusDetail cuMemberBonusDetail = calculateRetailAreaBonus(countyRangeExtMap, bonusConfigDTO, currentPeriod, memberRangeExtMap, cuMemberBonusMap, saOrderExt); if (cuMemberBonusDetail != null) { cuMemberBonusDetailList.add(cuMemberBonusDetail); } @@ -409,8 +410,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 更新网体 iCuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth); - //////////////// TODO ////////////////////// - // 回退历史注水 iCuMemberRetailRangeService.mergeCuMemberRetailBackBoxBySpecial(rangeTableName, yesterdayRangeTableName, period); // 更新注水 @@ -426,7 +425,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 会员结算map（key：会员ID，value：结算扩展） Map memberRangeExtMap = new HashMap<>(); - // 购买升级等级map（key:等级值，value:等级对象） Map retaiBuyGradeMap = new TreeMap<>(); // 团队升级等级map（key:等级值，value:等级对象） @@ -537,31 +535,35 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // TODO new 奖金处理 - // 计算奖金 计算极差平级收益 - for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { - for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { - if (saOrderItems.getWaresCode() != null && saOrderItems.getWaresCode().equals(waresCode)) { + // 计算奖金 直推级差 + 平级收益 + if ((EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) + && boxNum > 0 + ) { + // 注册或升级订单并且存在盒数产品，才有 直推级差收益 和 平级收益 + for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { + // 直推级差 + 平级收益 + cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); + + // 计算完奖金算等级 + if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || + EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() || + EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { + // 计算个人等级，消费等级 int waresQuantity = saOrderItems.getWaresQuantity(); - cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); - // 计算完奖金算等级 - if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { - // 计算个人等级，消费等级 - int buyBoxNum = sourceMemberRangeExt.getBuyNum() + waresQuantity; - if (memberLevelMap.containsKey(saOrderExt.getPkId())) { - CuMemberLevel cuMemberLevel = memberLevelMap.get(saOrderExt.getPkId()); - if (gradeIdMap.containsKey(cuMemberLevel.getNewLevel())) { - BdGrade bdGrade = gradeIdMap.get(cuMemberLevel.getNewLevel()); - if (bdGrade.getGradeValue() > sourceMemberRangeExt.getGradeValue()) { - sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); - sourceMemberRangeExt.setPkGrade(bdGrade.getPkId()); - sourceMemberRangeExt.setGradeName(bdGrade.getGradeName()); - if (sourceMemberRangeExt.getSameDate() == EYesNo.NO.getIntValue()) { - sourceMemberRangeExt.setBuyNum(bdGrade.getBoxNumber()); - } else { - sourceMemberRangeExt.setBuyNum(buyBoxNum); - } + int buyBoxNum = sourceMemberRangeExt.getBuyNum() + waresQuantity; + if (memberLevelMap.containsKey(saOrderExt.getPkId())) { + CuMemberLevel cuMemberLevel = memberLevelMap.get(saOrderExt.getPkId()); + if (gradeIdMap.containsKey(cuMemberLevel.getNewLevel())) { + BdGrade bdGrade = gradeIdMap.get(cuMemberLevel.getNewLevel()); + if (bdGrade.getGradeValue() > sourceMemberRangeExt.getGradeValue()) { + sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); + sourceMemberRangeExt.setPkGrade(bdGrade.getPkId()); + sourceMemberRangeExt.setGradeName(bdGrade.getGradeName()); + if (sourceMemberRangeExt.getSameDate() == EYesNo.NO.getIntValue()) { + sourceMemberRangeExt.setBuyNum(bdGrade.getBoxNumber()); + } else { + sourceMemberRangeExt.setBuyNum(buyBoxNum); } } } @@ -569,11 +571,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } } - if (saOrderExt.getOrderType().equals(EOrderType.RETAIL_CONSUME.getValue())) { - continue; - } -// 计算区域奖 - CuMemberBonusDetail cuMemberBonusDetail = calculateRetailAreaBonus(countyRangeExtMap, saOrderExt, bonusConfigDTO, period, memberRangeExtMap, cuMemberBonusMap); + + // 计算区域奖 + CuMemberBonusDetail cuMemberBonusDetail = calculateRetailAreaBonus(countyRangeExtMap, bonusConfigDTO, period, memberRangeExtMap, cuMemberBonusMap, saOrderExt); if (cuMemberBonusDetail != null) { cuMemberBonusDetailList.add(cuMemberBonusDetail); } @@ -1268,8 +1268,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { /** * 计算极差收益，根据极差收益计算平级收益 */ - List calculateRetailRangeBonus(Map memberRangeExtMap, Map cuMemberBonusMap, Map gradeMap, BonusConfigDTO bonusConfigDTO, - Integer period, SaOrderWaresExt saOrderItems, SaOrderExt saOrderExt) { + List calculateRetailRangeBonus(Map memberRangeExtMap, Map cuMemberBonusMap, + Map gradeMap, BonusConfigDTO bonusConfigDTO, Integer period, + SaOrderWaresExt saOrderItems, SaOrderExt saOrderExt) { List memberBonusRangeList = new ArrayList<>(); // 用等级计算，按照一级级算 CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); @@ -1422,30 +1423,57 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return memberBonusRangeList; } - CuMemberBonusDetail calculateRetailAreaBonus(Map countyRangeExtMap, SaOrder saOrder, + /** + * 计算区域奖 + * + * @param countyRangeExtMap + * @param saOrder + * @param bonusConfigDTO + * @param period + * @param memberRangeExtMap + * @param cuMemberBonusMap + * @return + */ + CuMemberBonusDetail calculateRetailAreaBonus(Map countyRangeExtMap, BonusConfigDTO bonusConfigDTO, Integer period, Map memberRangeExtMap, - Map cuMemberBonusMap) { - CuMemberRetailRangeExt sourceRetailRangeExt = memberRangeExtMap.get(saOrder.getPkMember()); - CuMemberRetailRangeExt cuMemberRetailRangeExt = countyRangeExtMap.get(sourceRetailRangeExt.getSystemType() + "_" + saOrder.getRecCounty()); - if (cuMemberRetailRangeExt == null) { + Map cuMemberBonusMap, SaOrder saOrder) { + // 重消订单没有区域分红 + if (saOrder.getOrderType().equals(EOrderType.RETAIL_CONSUME.getValue())) { return null; } + // 区域分红根据商品盒数来，如果没有盒数，直接返回为空 + if (saOrder.getBoxNum() == 0) { + return null; + } + + CuMemberRetailRangeExt sourceRetailRangeExt = memberRangeExtMap.get(saOrder.getPkMember()); + // 获取对应区域会员 + CuMemberRetailRangeExt cuMemberRetailRangeExt = countyRangeExtMap.get(sourceRetailRangeExt.getSystemType() + "_" + saOrder.getRecCounty()); + if (null == cuMemberRetailRangeExt) { + return null; + } + // 获取区域会员结算数据 if (memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { cuMemberRetailRangeExt = memberRangeExtMap.get(cuMemberRetailRangeExt.getPkMember()); } - if (ECategory.NORMAL.getValue() != cuMemberRetailRangeExt.getCategory() || - EAccountStatus.STOP_INCOME.getValue() == cuMemberRetailRangeExt.getAccountStatus() || - cuMemberRetailRangeExt.getEnableStatus() == EYesNo.NO.getIntValue()) { + + // 非正常用户 或者 停止收益 或 未激活，不能获取区域收益 + if (ECategory.NORMAL.getValue() != cuMemberRetailRangeExt.getCategory() + || EAccountStatus.STOP_INCOME.getValue() == cuMemberRetailRangeExt.getAccountStatus() + || cuMemberRetailRangeExt.getEnableStatus() == EYesNo.NO.getIntValue()) { return null; } // 验证是否有奖金 if (validatePkBonusItems(bonusConfigDTO, cuMemberRetailRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_AREA_INCOME.getValue())) { return null; } - BigDecimal bonusRatio = BigDecimal.valueOf(0.4); - BigDecimal benefitIncome = ComputeUtil.computeBonusMultiply(saOrder.getOrderAchieve(), bonusRatio); - CuMemberBonusDetail cuMemberBonusDetail = packageBenefitIncome(bonusConfigDTO, period, cuMemberBonusMap, null, bonusRatio, benefitIncome, cuMemberRetailRangeExt, EBonusItems.RETAIL_AREA_INCOME.getValue(), BonusMsgConstants.RETAIL_AREA_INCOME); - cuMemberBonusDetail.setCalAchieve(saOrder.getOrderAchieve()); + + BigDecimal boxNumBig = new BigDecimal(saOrder.getBoxNum()); + // 处理区域收益（每盒2元） + BigDecimal benefitIncome = RetailProductConstants.AREA_BOX_BONUS.multiply(boxNumBig); + CuMemberBonusDetail cuMemberBonusDetail = packageBenefitIncome(bonusConfigDTO, period, cuMemberBonusMap, null, BigDecimal.ZERO, benefitIncome, + cuMemberRetailRangeExt, EBonusItems.RETAIL_AREA_INCOME.getValue(), BonusMsgConstants.RETAIL_AREA_INCOME); + cuMemberBonusDetail.setCalAchieve(boxNumBig); cuMemberBonusDetail.setPkOrder(saOrder.getPkId()); String remark = String.format(BonusMsgConstants.RETAIL_AREA_INCOME, saOrder.getOrderCode(), memberRangeExtMap.get(saOrder.getPkMember()).getMemberCode() + memberRangeExtMap.get(saOrder.getPkMember()).getMemberName(), @@ -1963,7 +1991,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** - * 奖金明细 报单服务费、分红、云代首购、云代复购、海豆收益 + * 奖金明细 * * @param saOrderExt 订单 * @param cuMemberBonus 奖金主表 diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 5a294639..5e45a63b 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -156,7 +156,7 @@ nvl(st.wares_quantity,0) wares_quantity from sa_order so left join sa_order_wares st - on so.pk_id = st.pk_order and st.wares_price >0 + on so.pk_id = st.pk_order and st.wares_price > 0 left join bd_wares bw on bw.pk_id = st.pk_wares and bw.del_flag = 0 where so.order_status = 1 @@ -168,7 +168,7 @@ ) od left join bd_currency bc on od.pk_rate = bc.pk_id - order by pay_time,wares_price desc + order by pay_time, wares_price desc - - - diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml index 7898661c..93e72fbb 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml @@ -61,7 +61,9 @@ left join bd_product bp on bd.pk_product=bp.pk_id and bp.del_flag=0 left join ( - select pk_wares_specs_sku,wmsys.wm_concat(distinct(sc.specs_name)) specs_name,wmsys.wm_concat(distinct(sc.pk_id)) specs_name_id + select pk_wares_specs_sku, + to_char(wm_concat(distinct(sc.specs_name))) specs_name, + to_char(wm_concat(distinct(sc.pk_id))) specs_name_id from bd_wares_specs_relation br left join bd_wares_specs bp on br.pk_wares_specs= bp.pk_id diff --git a/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java b/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java index 9e6753bd..ce8f308a 100644 --- a/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java +++ b/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java @@ -25,11 +25,7 @@ import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; /** - * @author: sui q - * @time: 2022/8/27 14:45 - * @description:防止重复提交的切面类 - * @classname: RepeatSubmitAspectAdvice - * @package_name: com.hzs.common.core.aspect + * 防止重复提交的切面类 */ @Aspect @Component diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java index 8f6550f7..3f7d51de 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java @@ -1,5 +1,6 @@ package com.hzs.common.core.constant; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; @@ -8,18 +9,37 @@ import java.util.List; */ public class RetailProductConstants { + /** + * 区域分红，每盒2元 + */ + public static final BigDecimal AREA_BOX_BONUS = new BigDecimal("2"); + /** * 盒数产品列表 */ public static final List BOX_PRODUCT_LIST = Arrays.asList( - "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" + // 注册 + "SP02410001", "SP02410002", "SP02410003", "SP02410004", "SP02410005", "SP02410006", + // 升级 + "SP02420001", "SP02420002", "SP02420003", "SP02420004", "SP02420005", "SP02420006", + // 复消 + "SP02430001", "SP02430002", "SP02430003", "SP02430004", "SP02430005", "SP02430006", + // 重消 + "SP02440001", "SP02440002", "SP02440003", "SP02440005", "SP02440005", "SP02440006" ); /** * 盒数产品列表 */ public static final List ALL_BOX_WARES_LIST = Arrays.asList( - "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" + // 注册 + "SP02410001", "SP02410002", "SP02410003", "SP02410004", "SP02410005", "SP02410006", + // 升级 + "SP02420001", "SP02420002", "SP02420003", "SP02420004", "SP02420005", "SP02420006", + // 复消 + "SP02430001", "SP02430002", "SP02430003", "SP02430004", "SP02430005", "SP02430006", + // 重消 + "SP02440001", "SP02440002", "SP02440003", "SP02440005", "SP02440005", "SP02440006" ); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java index 1003e3e7..d68a0b65 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java @@ -1,157 +1,153 @@ package com.hzs.common.core.constant.msg; /** - * @Description: 产品相关 - * @Author: yuhui - * @Time: 2022/9/8 9:31 - * @Classname: ProductMsgConstants - * @PackageName: com.hzs.common.core.constant.msg + * 产品相关 */ public class ProductMsgConstants { /** * 商品提交没有选择专区 -- 所属专区必选 */ -public static final String SPECIAL_AREA_REQUIRED = "所属专区必选"; + public static final String SPECIAL_AREA_REQUIRED = "所属专区必选"; /** * 商品没有选择专区分类提示 -- 分类名称必填 */ -public static final String SPECIAL_AREA_CLASSIFY_REQUIRED = "分类名称必填"; + public static final String SPECIAL_AREA_CLASSIFY_REQUIRED = "分类名称必填"; /** * 排序重复 -- 排序重复 */ -public static final String SORT_REPEAT = "排序重复"; + public static final String SORT_REPEAT = "排序重复"; /** * 规格分类已被占用 -- 规格分类已被占用 */ -public static final String SPECS_TYPE_IS_USE = "规格分类已被占用"; + public static final String SPECS_TYPE_IS_USE = "规格分类已被占用"; /** * 分类名称重复 -- 分类名称重复 */ -public static final String CLASSIFY_NAME_REPEAT = "分类名称重复"; + public static final String CLASSIFY_NAME_REPEAT = "分类名称重复"; /** * 排序值超出限制 -- 排序值超出限制 */ -public static final String SORT_VALUES_OVERLIMIT = "排序值超出限制"; + public static final String SORT_VALUES_OVERLIMIT = "排序值超出限制"; /** * 新增产品编号已存在 -- 产品编号已存在 */ -public static final String PRODUCT_NUMBER_ALREADY_EXISTS = "产品编号已存在"; + public static final String PRODUCT_NUMBER_ALREADY_EXISTS = "产品编号已存在"; /** * 产品已被占用 -- 产品已被占用 */ -public static final String PRODUCT_OCCUPIED = "产品已被占用"; + public static final String PRODUCT_OCCUPIED = "产品已被占用"; /** * 产品名称必填 -- 产品名称必填 */ -public static final String PRODUCT_NAME_REQUIRED = "产品名称必填"; + public static final String PRODUCT_NAME_REQUIRED = "产品名称必填"; /** * 产品划线价 -- 产品划线价必填 */ -public static final String PRODUCT_PRICE_REQUIRED = "产品划线价必填"; + public static final String PRODUCT_PRICE_REQUIRED = "产品划线价必填"; /** * 产品不存在 -- 产品不存在 */ -public static final String PRODUCT_NOT_REQUIRED = "产品不存在"; + public static final String PRODUCT_NOT_REQUIRED = "产品不存在"; /** * 发货渠道/发货类型 -- 产品发货渠道必填 */ -public static final String PRODUCT_SHIPPING_CHANNEL_REQUIRED = "产品发货渠道必填"; + public static final String PRODUCT_SHIPPING_CHANNEL_REQUIRED = "产品发货渠道必填"; /** * 产品保质期 -- 产品保质期必填 */ -public static final String PRODUCT_SHELFLIFE_REQUIRED = "产品保质期必填"; + public static final String PRODUCT_SHELFLIFE_REQUIRED = "产品保质期必填"; /** * 产品单位 -- 产品单位必填 */ -public static final String PRODUCT_UNIT_REQUIRED = "产品单位必填"; + public static final String PRODUCT_UNIT_REQUIRED = "产品单位必填"; /** * 产品重量 -- 产品重量必填 */ -public static final String PRODUCT_WEIGHT_REQUIRED = "产品重量必填"; + public static final String PRODUCT_WEIGHT_REQUIRED = "产品重量必填"; /** * 邮费重量 -- 邮费重量必填 */ -public static final String PRODUCT_POSTAGE_WEIGHT_REQUIRED = "邮费重量必填"; + public static final String PRODUCT_POSTAGE_WEIGHT_REQUIRED = "邮费重量必填"; /** * 产品属性 -- 产品属性必选 */ -public static final String PRODUCT_ATTR_REQUIRED = "产品属性必选"; + public static final String PRODUCT_ATTR_REQUIRED = "产品属性必选"; /** * 产品分类 -- 产品分类必选 */ -public static final String PRODUCT_CLASSIFY_REQUIRED = "产品分类必选"; + public static final String PRODUCT_CLASSIFY_REQUIRED = "产品分类必选"; /** * 排序序号 -- 产品排序序号必填 */ -public static final String PRODUCT_SORT_REQUIRED = "产品排序序号必填"; + public static final String PRODUCT_SORT_REQUIRED = "产品排序序号必填"; /** * 产品长 -- 产品长度必填 */ -public static final String PRODUCT_LENGTH_REQUIRED = "产品长度必填"; + public static final String PRODUCT_LENGTH_REQUIRED = "产品长度必填"; /** * 产品宽 -- 产品宽度必填 */ -public static final String PRODUCT_WIDTH_REQUIRED = "产品宽度必填"; + public static final String PRODUCT_WIDTH_REQUIRED = "产品宽度必填"; /** * 产品高 -- 产品高度必填 */ -public static final String PRODUCT_HEIGHT_REQUIRED = "产品高度必填"; + public static final String PRODUCT_HEIGHT_REQUIRED = "产品高度必填"; /** * 产品主图 -- 请上传产品主图 */ -public static final String PRODUCT_COVER_REQUIRED = "请上传产品主图"; + public static final String PRODUCT_COVER_REQUIRED = "请上传产品主图"; /** * 请选择商品 -- 请选择商品 */ -public static final String PLEASE_SELECT_PRODUCT = "请选择商品"; + public static final String PLEASE_SELECT_PRODUCT = "请选择商品"; /** * 请选择产品规格 -- 请选择产品规格 */ -public static final String PRODUCT_SPECSTYPE_REQUIRED = "请选择产品规格"; + public static final String PRODUCT_SPECSTYPE_REQUIRED = "请选择产品规格"; /** * 规格类型名称 -- 规格类型名称必填 */ -public static final String PRODUCT_SPECS_TYPE_NAME_REQUIRED = "规格类型名称必填"; + public static final String PRODUCT_SPECS_TYPE_NAME_REQUIRED = "规格类型名称必填"; /** * 规格类型分类 -- 规格类型分类必选 */ -public static final String PRODUCT_SPECS_TYPE_PKCLASSIFY_REQUIRED = "规格类型分类必选"; + public static final String PRODUCT_SPECS_TYPE_PKCLASSIFY_REQUIRED = "规格类型分类必选"; /** * 规格值必填 -- 请填写规格值 */ -public static final String PRODUCT_SPECS_TYPE_SPECS_REQUIRED = "请填写规格值"; + public static final String PRODUCT_SPECS_TYPE_SPECS_REQUIRED = "请填写规格值"; /** * 商品分类展示图片必穿 -- 请上传商品分类展示图片 */ -public static final String WARES_AREA_CLASSIFY_IMG_REQUIRED = "请上传商品分类展示图片"; + public static final String WARES_AREA_CLASSIFY_IMG_REQUIRED = "请上传商品分类展示图片"; /** * 上级商品分类必传 -- 请选择上级分类 */ -public static final String WARES_PARENT_AREA_CLASSIFY_REQUIRED = "请选择上级分类"; + public static final String WARES_PARENT_AREA_CLASSIFY_REQUIRED = "请选择上级分类"; /** * 商品分类存在子级 -- 当前商品分类下存在子级类目,无法删除,请先删除子级 */ -public static final String THIS_CLASSIFY_EXIST_BELOW = "当前商品分类下存在子级类目,无法删除,请先删除子级"; + public static final String THIS_CLASSIFY_EXIST_BELOW = "当前商品分类下存在子级类目,无法删除,请先删除子级"; /** * 该产品每个国家只能存在一款 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java index 5943feeb..b7ed6658 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 用户类型分类 - * Author: sui q - * Time: 2022/9/8 16:39 - * Classname: ECategory - * PackageName: com.hzs.common.core.enums + * 用户类型分类 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java index 0d8e51a4..f2abd157 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemConfig.java @@ -8,11 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 系统配置参数初始化，该点不需要翻译 - * @Author: sui q - * @Time: 2022/9/6 19:49 - * @Classname: ESystemConfig - * @PackageName: com.hzs.common.core.enums + * 系统配置参数初始化，该点不需要翻译 */ @AllArgsConstructor @Getter @@ -41,7 +37,7 @@ public enum ESystemConfig { /** * 安置位置 1=任意 2=左 3=右 安置校验的 */ - PLACE_POSITION("0","安置位置", 0, "PLACE_3"), + PLACE_POSITION("0", "安置位置", 0, "PLACE_3"), /** * 注册等级 参照等级 @@ -163,8 +159,8 @@ public enum ESystemConfig { * 专区时间 * @return */ - public static List getPayMentTimeList(){ - List list =new ArrayList<>(); + public static List getPayMentTimeList() { + List list = new ArrayList<>(); list.add(REGISTER_ORDER_TIME); list.add(UPGRADE_ORDER_TIME); list.add(REPURCHASE_ORDER_TIME); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java index 7c1d4e58..b633cdb8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java @@ -18,7 +18,7 @@ public class BoxProductUtil { List productList = new ArrayList<>(0); if (null == systemType || ESystemType.ALL.getValue() == systemType) { - productList.addAll(RetailProductConstants.BOX_PRODUCT_LIST); + productList.addAll(RetailProductConstants.ALL_BOX_WARES_LIST); return productList; } diff --git a/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java b/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java index 170a9ed1..c194b376 100644 --- a/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java @@ -41,7 +41,6 @@ public class ExpressServiceImpl implements IExpressService { String url = expressConfig.getUrl(); QueryTrackParam queryTrackParam = new QueryTrackParam(); - // TODO: 2022/4/18 快递公司的编码现在暂不传，后期根据需求而定 // queryTrackParam.setCom("JD"); queryTrackParam.setNum(trackingNumber); queryTrackParam.setPhone(mobile);