diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java index d7a7b25b..81d8a032 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java @@ -8,11 +8,7 @@ import com.hzs.common.domain.member.detail.ext.CuMemberAwardsExt; import java.util.List; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:24 - * @Classname: ICuMemberLevelServiceApi - * @PackageName: com.hzs.member.detail + * 会员升级记录dubbo服务 */ public interface ICuMemberDetailServiceApi { diff --git a/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IMemberReportServiceApi.java b/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IMemberReportServiceApi.java index f3911c5d..87cc82da 100644 --- a/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IMemberReportServiceApi.java +++ b/bd-api/bd-api-report/src/main/java/com/hzs/report/stat/IMemberReportServiceApi.java @@ -1,37 +1,20 @@ package com.hzs.report.stat; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.report.stat.dto.StatisticalLogDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -import java.util.List; /** - * @description: 统计分析 - * @author: zhang jing - * @date: 2025/2/12 15:22 - * @param: - * @return: + * 统计分析 **/ public interface IMemberReportServiceApi { + /** + * 定时任务批量处理统计会员以及伞下金额业绩盒数 + **/ + R pushAmountBoxmethod(); /** - * @description: 定时任务批量处理统计会员以及伞下金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/13 10:41 - * @param: [] - * @return: com.hzs.common.core.domain.R + * 定时任务7天重算直推会员金额业绩盒数 **/ - R pushAmountBoxmethod(); - /** - * @description: 定时任务7天重算直推会员金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/13 10:41 - * @param: [startDateStr, endDateStr] - * @return: com.hzs.common.core.domain.R - **/ - R repeatPushAmountBoxmethod(String startDateStr, String endDateStr); + R repeatPushAmountBoxmethod(String startDateStr, String endDateStr); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java index f13b56d5..fed3aac8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java @@ -7,20 +7,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 秒接日志记录表 Mapper 接口 - *

- * - * @author hzs - * @since 2024-12-27 */ public interface CuMemberRetailLogMapper extends BaseMapper { /* - * @description: 更新会员日志 - * @author: sui q - * @date: 2024/12/31 13:44 - * @param: null null + * 更新会员日志 **/ void updateCuMemberRetailLogByList(@Param("cuMemberRetailLogs") List cuMemberRetailLogs); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java index 1274e5aa..71dee107 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java @@ -30,27 +30,22 @@ import java.util.List; public class MemberSettleBonusProvider implements IMemberSettleBonusApi { @Autowired - private ICuMemberMonthAchieveService cuMemberMonthAchieveService; - + private ICuMemberMonthAchieveService iCuMemberMonthAchieveService; @Autowired - private IBonusSettleService bonusSettleService; - + private IBonusSettleService iBonusSettleService; @Autowired - private ICuMemberBonusService cuMemberBonusService; - + private IBonusGrantService iBonusGrantService; @Autowired - private IBonusGrantService bonusGrantService; - + private ICuMemberBonusService iCuMemberBonusService; @Autowired - private ICuMemberAchieveService cuMemberAchieveService; - + private ICuMemberAchieveService iCuMemberAchieveService; @Autowired - private ICuMemberRetailLogService cuMemberRetailLogService; + private ICuMemberRetailLogService iCuMemberRetailLogService; @Override public R calculateCumberBonusBySecond(String orderCode) { try { - bonusSettleService.calculateCumberBonusBySecond(orderCode); + iBonusSettleService.calculateCumberBonusBySecond(orderCode); } catch (Exception e) { return R.fail(); } @@ -69,7 +64,7 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { @Override public void backupsSettleBonusEveryday() { - cuMemberBonusService.backupsSettleBonusEveryday(); + iCuMemberBonusService.backupsSettleBonusEveryday(); } class BonusCalculateBonus extends Thread { @@ -82,55 +77,53 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { @Override public void run() { - if (DateUtils.compareDateBefore(settleDate, DateUtils.parseStringToDate("2023-09-04"))) { - return; - } Date settleEndDate = DateUtils.afterDate(1, ChronoUnit.DAYS, settleDate); - log.info("奖金结算完成,结算时间：{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate)); + log.info("奖金结算开始, 结算时间：{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate)); // 奖金结算 try { - cuMemberBonusService.autoCalculateBonus(settleDate, settleEndDate); + iCuMemberBonusService.autoCalculateBonus(settleDate, settleEndDate); + log.info("奖金结算结束"); } catch (Exception e) { - log.info("BonusCalculateBonus error: ", e); + log.error("奖金结算异常,结算时间：{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate), e); } } } @Override public void insertCuMemberAchieveByEveryDay() { - cuMemberMonthAchieveService.insertCuMemberAchieveByEveryDay(DateUtils.beforeDate(1, ChronoUnit.DAYS)); + iCuMemberMonthAchieveService.insertCuMemberAchieveByEveryDay(DateUtils.beforeDate(1, ChronoUnit.DAYS)); } @Override public void autoPublishBonus() { - bonusGrantService.publishBonusByPeriodEveryDay(); + iBonusGrantService.publishBonusByPeriodEveryDay(); } @Override public void autoGrantBonus() { - bonusGrantService.grantWithdrawBonusByPeriodEveryDay(); + iBonusGrantService.grantWithdrawBonusByPeriodEveryDay(); } @Override public Boolean chargeBackSaOrder(SaOrder saOrder) { - return cuMemberAchieveService.chargeBackSaOrder(saOrder); + return iCuMemberAchieveService.chargeBackSaOrder(saOrder); } @Override public void calculateCuMemberRetailRangeBonusBySaOrder() { - List cuMemberRetailLogs = cuMemberRetailLogService.queryCuMemberRetailLog(); + List cuMemberRetailLogs = iCuMemberRetailLogService.queryCuMemberRetailLog(); if (cuMemberRetailLogs.size() > 0) { List successLogList = new ArrayList<>(); try { for (CuMemberRetailLog cuMemberRetailLog : cuMemberRetailLogs) { - bonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(cuMemberRetailLog.getOrderCode()); + iBonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(cuMemberRetailLog.getOrderCode()); successLogList.add(cuMemberRetailLog); } } catch (Exception e) { e.printStackTrace(); } finally { if (successLogList.size() > 0) { - cuMemberRetailLogService.updateCuMemberRetailLogByList(successLogList); + iCuMemberRetailLogService.updateCuMemberRetailLogByList(successLogList); } } } @@ -138,6 +131,6 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { @Override public R queryValidateBoxOrAchieve(Long pkMember) { - return R.ok(bonusSettleService.queryValidateBoxOrAchieve(pkMember)); + return R.ok(iBonusSettleService.queryValidateBoxOrAchieve(pkMember)); } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java index 3489cd83..b93db1fd 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java @@ -1,27 +1,20 @@ package com.hzs.bonus.bonus.service; import com.hzs.common.domain.member.bonus.CuMemberRetail; -import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import java.util.List; /** - * @Description: 奖金结算服务类 - * @Author: sui q - * @Time: 2022/11/3 18:49 - * @Classname: IBonusSettleService - * @PackageName: com.hzs.member.achieve.service + * 奖金结算服务类 */ public interface IBonusSettleService { /** * 根据秒结算会员奖金 + * * @param orderCode 订单 - * @return: List - * @Author: sui q - * @Date: 2023/2/1 21:27 - */ + */ void calculateCumberBonusBySecond(String orderCode); /** @@ -29,32 +22,22 @@ public interface IBonusSettleService { * * @param date 结算日期 * @param saOrderExtList 订单 - * @Author: sui q - * @Date: 2022/11/3 13:56 */ void calculateCuMemberBonus(String date, List saOrderExtList); /* - * @description: 根据订单计算新零售奖金 - * @author: sui q - * @date: 2024/12/12 9:39 - * @param: null null + * 根据订单计算新零售奖金 **/ void calculateCuMemberRetailRangeBonusBySaOrder(String orderCode); /* - * @description: 4-n配置修改后，重算首购奖金 - * @author: sui q - * @date: 2024/7/23 11:15 - * @param: null null + * 4-n配置修改后，重算首购奖金 **/ void repeatCuMemberBonusByExpand(String settleDate, List saOrderExtList); /* - * @description: 根据会员查询会员的 大小区盒数、业绩 - * @author: sui q - * @date: 2025/2/20 15:10 - * @param: null null + * 根据会员查询会员的 大小区盒数、业绩 **/ CuMemberRetail queryValidateBoxOrAchieve(Long pkMember); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java index 363fe74e..2c7b76f6 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java @@ -6,28 +6,18 @@ import com.hzs.common.domain.member.bonus.CuMemberRetailLog; import java.util.List; /** - *

* 秒接日志记录表 服务类 - *

- * - * @author hzs - * @since 2024-12-27 */ public interface ICuMemberRetailLogService extends IService { /* - * @description: 查询24小时之内失败的记录，重试 - * @author: sui q - * @date: 2024/12/31 13:35 - * @param: null null + * 查询24小时之内失败的记录，重试 **/ List queryCuMemberRetailLog(); /* - * @description: 更新会员日志 - * @author: sui q - * @date: 2024/12/31 13:44 - * @param: null null + * 更新会员日志 **/ void updateCuMemberRetailLogByList(List cuMemberRetailLogs); + } 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 b35f2d44..f7fd7985 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 @@ -1,12 +1,8 @@ package com.hzs.bonus.bonus.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.achieve.param.MemberAchieveParam; -import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberTreeService; -import com.hzs.bonus.base.service.ICuMemberService; -import com.hzs.bonus.bonus.service.ICuBonusExpandService; import com.hzs.bonus.detail.service.ICuMemberAssessService; import com.hzs.common.core.constant.BonusFieldConstants; import com.hzs.common.core.constant.CountryConstants; @@ -18,7 +14,6 @@ import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.reflect.ReflectUtils; import com.hzs.common.domain.bonus.BdBonusDeduct; -import com.hzs.common.domain.member.achieve.CuMemberRetailRange; import com.hzs.common.domain.member.achieve.CuMemberTree; import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt; import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt; @@ -28,7 +23,6 @@ import com.hzs.common.domain.member.detail.CuMemberAssess; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderBonus; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; @@ -47,27 +41,18 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.*; -/** - * @Description: - * @Author: sui q - * @Time: 2022/11/16 11:24 - * @Classname: BonusSettleHandle - * @PackageName: com.hzs.member.achieve.service.impl - */ @Component public abstract class BonusSettleHandle { - protected ICuMemberTreeService cuMemberTreeService; - @DubboReference protected ISaOrderServiceApi saOrderServiceApi; - @DubboReference protected IBonusItemsServiceApi bonusItemsServiceApi; - @DubboReference private ICurrencyServiceApi currencyServiceApi; + protected ICuMemberTreeService cuMemberTreeService; + @Autowired public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) { this.cuMemberTreeService = cuMemberTreeService; @@ -148,14 +133,12 @@ public abstract class BonusSettleHandle { } /** + * 获得国家对应的4-n参数比例 + * * @param bonusConfigDTO 奖金配置汇总 * @param memberSettleExt 会员 * @param endTouch 4-n的次数 * @param bdGrade 等级 - * @Description: 获得国家对应的4-n参数比例 - * @return: BigDecimal - * @Author: sui q - * @Date: 2022/11/16 11:27 */ protected BigDecimal getCountryExpand(BonusConfigDTO bonusConfigDTO, CuMemberSettleExt memberSettleExt, Integer endTouch, BdGrade bdGrade, BigDecimal addTouch, BigDecimal editExpandRatio) { @@ -175,14 +158,12 @@ public abstract class BonusSettleHandle { } /** + * 获得国家对应的4-n参数比例 + * * @param bonusConfigDTO 奖金配置汇总 * @param memberSettleExt 会员 * @param endTouch 4-n的次数 * @param bdGrade 等级 - * @Description: 获得国家对应的4-n参数比例 - * @return: BigDecimal - * @Author: sui q - * @Date: 2022/11/16 11:27 */ protected BigDecimal getCountryRepurchaseExpand(BonusConfigDTO bonusConfigDTO, CuMemberSettleExt memberSettleExt, Integer endTouch, BdGrade bdGrade, BigDecimal addTouch, BigDecimal editExpandRatio) { BonusExpandDTO bonusExpand = bonusConfigDTO.getBonusExpandMap().get(memberSettleExt.getPkSettleCountry()); @@ -728,14 +709,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 rangeBenefitRetailRemark(SaOrder saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRetailRangeExt sourceMemberRangeExt, CuMemberRetailRangeExt targetMemberRangeExt) { @@ -747,14 +726,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 oriRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRangeExt sourceMemberRangeExt, CuMemberRangeExt targetMemberRangeExt) { @@ -785,33 +762,29 @@ public abstract class BonusSettleHandle { } /** + * 获得 报单服务费收益的备注 + * * @param saOrderExt 订单编号 * @param cuMemberBonusRange 报单服务费 * @param sourceCuMemberSettleExt 提供奖金的人 * @param targetCuMemberSettleExt 获得奖金的人 - * @Description: 获得 报单服务费收益的备注 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void xueRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberSettleExt sourceCuMemberSettleExt, CuMemberSettleExt targetCuMemberSettleExt) { String remark = String.format(BonusMsgConstants.LE_XUE_SHARE_RANGE, saOrderExt.getOrderCode(), sourceCuMemberSettleExt.getMemberCode() + sourceCuMemberSettleExt.getMemberName(), targetCuMemberSettleExt.getMemberCode() + targetCuMemberSettleExt.getMemberName(), - ComputeUtil.computeDivide(targetCuMemberSettleExt.getRetailPrice(), BigDecimal.valueOf(6.4)), targetCuMemberSettleExt.getGradeValue()); + ComputeUtil.computeDivide(targetCuMemberSettleExt.getRetailPrice(), BigDecimal.ONE), targetCuMemberSettleExt.getGradeValue()); cuMemberBonusRange.setRemark(remark); } /** + * 获得 报单服务费收益的备注 + * * @param saOrder 订单编号 * @param cuMemberBonusDetail 云代首购 * @param sourceCuMemberSettleExt 提供奖金的人 * @param targetCuMemberSettleExt 获得奖金的人 - * @Description: 获得 报单服务费收益的备注 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void cloudAgentRemark(SaOrder saOrder, CuMemberBonusDetail cuMemberBonusDetail, CuMemberSettleExt sourceCuMemberSettleExt, CuMemberSettleExt targetCuMemberSettleExt, String msg) { @@ -1206,13 +1179,11 @@ public abstract class BonusSettleHandle { } /** + * 设置奖金扣项，计算税前收益，扣税，实际收益, 设置明细表 + * * @param cuMemberDetail 奖金明细 * @param orderAmount 订单金额 * @param exchangeRate 入汇率 - * @Description: 设置奖金扣项，计算税前收益，扣税，实际收益, 设置明细表 - * @return: void - * @Author: sui q - * @Date: 2023/1/11 11:17 */ protected BdBonusDeduct setBonusDetailDeduct(BonusConfigDTO bonusConfigDTO, Object cuMemberDetail, BigDecimal orderAmount, BigDecimal exchangeRate) { Integer pkBonusItems = ReflectUtils.invokeGetter(cuMemberDetail, BonusFieldConstants.PK_BONUS_ITEMS); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index 10471d58..772ce9e2 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -724,12 +724,12 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { cuMemberBonusRange.setCalAchieve(saOrderItemsExt.getAchievement()); cuMemberBonusRange.setCalValue(BigDecimal.ZERO); cuMemberBonusRange.setPretaxIncome(ComputeUtil.computeMultiply(BigDecimal.valueOf(saOrderItemsExt.getWaresQuantity()), - ComputeUtil.computeDivide(targetMemberSettleExt.getRetailPrice(), BigDecimal.valueOf(6.4)))); + ComputeUtil.computeDivide(targetMemberSettleExt.getRetailPrice(), BigDecimal.ONE))); String key = targetMemberSettleExt.getPkSettleCountry().toString() + ERangeType.GRADE.getValue() + targetMemberSettleExt.getPkGrade(); cuMemberBonusRange.setPkRange(rangeDtoMap.get(key).getPkRange()); String beforeKey = targetMemberSettleExt.getPkSettleCountry().toString() + ERangeType.GRADE.getValue() + targetMemberSettleExt.getPkGrade(); cuMemberBonusRange.setPkBeforeRange(rangeDtoMap.get(beforeKey).getPkRange()); - cuMemberBonusRange.setIncomeRatio(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(cuMemberBonusRange.getPretaxIncome(), BigDecimal.valueOf(6.4)), saOrderExt.getOrderAmount())); + cuMemberBonusRange.setIncomeRatio(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(cuMemberBonusRange.getPretaxIncome(), BigDecimal.ONE), saOrderExt.getOrderAmount())); cuMemberBonusRange.setPkOrderItems(0L); // 计算比例 cuMemberBonusRange.setPkBonusItems(getPkBonusItems(bonusConfigDTO, targetMemberSettleExt.getPkSettleCountry(), EBonusItems.REPURCHASE_RANGE_INCOME.getValue())); 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 1b3bc523..a16cf1a4 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 @@ -3,9 +3,6 @@ package com.hzs.bonus.bonus.service.impl; import com.hzs.bonus.achieve.service.ICuMemberRangeService; import com.hzs.bonus.achieve.service.ICuMemberRetailRangeService; import com.hzs.bonus.base.service.ICuMemberService; -import com.hzs.bonus.bonus.param.BdWaresBonusParam; -import com.hzs.bonus.bonus.service.IBdWaresBonusService; -import com.hzs.bonus.bonus.service.ICuMemberSpeRetailService; import com.hzs.bonus.bonus.vo.BonusRecordDetailVO; import com.hzs.bonus.detail.service.ICuMemberAwardsService; import com.hzs.bonus.detail.service.ICuMemberGradeService; @@ -31,9 +28,7 @@ import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdRangeAwards; -import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.config.dto.BonusConfigDTO; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -42,51 +37,33 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - * @description: 计算乐享极差收益 - * @author: sui q - * @time: 2024/10/15 13:53 - * @classname: BonusSettleRangeHandle - * @package_name: com.hzs.bonus.bonus.service.impl - * version 1.0.0 + * 计算乐享极差收益 */ @Component public class BonusSettleRangeHandle extends BonusSettleHandle { - @DubboReference - private IAwardsServiceApi awardsServiceApi; - @Autowired - private ICuMemberRangeService cuMemberRangeService; - + private ICuMemberRangeService iCuMemberRangeService; @Autowired - private ICuMemberRetailRangeService cuMemberRetailRangeService; - + private ICuMemberRetailRangeService iCuMemberRetailRangeService; @Autowired - private ICuMemberAwardsService cuMemberAwardsService; - + private ICuMemberAwardsService iCuMemberAwardsService; @Autowired - private ICuMemberGradeService cuMemberGradeService; - + private ICuMemberGradeService iCuMemberGradeService; @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberSpeRetailService cuMemberSpeRetailService; - - /* - * @description: 实时计算当月奖衔 - * @author: sui q - * @date: 2024/10/22 15:16 - * @param: null null - **/ + /** + * 实时计算当月奖衔 + */ List calculateCuMemberRetailRangeBonusBySecond(String settleDate, SaOrderExt saOrderExt, BonusConfigDTO bonusConfigDTO, String secondRangeTableName, int beforePeriod, int currentPeriod, Map cuMemberBonusMap, List cuMemberBonusDetailList) { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; - cuMemberRetailRangeService.mergeMemberSecondRetailRangeByRange(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); - cuMemberGradeService.updateCuMemberGradeSecond(secondRangeTableName, currentPeriod); + iCuMemberRetailRangeService.mergeMemberSecondRetailRangeByRange(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberGradeService.updateCuMemberGradeSecond(secondRangeTableName, currentPeriod); // 按照血缘，查询该会员所有伞上会员 - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); Map memberRangeExtMap = new HashMap<>(); Map retaiBuyGradeMap = new TreeMap<>(); @@ -175,7 +152,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } Map countyRangeExtMap = new HashMap<>(); - List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); + List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); countyRangeExtList.forEach(cuMemberRetailRangeExt -> countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 计算区域奖 @@ -183,28 +160,25 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (cuMemberBonusDetail != null) { cuMemberBonusDetailList.add(cuMemberBonusDetail); } - cuMemberGradeService.updateCuMemberGrade(secondRangeTableName, saOrderExt.getPkId()); + iCuMemberGradeService.updateCuMemberGrade(secondRangeTableName, saOrderExt.getPkId()); if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); + iCuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); // 更新会员表,更新奖衔 - cuMemberService.updateCuMemberRetailRangeByList(cuMemberAwardsList, currentPeriod); + iCuMemberService.updateCuMemberRetailRangeByList(cuMemberAwardsList, currentPeriod); } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); - cuMemberService.updateCuMemberGradeByList(cuMemberGradeList, currentPeriod); + iCuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); + iCuMemberService.updateCuMemberGradeByList(cuMemberGradeList, currentPeriod); } if (memberRetailRangeExtList.size() > 0) { - cuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); } return cuMemberBonusRangeList; } - /* - * @description: 实时计算当月奖衔 - * @author: sui q - * @date: 2024/10/22 15:16 - * @param: null null - **/ + /** + * 实时计算当月奖衔 + */ void calculateCuMemberBackRetailIncome(SaOrderExt saOrderExt, BonusConfigDTO bonusConfigDTO, String secondRangeTableName, int beforePeriod, int currentPeriod) { // 当天的撤单 @@ -212,18 +186,18 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; if (DateUtils.isSameDay(saOrderExt.getPayTime(), DateUtils.currentDate())) { // 按照血缘，查询该会员所有伞上会员 - cuMemberRetailRangeService.mergeMemberRetailGradeByMember(secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberRetailRangeService.mergeMemberRetailGradeByMember(secondRangeTableName, saOrderExt.getPkMember()); // 恢复奖衔 - cuMemberAwardsService.mergeCuMemberBackAwards(secondRangeTableName, saOrderExt.getPkMember(), currentPeriod); - memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberAwardsService.mergeCuMemberBackAwards(secondRangeTableName, saOrderExt.getPkMember(), currentPeriod); + memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); } else { rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + currentPeriod; List retailOrderList = new ArrayList<>(); retailOrderList.add(saOrderExt); - cuMemberRetailRangeService.mergeMemberRetailGradeByMember(rangeTableName, saOrderExt.getPkMember()); + iCuMemberRetailRangeService.mergeMemberRetailGradeByMember(rangeTableName, saOrderExt.getPkMember()); // 恢复奖衔 - cuMemberAwardsService.mergeCuMemberBackAwards(rangeTableName, saOrderExt.getPkMember(), beforePeriod); - memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); + iCuMemberAwardsService.mergeCuMemberBackAwards(rangeTableName, saOrderExt.getPkMember(), beforePeriod); + memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); } Map memberRangeExtMap = new HashMap<>(); @@ -278,9 +252,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { List cuMemberRetailRangeExtList = calculateRetailBackRangeGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, boxNum, cuMemberGradeMap, cuMemberAwardsMap); cuMemberRetailRangeExtList.add(sourceMemberRangeExt); // 查询期间的等级和奖衔 - List memberGradeList = cuMemberGradeService.queryCuMemberGrade(cuMemberRetailRangeExtList, currentPeriod); + List memberGradeList = iCuMemberGradeService.queryCuMemberGrade(cuMemberRetailRangeExtList, currentPeriod); // 查询最大的手动奖衔 - List cuMemberGradeList1 = cuMemberGradeService.queryCuMemberGradeByList(currentPeriod, memberRetailRangeExtList); + List cuMemberGradeList1 = iCuMemberGradeService.queryCuMemberGradeByList(currentPeriod, memberRetailRangeExtList); if (cuMemberGradeList1.size() > 0) { Map memberGradeMap = new HashMap<>(); for (CuMemberGrade cuMemberGrade : cuMemberGradeList1) { @@ -316,11 +290,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.deleteCuMemberGrade(cuMemberGradeList, currentPeriod); - cuMemberService.updateCuMemberMinGradeByList(cuMemberGradeList, currentPeriod); + iCuMemberGradeService.deleteCuMemberGrade(cuMemberGradeList, currentPeriod); + iCuMemberService.updateCuMemberMinGradeByList(cuMemberGradeList, currentPeriod); } } - List memberAwardsList = cuMemberAwardsService.queryCuMemberAwards(cuMemberRetailRangeExtList, currentPeriod); + List memberAwardsList = iCuMemberAwardsService.queryCuMemberAwards(cuMemberRetailRangeExtList, currentPeriod); if (memberAwardsList.size() > 0) { List cuMemberAwardsList = new ArrayList<>(); for (CuMemberAwards cuMemberAwards : memberAwardsList) { @@ -340,17 +314,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // 处理等级、奖衔 if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.deleteCuMemberAwards(cuMemberAwardsList, currentPeriod); + iCuMemberAwardsService.deleteCuMemberAwards(cuMemberAwardsList, currentPeriod); // 更新会员表,更新奖衔 - cuMemberService.updateCuMemberMinAwardsByList(cuMemberAwardsList, currentPeriod); + iCuMemberService.updateCuMemberMinAwardsByList(cuMemberAwardsList, currentPeriod); } } // 处理业绩 if (memberRangeExtMap.size() > 0) { if (DateUtils.isSameDay(saOrderExt.getPayTime(), DateUtils.currentDate())) { - cuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); } else { - cuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); } } } @@ -368,13 +342,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberGrade; } - /* - * @description: 计算新零售团队的奖金，极差、平级、福利、福利分红、区域 - * 订单： HZS30720290 - * @author: sui q - * @date: 2024/10/15 13:55 - * @param: null null - **/ + /** + * 计算新零售团队的奖金，极差、平级、福利、福利分红、区域 + */ void calculateRetailBonusByDay(String settleDate, Map cuMemberBonusMap, BonusConfigDTO bonusConfigDTO, BonusRecordDetailVO bonusRecordDetailVO, Integer period, Integer yesterdayPeriod, Boolean isSameMonth) { Date settleStartDate = DateUtils.parseStringToDate(settleDate); @@ -392,19 +362,19 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; String yesterdayRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + yesterdayPeriod; // 回退奖衔，将奖衔回退到结算前状态 - cuMemberAwardsService.calculateCuMemberRetailRangeAwardsInit(settleDate, period, rangeTableName); + iCuMemberAwardsService.calculateCuMemberRetailRangeAwardsInit(settleDate, period, rangeTableName); // 更新网体 - cuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth); - List memberLevelList = cuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName); + iCuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth); + List memberLevelList = iCuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName); Map memberLevelMap = new HashMap<>(); memberLevelList.forEach(cuMemberLevel -> memberLevelMap.put(cuMemberLevel.getPkOrder(), cuMemberLevel)); // 回退历史注水 - cuMemberRetailRangeService.mergeCuMemberRetailBackBoxBySpecial(rangeTableName, yesterdayRangeTableName, period); + iCuMemberRetailRangeService.mergeCuMemberRetailBackBoxBySpecial(rangeTableName, yesterdayRangeTableName, period); // 更新注水 - cuMemberRetailRangeService.mergeCuMemberRetailRangeBySpecial(rangeTableName, period); + iCuMemberRetailRangeService.mergeCuMemberRetailRangeBySpecial(rangeTableName, period); if (retailOrderList.size() > 0) { // 按照血缘，查询该会员所有伞上会员 - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); Map memberRangeExtMap = new HashMap<>(); Map retaiBuyGradeMap = new TreeMap<>(); Map retailTeamGradeMap = new TreeMap<>(); @@ -450,7 +420,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } Map countyRangeExtMap = new HashMap<>(); - List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); + List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); countyRangeExtList.forEach(cuMemberRetailRangeExt -> countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 奖衔升级记录 @@ -496,37 +466,31 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 团队业绩，计算奖衔 calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt); cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, boxNum, cuMemberGradeList)); - // 美业订单计算极差收益,没有平级收益 - if (EOrderType.RETAIL_SHOP_ORDER.getValue() == saOrderExt.getOrderType()) { - for (SaOrderItemsExt saOrderItems : saOrderExt.getOrderItemsExtList()) { -// cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); - } - } else { - // 计算奖金 计算极差平级收益 - for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { - for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { - if (saOrderItems.getWaresCode() != null && saOrderItems.getWaresCode().equals(waresCode)) { - 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() || + + // 计算奖金 计算极差平级收益 + for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { + for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { + if (saOrderItems.getWaresCode() != null && saOrderItems.getWaresCode().equals(waresCode)) { + 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); } } } @@ -559,32 +523,29 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); + iCuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); // 更新会员表,更新奖衔 - cuMemberService.updateCuMemberRetailRangeByPeriod(cuMemberAwardsList, period); + iCuMemberService.updateCuMemberRetailRangeByPeriod(cuMemberAwardsList, period); } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); - cuMemberService.updateCuMemberGradeByPeriod(cuMemberGradeList, period); + iCuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); + iCuMemberService.updateCuMemberGradeByPeriod(cuMemberGradeList, period); // 根据cu_member_level更新cu_member - cuMemberService.updateCuMemberLevel(settleStartDate, settleEndDate); + iCuMemberService.updateCuMemberLevel(settleStartDate, settleEndDate); } // 更新网体 - cuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); } } - /* - * @description: 查询会员验证大小区，区域算法2种条件，1 实际满足V5 1种是满足 30w 小区10w - * @author: sui q - * @date: 2025/2/20 15:22 - * @param: null null - **/ + /** + * 查询会员验证大小区，区域算法2种条件，1 实际满足V5 1种是满足 30w 小区10w + */ CuMemberRetail queryValidateBoxOrAchieve(int currentPeriod, int beforePeriod, Long pkMember) { CuMemberRetail cuMemberRetail = new CuMemberRetail(); String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; String secondRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_S + currentPeriod; - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRange(rangeTableName, secondRangeTableName, pkMember); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRange(rangeTableName, secondRangeTableName, pkMember); List cuMemberRangeExtList = new ArrayList<>(); CuMemberRetailRangeExt targetMemberRangeExt = null; for (CuMemberRetailRangeExt cuMemberRetailRangeExt : memberRetailRangeExtList) { @@ -724,14 +685,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 先计算奖衔,奖衔计算分为2种，先计算自己消费足够的，S1-S3，S4以上的另一种方式，自消费的只有购买人，其他的都是根据业绩，注意，有人可以直接是S4 + /** + * 先计算奖衔,奖衔计算分为2种，先计算自己消费足够的，S1-S3，S4以上的另一种方式，自消费的只有购买人，其他的都是根据业绩，注意，有人可以直接是S4 * 先验证团队业绩，小区业绩，验证小市场需要从上往下走 s1只能通过自消费，除了购买人其他人丛S2开始升级 * 计算个人消费奖项 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + */ public List calculateConsumeRangeAwards(Integer period, Map> parentRangeExtMap, Map memberRangeExtMap, String rangeTableName, CuMemberRangeExt sourceMemberRangeExt, SaOrderExt saOrderExt, Map consumeRangeAwardsMap) { @@ -745,7 +703,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 去结算表种查询该会员下所有会员，会员团队业绩+消费业绩是业绩 计算小区业绩 团队业绩-小区业绩 验证小区、直推必有一种 // 如果需要验证小区 if (ComputeUtil.compareValue(bdRangeAwards.getCommunityCheck())) { - List cuMemberRangeExtList = cuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, sourceMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); + List cuMemberRangeExtList = iCuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, sourceMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); // 需要验证团队业绩，小区业绩 if (calculateAwards(parentRangeExtMap, memberRangeExtMap, sourceMemberRangeExt, bdRangeAwards, cuMemberRangeExtList, false)) { break; @@ -768,12 +726,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberAwardsList; } - /* - * @description: 计算团队极差奖衔 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 计算团队极差奖衔 + */ public List calculateBloodRangeAwards(Integer period, Map> parentRangeExtMap, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map bloodRangeAwardsMap, long pkParent, String secondRangeTableName) { // 计算血缘奖衔，一级一级升级，分为2段，s2、s3 一级，s3以上一级，先验证团队总业绩, @@ -808,9 +763,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 去结算表种查询该会员下所有会员，会员团队业绩+消费业绩是业绩 计算小区业绩 团队业绩-小区业绩 验证小区、直推必有一种 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRangeService.querySecondCuMemberRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRangeService.querySecondCuMemberRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); + cuMemberRangeExtList = iCuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); } if (cuMemberRangeExtList.size() > 0) { if (calculateAwards(parentRangeExtMap, memberRangeExtMap, targetMemberRangeExt, bdRangeAwards, cuMemberRangeExtList, true)) { @@ -820,17 +775,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 当日的实时奖衔，这个位置直接在会员表中计算就可以 if (bdRangeAwards.getPlaceNum() > 0) { if (secondRangeTableName != null) { - cuMemberRangeService.mergeSecondCuMemberRangeExt(secondRangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); + iCuMemberRangeService.mergeSecondCuMemberRangeExt(secondRangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); // 验证 - Integer placeNum = cuMemberRangeService.validateSecondCuMemberPlaceAwards(secondRangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards()); + Integer placeNum = iCuMemberRangeService.validateSecondCuMemberPlaceAwards(secondRangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards()); if (bdRangeAwards.getPlaceNum() > placeNum) { break; } } else { // 更新网体，更新伞下 - cuMemberRangeService.mergeCuMemberRangeExt(rangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); + iCuMemberRangeService.mergeCuMemberRangeExt(rangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); // 验证 - Integer placeNum = cuMemberRangeService.validateCuMemberPlaceAwards(rangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards(), saOrderExt.getPayTime()); + Integer placeNum = iCuMemberRangeService.validateCuMemberPlaceAwards(rangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards(), saOrderExt.getPayTime()); if (bdRangeAwards.getPlaceNum() > placeNum) { break; } @@ -853,12 +808,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberAwardsList; } - /* - * @description: 计算团队极差奖衔 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 计算团队极差奖衔 + */ public List calculateRetailRangeGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, Integer boxNum, List cuMemberGradeList) { @@ -897,9 +849,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 验证小区，计算小区累计盒数 查询伞下会员 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } // 有注水的，大区无限大，新增全算小区 int bigBoxNum = targetMemberRangeExt.getConsumeBoxNum(); @@ -939,9 +891,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // // 验证小区，计算小区业绩 // List cuMemberRangeExtList; // if (secondRangeTableName != null) { -// cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); +// cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); // } else { -// cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); +// cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); // } // for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRangeExtList) { // if (memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { @@ -976,7 +928,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 先验证累计业绩 if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) { // 验证小区，计算小区业绩 - List cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + List cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); BigDecimal consumeBigPv = targetMemberRangeExt.getMonthConsumePv(); // if (ComputeUtil.compareGreaterThan(targetMemberRangeExt.getBigTeamPv(), consumeBigPv)) { // consumeBigPv = targetMemberRangeExt.getBigTeamPv(); @@ -994,14 +946,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (ComputeUtil.compareValue(smallAreaPv, bdAwards.getShareCommunityCheck())) { if (bdAwards.getPlaceDeptNum() > 0) { // 验证是否有多个区满足业绩 - List cuMemberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck()); + List cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck()); int enoughNum = 0; - for(CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRetailRangeExtList){ + for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRetailRangeExtList) { if (memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { cuMemberRetailRangeExt = memberRangeExtMap.get(cuMemberRetailRangeExt.getPkMember()); } - if(ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberRetailRangeExt.getMonthConsumePv(), cuMemberRetailRangeExt.getTeamMonthPv()), bdAwards.getShareCommunityCheck())){ - enoughNum+=1; + if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberRetailRangeExt.getMonthConsumePv(), cuMemberRetailRangeExt.getTeamMonthPv()), bdAwards.getShareCommunityCheck())) { + enoughNum += 1; } } if (bdAwards.getPlaceDeptNum() > enoughNum) { @@ -1019,12 +971,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 计算团队极差奖衔 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 计算团队极差奖衔 + */ public List calculateRetailBackRangeGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, Integer boxNum, Map cuMemberGradeMap, Map cuMemberAwardsMap) { @@ -1062,9 +1011,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 验证小区，计算小区累计盒数 查询伞下会员 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } int bigBoxNum = targetMemberRangeExt.getConsumeBoxNum(); if (targetMemberRangeExt.getBigBoxNum() > 0) { @@ -1101,9 +1050,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 验证小区，计算小区业绩 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } BigDecimal consumeBigPv = BigDecimal.ZERO; for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRangeExtList) { @@ -1130,12 +1079,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 计算奖衔，验证小区业绩和推荐数量是否满足 - * @author: sui q - * @date: 2024/10/16 16:31 - * @param: null null - **/ + /** + * 计算奖衔，验证小区业绩和推荐数量是否满足 + */ private boolean calculateAwards(Map> parentRangeExtMap, Map memberRangeExtMap, CuMemberRangeExt targetMemberRangeExt, BdRangeAwards bdRangeAwards, List cuMemberRangeExtList, Boolean isRecommend) { BigDecimal bigAreaPv = BigDecimal.ZERO; Integer recommendNum = 0; @@ -1171,7 +1117,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // /* -// * @description: 计算幸运奖，先计算有效代数，所有有效代数均分，比例10% +// * 计算幸运奖，先计算有效代数，所有有效代数均分，比例10% // * @author: sui q // * @date: 2024/10/17 11:34 // * @param: null null @@ -1221,12 +1167,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // return memberBonusCoachList; // } - /* - * @description: 计算极差收益，根据极差收益计算平级收益 - * @author: sui q - * @date: 2024/10/17 14:31 - * @param: null null - **/ + /** + * 计算极差收益，根据极差收益计算平级收益 + */ List calculateRetailRangeBonus(Map memberRangeExtMap, Map cuMemberBonusMap, Map gradeMap, BonusConfigDTO bonusConfigDTO, Integer period, SaOrderWaresExt saOrderItems, SaOrderExt saOrderExt) { List memberBonusRangeList = new ArrayList<>(); @@ -1252,7 +1195,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { continue; } // 推荐V1 有额外100 -// CuMemberRetailRangeExt parentMemberRangeExt = memberRangeExtMap.get(memberRangeExtMap.get(saOrderExt.getPkMember()).getPkParent()); int calGradeValue = targetMemberRangeExt.getGradeValue(); // 如果价格是209，代表是第一单激活，只有平级收益，只有V5有平级收益 if (beginBuyPrice.equals(BigDecimal.valueOf(209))) { @@ -1272,7 +1214,7 @@ 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(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(ComputeUtil.computeSubtract(ComputeUtil.computeSubtract(beginBuyPrice, buyPrice), calBonusIncome), saOrderItems.getWaresQuantity()), BigDecimal.valueOf(6.4))); + cuMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(ComputeUtil.computeSubtract(ComputeUtil.computeSubtract(beginBuyPrice, buyPrice), calBonusIncome), saOrderItems.getWaresQuantity()), BigDecimal.ONE)); cuMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); @@ -1313,7 +1255,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal sameBuyPrice = gradeMap.get(calGradeValue).getBuyPrice(); // 有平级 // if (calGradeValue < beginGradeValue) { - if(ComputeUtil.compareGreaterThan(sameBuyPrice, comBuyPrice)){ + if (ComputeUtil.compareGreaterThan(sameBuyPrice, comBuyPrice)) { lastPkParent = targetMemberRangeExt.getPkParent(); pkParent = targetMemberRangeExt.getPkParent(); j--; @@ -1342,13 +1284,13 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } else if (j == 2) { bonusIncome = bdGrade.getThirdAlgebra(); } - if (/*calGradeValue == beginGradeValue && */ComputeUtil.compareEqual(beginBuyPrice, sameBuyPrice)) { + if (ComputeUtil.compareEqual(beginBuyPrice, sameBuyPrice)) { CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMemberRangeExt.getPkMember(), 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(10)); - oriMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(bonusIncome, saOrderItems.getWaresQuantity()), BigDecimal.valueOf(6.4))); + oriMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(bonusIncome, saOrderItems.getWaresQuantity()), BigDecimal.ONE)); oriMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); @@ -1417,10 +1359,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { /** * 计算某条订单的推荐奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/2/4 13:57 */ CuMemberBonusPush calculatePushBonusOne(CuMemberRangeExt sourceMemberRangeExt, Map cuMemberRangeExtMap, BonusConfigDTO bonusConfigDTO, Integer period, Map cuMemberBonusMap, SaOrderExt saOrderExt, int algebra, BigDecimal orderAssAchieve, List cuMemberBonusPushList) { @@ -1500,10 +1438,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** - * @Description: 计算服务中心奖 - * @return: CuMemberBonusDetail - * @Author: sui q - * @Date: 2023/2/8 17:22 + * 计算服务中心奖 */ CuMemberBonusDetail calculateRangeStoreBonusOne(Map cuMemberRangeExtMap, CuMemberRangeExt targetMemberRangeExt, BonusConfigDTO bonusConfigDTO, Integer period, Map cuMemberBonusMap, SaOrderExt saOrderExt) { CuMemberRangeExt sourceMemberRangeExt = cuMemberRangeExtMap.get(saOrderExt.getPkMember()); @@ -1535,10 +1470,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { /** * @param settleDateStr 结算日期 - * @Desccription: 计算新零售的月奖，区域、福利、福利分红 - * @return: Map 需要更新的 - * @Author: sui q - * @Date: 2022/11/10 17:40 */ void calculateRetailShareBonus(String settleDateStr, BonusConfigDTO bonusConfigDTO, Integer period, BonusRecordDetailVO bonusRecordDetailVO, Map cuMemberBonusMap) { @@ -1570,7 +1501,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (totalMonthOrderList.size() > 0) { Set pkMemberSet = new HashSet<>(); totalMonthOrderList.forEach(saOrder -> pkMemberSet.add(saOrder.getPkMember())); - List cuMemberRetailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByMemberPk(rangeTableName, pkMemberSet); + List cuMemberRetailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByMemberPk(rangeTableName, pkMemberSet); Map memberRangeExtMap = new HashMap<>(); cuMemberRetailRangeExtList.forEach(cuMemberRetailRangeExt -> memberRangeExtMap.put(cuMemberRetailRangeExt.getPkMember(), cuMemberRetailRangeExt)); @@ -1632,7 +1563,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusRange.setPkBeforeRange(sourceMemberRetailRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(0L); rangeBenefitRetailRemark(saOrder, cuMemberBonusRange, sourceMemberRetailRangeExt, targetMemberRangeExt); - BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrder.getOrderAmount(), BigDecimal.valueOf(6.4)); + BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrder.getOrderAmount(), BigDecimal.ONE); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusRange.getIncomeStatus()) { cuMemberBonus.setRetailBenefitRangeIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitRangeIncome(), cuMemberBonusRange.getPretaxIncome())); setRetailTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusRange); @@ -1645,9 +1576,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // CAR_AWARD_POINTS 福利平均收益 SHARE_INCOME 福利收益 // 查询v5 等级 且奖衔>=S4的 - List memberRetailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByAwards(rangeTableName); + List memberRetailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByAwards(rangeTableName); if (memberRetailRangeExtList.size() > 0) { - List retailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByParent(rangeTableName, memberRetailRangeExtList); + List retailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByParent(rangeTableName, memberRetailRangeExtList); Map> parentMemberRangeExtMap = new HashMap<>(); for (CuMemberRetailRangeExt cuMemberRetailRangeExt : retailRangeExtList) { if (parentMemberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkParent())) { @@ -1737,7 +1668,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // for (SaOrder saOrder : totalMonthOrderList) { // Map countyRangeExtMap = new HashMap<>(); -// List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); +// List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); // countyRangeExtList.forEach(cuMemberRetailRangeExt -> // countyRangeExtMap.put(cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // // 计算区域，获取所有有区域的会员 @@ -1784,7 +1715,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) { if (bonusItemsValue == EBonusItems.RETAIL_AREA_INCOME.getValue()) { cuMemberBonus.setRetailAreaIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailAreaIncome(), cuMemberBonusDetail.getPretaxIncome())); - }else if(bonusItemsValue == EBonusItems.RETAIL_BENEFIT_AVG_INCOME.getValue()) { + } else if (bonusItemsValue == EBonusItems.RETAIL_BENEFIT_AVG_INCOME.getValue()) { cuMemberBonus.setRetailBenefitAvgIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitAvgIncome(), cuMemberBonusDetail.getPretaxIncome())); } else { cuMemberBonus.setRetailBenefitIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitIncome(), cuMemberBonusDetail.getPretaxIncome())); @@ -1885,11 +1816,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** + * 记录需要修改的会员结算表数据, 安置的 + * * @param memberRangeMap 查询出来的结算数据 - * @Description: 记录需要修改的会员结算表数据, 安置的 - * @return: void - * @Author: sui q - * @Date: 2022/11/15 9:52 */ private Map getMemberSettle(Map> memberRangeMap) { Map memberRangeExtMap = new HashMap<>(); @@ -1949,12 +1878,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** + * 奖金明细 报单服务费、分红、云代首购、云代复购、海豆收益 + * * @param saOrderExt 订单 * @param cuMemberBonus 奖金主表 - * @Description: 奖金明细 报单服务费、分红、云代首购、云代复购、海豆收益 - * @return: CuMemberBonusDetail - * @Author: sui q - * @Date: 2023/1/5 16:31 */ private CuMemberBonusDetail getCuMemberBonusDetail(SaOrder saOrderExt, Integer incomeStatus, Integer pkCountry, CuMemberBonus cuMemberBonus) { CuMemberBonusDetail cuMemberBonusDetail = CuMemberBonusDetail.builder() diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 53acd4c6..5674dd78 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -58,17 +58,17 @@ import java.util.*; public class BonusSettleServiceImpl implements IBonusSettleService { @DubboReference - IGradeServiceApi gradeServiceApi; + ISystemConfigServiceApi iSystemConfigServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - ISystemConfigServiceApi systemConfigServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference - IRangeServiceApi rangeServiceApi; + IRangeServiceApi iRangeServiceApi; @DubboReference - IBonusItemsServiceApi bonusItemsServiceApi; + ISaOrderServiceApi iSaOrderServiceApi; @DubboReference - ISaOrderServiceApi saOrderServiceApi; + IBonusItemsServiceApi iBonusItemsServiceApi; @Autowired private ICuRegionAssessService cuRegionAssessService; @@ -143,10 +143,10 @@ public class BonusSettleServiceImpl implements IBonusSettleService { public void calculateCumberBonusBySecond(String orderCode) { log.info("开始执行秒接，订单编号：{}", orderCode); Date startDate = DateUtils.currentDate(); - SaOrderExt saOrderExt = saOrderServiceApi.querySaOrderByDay(startDate, + SaOrderExt saOrderExt = iSaOrderServiceApi.querySaOrderByDay(startDate, DateUtils.afterDate(1, ChronoUnit.DAYS, startDate), orderCode).getData(); - Map systemConfigMap = systemConfigServiceApi.getBonusSystemConfig().getData(); - Map rangeDtoMap = rangeServiceApi.queryRangeDto().getData(); + Map systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData(); + Map rangeDtoMap = iRangeServiceApi.queryRangeDto().getData(); // 处理奖金结算秒结表，判断是否存在当天结算的秒接表，从cu_member中获取网体，从昨日结算表中获取累计、结余数据 String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrderExt.getPayTime()); String beforeDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, saOrderExt.getPayTime())); @@ -160,7 +160,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 前天 String yesSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforeYesPeriod; Map cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberSettleExtMap = new HashMap<>(); Map cuAwardsControlMap = getCuAwardsControlMap(); // 计算奖金 @@ -185,8 +185,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList); // 计算奖金 // 计算直推奖 - List gradeDtoList = gradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData(); - CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, awardsServiceApi.getAwards().getData(), gradeDtoList); + List gradeDtoList = iGradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData(); + CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, iAwardsServiceApi.getAwards().getData(), gradeDtoList); log.info("获得直推奖，奖金为：{}", JSONUtil.toJsonStr(cuMemberBonusPush)); // 计算量奖 // 所有需要计算的父节点，只计算新增 @@ -266,7 +266,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { List cuMemberBonusExpandList = bonusSettlePurchaseHandle.calculateRepurchaseExpandSecondBonus(riskControlMap, settleTableName, cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, saOrderExt, cuMemberSettleExtList, settleDate, BigDecimal.ZERO, BigDecimal.ZERO, 0); // c)增加奖衔记录表 - Map awardsMap = awardsServiceApi.getAwards().getData(); + Map awardsMap = iAwardsServiceApi.getAwards().getData(); List cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap, bonusConfigDTO, Collections.singletonList(saOrderExt), period, cuMemberBonusMap, cuAwardsControlMap, new LeXueRangeParam()); if (cuMemberBonusMap.size() > 0) { @@ -325,9 +325,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { } } - /** - * 每日计算会员奖金，最终的奖金 - */ @Override @Transactional(rollbackFor = Exception.class) public void calculateCuMemberBonus(String settleDate, List saOrderExtList) { @@ -338,7 +335,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 将删除的订单的点位变为死点 //********************************* 更新当天最新的业绩*************************/ // 获取所有国家的奖金项 key = 国家 + 奖金项的值 - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberBonusMap = new HashMap<>(); BonusRecordDetailVO recordDetailVO = new BonusRecordDetailVO(); Boolean isSameMonth = DateUtils.getMonth(settleDate).equals(DateUtils.getMonth(yesterday)); @@ -367,8 +364,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { @Override public void calculateCuMemberRetailRangeBonusBySaOrder(String orderCode) { Map cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); - List retailOrderList = saOrderServiceApi.queryRetailSaOrderByDay(DateUtils.beforeDate(6, ChronoUnit.DAYS), DateUtils.afterDate(1, ChronoUnit.DAYS), orderCode).getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); + List retailOrderList = iSaOrderServiceApi.queryRetailSaOrderByDay(DateUtils.beforeDate(6, ChronoUnit.DAYS), DateUtils.afterDate(1, ChronoUnit.DAYS), orderCode).getData(); if (retailOrderList != null && retailOrderList.size() > 0) { SaOrderExt saOrderExt = retailOrderList.get(0); // 处理奖金结算秒结表，判断是否存在当天结算的秒接表，从cu_member中获取网体，从昨日结算表中获取累计、结余数据 @@ -415,14 +412,14 @@ public class BonusSettleServiceImpl implements IBonusSettleService { Integer yesterdayPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday).getPkId(); String yesterdayTableName = TableNameConstants.CU_MEMBER_SETTLE + yesterdayPeriod; cuMemberTreeService.initCuMemberExpandTreeTable(yesterdayTableName, currentSettleTableName); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberSettleExtMap = new HashMap<>(); Map cuMemberBonusMap = new HashMap<>(); Map cuAwardsControlMap = getCuAwardsControlMap(); Map weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period); - Map systemConfigMap = systemConfigServiceApi.getBonusSystemConfig().getData(); + Map systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData(); BonusRecordDetailVO recordDetailVO = new BonusRecordDetailVO(); - Map awardsMap = awardsServiceApi.getAwards().getData(); + Map awardsMap = iAwardsServiceApi.getAwards().getData(); // 首购订单 List firPurchaseOrderList = new ArrayList<>(); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java index fe15f0bb..461632b1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java @@ -1,10 +1,9 @@ package com.hzs.bonus.bonus.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.bonus.mapper.CuMemberRetailLogMapper; import com.hzs.bonus.bonus.service.ICuMemberRetailLogService; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.bonus.CuMemberRetailLog; @@ -15,25 +14,20 @@ import java.util.Date; import java.util.List; /** - *

* 秒接日志记录表 服务实现类 - *

- * - * @author hzs - * @since 2024-12-27 */ @Service public class CuMemberRetailLogServiceImpl extends ServiceImpl implements ICuMemberRetailLogService { @Override public List queryCuMemberRetailLog() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ENABLE_STATUS", EYesNo.NO.getIntValue()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberRetailLog::getEnableStatus, EYesNo.NO.getIntValue()); Date endTime = DateUtils.currentDateTime(); Date startTime = DateUtils.beforeDate(1, ChronoUnit.DAYS, endTime); - queryWrapper.gt(SystemFieldConstants.CREATION_TIME, startTime); - queryWrapper.le(SystemFieldConstants.CREATION_TIME, endTime); - queryWrapper.orderByAsc(SystemFieldConstants.CREATION_TIME); + queryWrapper.gt(CuMemberRetailLog::getCreationTime, startTime); + queryWrapper.le(CuMemberRetailLog::getCreationTime, endTime); + queryWrapper.orderByAsc(CuMemberRetailLog::getCreationTime); return baseMapper.selectList(queryWrapper); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java index db5144ae..f2832d26 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java @@ -17,21 +17,17 @@ import org.springframework.messaging.Message; import org.springframework.stereotype.Component; /** - * @Description: 订单秒接 - * @Author: sui q - * @Time: 2023/3/1 16:30 - * @Classname: SaOrderSecondListener - * @PackageName: com.hzs.third.mqcall.listener + * 订单秒接 */ @Slf4j @Component public class SaOrderSecondListener { @Autowired - private IBonusSettleService bonusSettleService; + private IBonusSettleService iBonusSettleService; @Autowired - private ICuMemberRetailLogService cuMemberRetailLogService; + private ICuMemberRetailLogService iCuMemberRetailLogService; @RabbitListener(bindings = @QueueBinding( exchange = @Exchange(value = RabbitMqConstants.ORDER_SECOND_EXCHANGE, type = "topic"), @@ -47,19 +43,18 @@ public class SaOrderSecondListener { cuMemberRetailLog.setPkCountry(CountryConstants.CHINA_COUNTRY); cuMemberRetailLog.setPkCreator(MagicNumberConstants.PK_ADMIN); cuMemberRetailLog.setOrderCode(saOrderExt.getOrderCode()); - if(saOrderExt.getCancelBool() != null && saOrderExt.getCancelBool()){ + if (saOrderExt.getCancelBool() != null && saOrderExt.getCancelBool()) { cuMemberRetailLog.setCancelStatus(EYesNo.YES.getIntValue()); } try { Thread.sleep(500); - bonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(saOrderExt.getOrderCode()); + iBonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(saOrderExt.getOrderCode()); } catch (Exception e) { cuMemberRetailLog.setEnableStatus(EYesNo.NO.getIntValue()); cuMemberRetailLog.setMsg(e.getMessage()); e.printStackTrace(); } finally { - cuMemberRetailLogService.save(cuMemberRetailLog); + iCuMemberRetailLogService.save(cuMemberRetailLog); } - // todo 失败的时候记录日志 } } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 601194e1..e904a79e 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -490,16 +490,16 @@ merge into ${tableName} a using(select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT)/6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV)/6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT)/6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV)/6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT)/6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV)/6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT)/6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV)/6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT)/6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV)/6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml index 5075934f..c77e7b95 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml @@ -2,23 +2,11 @@ - - - - - - - - - - - - - - - update cu_member_retail_log set enable_status=0 - where del_flag=0 and pk_id in + update cu_member_retail_log + set enable_status = 0 + where del_flag = 0 + and pk_id in #{item.pkId} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 7067f7f1..86d04ef3 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -43,11 +43,7 @@ import java.math.BigDecimal; import java.util.*; /** - * @Description: 会员控制器 - * @Author: jiang chao - * @Time: 2023/1/10 15:18 - * @Classname: ApiMemberController - * @PackageName: com.hzs.member.base.controller.api + * 会员控制器 */ @Slf4j @RequestMapping("/api/member") @@ -68,19 +64,19 @@ public class ApiMemberController extends BaseController { @DubboReference ICurrencyServiceApi currencyServiceApi; - /** - * 获取登录会员信息 - * - * @return - */ - @GetMapping("/get-info") - public AjaxResult getInfo() { - MemberInfoVO memberInfo = iMemberInfoService.getMemberInfo(SecurityUtils.getUserId()); - if (null == memberInfo) { - return AjaxResult.error(); - } - return AjaxResult.success(memberInfo); - } +// /** +// * 获取登录会员信息 +// * +// * @return +// */ +// @GetMapping("/get-info") +// public AjaxResult getInfo() { +// MemberInfoVO memberInfo = iMemberInfoService.getMemberInfo(SecurityUtils.getUserId()); +// if (null == memberInfo) { +// return AjaxResult.error(); +// } +// return AjaxResult.success(memberInfo); +// } /** * 更新个人资料（昵称） diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index db16e999..93b001ba 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -110,7 +110,7 @@ public class CuMemberController extends BaseController { /** - * 导入批量查询会员信息 + * 导入批量查询会员信息 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_CODE, method = EOperationMethod.IMPORT) @PostMapping("/batch-importData") @@ -168,7 +168,8 @@ public class CuMemberController extends BaseController { /** - * 真实信息 + * 真实信息 + * * @author: zhang jing * @date: 2022/11/15 17:59 * @param: [memberParam] @@ -208,7 +209,8 @@ public class CuMemberController extends BaseController { } /** - * 根据会员编号查询会员信息 + * 根据会员编号查询会员信息 + * * @author: zhang jing * @date: 2022/11/9 18:25 * @param: [pkId] @@ -567,7 +569,8 @@ public class CuMemberController extends BaseController { /** - * 导出真实信息 + * 导出真实信息 + * * @author: zhang jing * @date: 2023/7/15 17:02 * @param: [response, memberRealInfoParam] @@ -650,7 +653,8 @@ public class CuMemberController extends BaseController { /** - * 校验身份证格式 + * 校验身份证格式 + * * @author: zhang jing * @date: 2023/10/17 14:10 * @param: [idCard] @@ -787,17 +791,12 @@ public class CuMemberController extends BaseController { /** - * 新零售会员信息 - * @author: zhang jing - * @date: 2024/12/9 17:34 - * @param: [memberParam] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 新零售会员信息 **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.RETAIL_MEMBER_INFO, method = EOperationMethod.SELECT) @GetMapping("/query-member") public TableDataInfo retailMember(RetailMemberVO memberParam) { memberParam.setPkCountry(SecurityUtils.getPkCountry()); - memberParam.setSystemType(SecurityUtils.getSystemType()); List memberCodeList = new ArrayList<>(); List memberCodeList1 = new ArrayList<>(); @@ -909,11 +908,7 @@ public class CuMemberController extends BaseController { /** - * 导出新零售 - * @author: zhang jing - * @date: 2024/12/10 17:22 - * @param: [response, memberParam] - * @return: void + * 导出新零售 **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.RETAIL_MEMBER_INFO, method = EOperationMethod.EXPORT) @PostMapping("/export") @@ -1045,7 +1040,8 @@ public class CuMemberController extends BaseController { } /** - * 免密登录 + * 免密登录 + * * @author: zhang jing * @date: 2023/6/6 10:05 * @param: [memberTeamInfoParam] diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index d8d1dbd5..1bcb3274 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -863,7 +863,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { for (int i = memberList.size() - 1; i >= 0; i--) { Long pkMember = memberList.get(i); SaOrderExt saOrder = saOrderMap.get(pkMember); - CuMember cuMember = cuMemberService.getMemberById(pkMember); // 删除等级 cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); // 回退奖衔,根据订单从 cu_member_awards查询 @@ -1525,16 +1524,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { boolean updateFlag = false; LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - if (null != saOrder.getPkGrade()) { - updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); - updateFlag = true; - - cuMember.setPkSettleGrade(saOrder.getPkGrade()); - } +// if (null != saOrder.getPkGrade()) { +// updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); +// updateFlag = true; +// +// cuMember.setPkSettleGrade(saOrder.getPkGrade()); +// } if (activateFlag) { updateWrapper.set(null != cuMember.getIsActivate(), CuMember::getIsActivate, cuMember.getIsActivate()); updateWrapper.set(null != cuMember.getPayStatus(), CuMember::getPayStatus, cuMember.getPayStatus()); updateWrapper.set(null != cuMember.getPayTime(), CuMember::getPayTime, cuMember.getPayTime()); + updateFlag = true; } if (updateFlag) { // 更新会员信息 @@ -1543,10 +1543,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { cuMemberService.update(updateWrapper); } - if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { - // 保存会员等级变动（如果旧等级和新等级相同，则不记录） - saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); - } +// if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { +// // 保存会员等级变动（如果旧等级和新等级相同，则不记录） +// saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); +// } this.handleRetailMemberAccount(saOrder, cuMemberAccountExt); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 2900d87d..641a6b15 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3210,15 +3210,17 @@ public class CuMemberServiceImpl extends ServiceImpl i * @return */ private String checkRegisterRelation(String phone, Integer systemType) { - if (this.count(Wrappers.lambdaQuery() - .eq(CuMember::getPhone, phone) - .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) - .eq(CuMember::getSystemType, systemType) - ) == 0) { - // 手机号不存在，可以进行注册 - return null; - } - return "注册信息已存在，请重新输入注册信息"; + // TODO new 手机号可以重复，不需要进行是否重复校验 + return null; +// if (this.count(Wrappers.lambdaQuery() +// .eq(CuMember::getPhone, phone) +// .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) +// .eq(CuMember::getSystemType, systemType) +// ) == 0) { +// // 手机号不存在，可以进行注册 +// return null; +// } +// return "注册信息已存在，请重新输入注册信息"; } /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java index 61c220a2..39503912 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员信息-等级升级记录 Mapper 接口 - * - * @author hzs - * @since 2022-10-11 */ public interface CuMemberLevelMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java index ac97121f..e60f1eae 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java @@ -14,11 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:25 - * @Classname: CuMemberLevelProvider - * @PackageName: com.hzs.member.detail.provider + * 会员升级记录dubbo服务 */ @DubboService public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index 9b053255..db92ef4b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务类 - * - * @author hzs - * @since 2022-10-11 */ public interface ICuMemberLevelService extends IService { @@ -21,9 +18,6 @@ public interface ICuMemberLevelService extends IService { * @param pkOrder 订单 * @param pkApprove 审核人 * @param currentDateTime 当前时间 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 9:15 */ void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 3beba667..86477026 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -15,9 +15,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务实现类 - * - * @author hzs - * @since 2022-10-11 */ @Service public class CuMemberLevelServiceImpl extends ServiceImpl implements ICuMemberLevelService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java index 5eae3149..f9a3a79a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/controller/MemberTokenController.java @@ -16,7 +16,6 @@ import javax.servlet.http.HttpServletRequest; /** * 会员端 token 控制 * - * @author hzs */ @RequestMapping("/auth/api") @RestController @@ -28,20 +27,20 @@ public class MemberTokenController { @Autowired private IMemberLoginService iMemberLoginService; - /** - * 会员登录 - * - * @param form - * @return - */ - @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody form) { - // 用户登录 - LoginMember loginMember = iMemberLoginService.login(form.getUsername(), form.getPassword()); - - // 获取登录token - return AjaxResult.success(memberTokenService.createToken(loginMember)); - } +// /** +// * 会员登录 +// * +// * @param form +// * @return +// */ +// @PostMapping("/login") +// public AjaxResult login(@RequestBody LoginBody form) { +// // 用户登录 +// LoginMember loginMember = iMemberLoginService.login(form.getUsername(), form.getPassword()); +// +// // 获取登录token +// return AjaxResult.success(memberTokenService.createToken(loginMember)); +// } /** * 会员登出 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java index b1984b87..a3181c2c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java @@ -242,15 +242,10 @@ public class MarketNewsController extends BaseController { if (cuMemberBonusPush.getOrderType() != null) { cuMemberBonusPush.setOrderTypeStr(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + cuMemberBonusPush.getOrderType())); } - // 注册业绩 国内 * 6.4 - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - if (cuMemberBonusPush.getOrderAchieve() == null) { - cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); - } - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); - } else { - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve()); + if (cuMemberBonusPush.getOrderAchieve() == null) { + cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); } + cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); cuMemberBonusPush.setCreationTime(cuMemberBonusPush.getMemberPayTime()); // 跨国报单 汇率转换 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java index bfdc4d37..3ff6b665 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java @@ -1,10 +1,7 @@ package com.hzs.retail.login.service.impl; import cn.hutool.core.codec.Base64Decoder; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Validator; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.constant.msg.SystemMsgConstants; import com.hzs.common.core.enums.EAccountStatus; import com.hzs.common.core.enums.ECategory; @@ -30,7 +27,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.util.Date; -import java.util.List; /** * 新零售会员登录服务 @@ -52,27 +48,27 @@ public class RetailMemberLoginServiceImpl implements IRetailMemberLoginService { throw new ServiceException("会员账号或联系方式必须填写"); } - CuMemberExt member; + CuMemberExt member = iCuMemberService.getRetailMemberByCode(userName); - if (userName.startsWith(SysConstants.RETAIL_PREFIX)) { - // 会员编号登录 - member = iCuMemberService.getRetailMemberByCode(userName); - } else if ((userName.length() == 11 && userName.startsWith("1")) - || Validator.isEmail(userName)) { - // 手机号 或 邮箱 登录 - List memberList = iCuMemberService.listMemberByPhone(userName); - if (CollectionUtil.isEmpty(memberList)) { - throw new ServiceException("会员账号或联系方式填写有误，请检查后重试"); - } - if (memberList.size() > 1) { - // 联系方式超过两个，只能使用会员编号进行登录 - throw new ServiceException("当前会员需要使用会员编号进行登录"); - } - member = memberList.get(0); - } else { - // 用户/密码必须填写 - throw new ServiceException("会员账号或联系方式填写有误，请检查后重试"); - } +// if (userName.startsWith(SysConstants.RETAIL_PREFIX)) { +// // 会员编号登录 +// member = iCuMemberService.getRetailMemberByCode(userName); +// } else if ((userName.length() == 11 && userName.startsWith("1")) +// || Validator.isEmail(userName)) { +// // 手机号 或 邮箱 登录 +// List memberList = iCuMemberService.listMemberByPhone(userName); +// if (CollectionUtil.isEmpty(memberList)) { +// throw new ServiceException("会员账号或联系方式填写有误，请检查后重试"); +// } +// if (memberList.size() > 1) { +// // 联系方式超过两个，只能使用会员编号进行登录 +// throw new ServiceException("当前会员需要使用会员编号进行登录"); +// } +// member = memberList.get(0); +// } else { +// // 用户/密码必须填写 +// throw new ServiceException("会员账号或联系方式填写有误，请检查后重试"); +// } if (null == member) { recordLoginLog(null, EStatus.NO, userName + " 登录会员不存在"); @@ -122,20 +118,20 @@ public class RetailMemberLoginServiceImpl implements IRetailMemberLoginService { updateFlag = true; } } - if (null == member.getPkTeamCode()) { - // 空单注册会员，如果团队为空处理 - CuMemberExt teamMember = iCuMemberService.queryParentTeam(member.getPkId()); - if (null != teamMember) { - updateWrapper.set(CuMember::getPkTeamCode, teamMember.getPkTeamCode()); - updateFlag = true; - } - } +// if (null == member.getPkTeamCode()) { +// // 空单注册会员，如果团队为空处理 +// CuMemberExt teamMember = iCuMemberService.queryParentTeam(member.getPkId()); +// if (null != teamMember) { +// updateWrapper.set(CuMember::getPkTeamCode, teamMember.getPkTeamCode()); +// updateFlag = true; +// } +// } if (updateFlag) { updateWrapper.eq(CuMember::getPkId, member.getPkId()); iCuMemberService.update(updateWrapper); } } catch (Exception e) { - log.error("会员 {} 补全【体系】或【团队】错误", member.getMemberCode()); + log.error("会员 {} 补全【体系】错误", member.getMemberCode()); } recordLoginLog(loginMember.getPkId(), EStatus.YES, "登录成功"); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java index 418a5f08..97316def 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java @@ -166,10 +166,8 @@ public class RetailMemberController extends BaseController { // 达到条件，但是没有选择区域，需要弹窗选择区域 CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); - // 2024.12.30 添加需求，存在手动V0升V5，需要判断小市场业绩达到2万以上才可以进行开通 - if (retailAchieve.getSmallAreaPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 - || retailAchieve.getBigArealPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 - ) { + // TODO 2025.06.09 新需求，选择区域判断等级达到合伙人，血缘累计业绩达到30万，可以选择 + if (retailAchieve.getSmallAreaPv().add(retailAchieve.getBigArealPv()).compareTo(SysConstants.TOTAL_AREA_PV) < 0) { return AjaxResult.error("还未达到选择收益区域条件"); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java index bbc9b93a..e76a25df 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java @@ -85,6 +85,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService { .creationTime(cuMember.getCreationTime()) .idCardAuth(idCardAuth) .systemType(cuMember.getSystemType()) + .pkCountry(cuMember.getPkCountry()) + .pkSettleCountry(cuMember.getPkSettleCountry()) .build(); } return null; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java index 2f75cd13..108d531c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java @@ -11,11 +11,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 新零售会员信息返回VO - * @Author: jiang chao - * @Time: 2024/12/11 15:06 - * @Classname: RetailMemberInfoVO - * @PackageName: com.hzs.retail.member.vo + * 新零售会员信息返回VO */ @Builder @AllArgsConstructor @@ -44,6 +40,14 @@ public class RetailMemberInfoVO implements Serializable { */ private String nickName; + /** + * 自然国ID + */ + private Integer pkCountry; + /** + * 结算国ID + */ + private Integer pkSettleCountry; /** * 结算国 */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index a5a04949..8018e415 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -716,16 +716,16 @@ merge into ${tableName} a using (select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT) / 6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV) / 6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT) / 6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV) / 6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV) / 6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT) / 6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV) / 6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT) / 6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV) / 6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index bd0333d8..c8775727 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2346,7 +2346,7 @@ FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER - INNER JOIN cu_member par + left join cu_member par ON par.pk_id = cm.pk_parent left join bd_awards awa on awa.pk_id = cm.PK_AWARDS @@ -2374,7 +2374,7 @@ FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER - INNER JOIN cu_member par + left join cu_member par ON par.pk_id = cm.pk_parent left join bd_awards awa on awa.pk_id = cm.PK_AWARDS @@ -2395,9 +2395,6 @@ and cm.pk_settle_country = #{pkCountry} - - and cm.SYSTEM_TYPE = #{systemType} - and cm.member_code like #{memberCode}||'%' diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index 5432230d..9d79ec7d 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -147,7 +147,7 @@ (nvl(cbs.MAIN_REG_PV,0)+nvl(cbs.MAIN_UP_PV,0)+nvl(cbs.MAIN_REPUR_PV,0)+nvl(cbs.RETAIL_CONSUME_PV,0)),4) end as backPointsRate, - 6.4*(nvl(cbs.retail_range_income,0)+nvl(cbs.retail_same_level_income_V1V4,0)+nvl(cbs.retail_same_level_income_V5,0) + (nvl(cbs.retail_range_income,0)+nvl(cbs.retail_same_level_income_V1V4,0)+nvl(cbs.retail_same_level_income_V5,0) +nvl(cbs.retail_area_income,0)+nvl(cbs.retail_benefit_avg_income,0) +nvl(cbs.retail_benefit_income,0)+nvl(cbs.retail_benefit_range_income,0)+nvl(cbs.BACK_POINTS,0)) totalBonus, diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/provider/MemberReportServiceProvider.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/provider/MemberReportServiceProvider.java index 37f7ed4d..5b4c2196 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/provider/MemberReportServiceProvider.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/provider/MemberReportServiceProvider.java @@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @description: 统计分析相关dubbo服务 - * @author: zhang jing - * @date: 2025/2/12 15:23 - * @param: - * @return: + * 统计分析相关dubbo服务 **/ @Slf4j @DubboService @@ -21,30 +17,15 @@ public class MemberReportServiceProvider implements IMemberReportServiceApi { @Autowired private MemberReportService iMemberReportService; - - /** - * @description: 定时任务批量处理统计会员以及伞下金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 15:28 - * @param: [] - * @return: com.hzs.common.core.domain.R - **/ @Override - public R pushAmountBoxmethod() { - iMemberReportService.pushAmountBoxmethod(); - return R.ok(); + public R pushAmountBoxmethod() { + iMemberReportService.pushAmountBoxmethod(); + return R.ok(); } - /** - * @description: 定时任务7天重算直推会员金额业绩盒数 - * @author: zhang jing - * @date: '2025/2/12' 16:10 - * @param: [startDateStr, endDateStr] - * @return: com.hzs.common.core.domain.R - **/ @Override - public R repeatPushAmountBoxmethod(String startDateStr, String endDateStr) { - iMemberReportService.repeatPushAmountBoxmethod(startDateStr,endDateStr); + public R repeatPushAmountBoxmethod(String startDateStr, String endDateStr) { + iMemberReportService.repeatPushAmountBoxmethod(startDateStr, endDateStr); return R.ok(); } diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml index 5f382809..e6074edc 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml @@ -892,11 +892,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv historyLeftSumPv, + t2.b_sum_pv historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv), 0) leftSumPv, + NVL(SUM(t1.b_new_pv), 0) rightSumPv, t1.pk_member FROM ( @@ -951,12 +951,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv leftSumPv, + t5.b_new_pv rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -1006,8 +1006,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv >= #{achieve} + AND t3.b_new_pv >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} @@ -1035,11 +1035,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv historyLeftSumPv, + t2.b_sum_pv historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv), 0) leftSumPv, + NVL(SUM(t1.b_new_pv), 0) rightSumPv, t1.pk_member FROM ( @@ -1091,12 +1091,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv leftSumPv, + t5.b_new_pv rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -1146,8 +1146,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv >= #{achieve} + AND t3.b_new_pv >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index f3421c7c..54ea00d2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -107,13 +107,15 @@ public class ApiRetailOrderController { orderLevelVO.setMsg("会员不满足升级条件"); } } catch (Exception e) { - if (EYesNo.YES.getIntValue() == levelParam.getFirstCheck()) { - // 2024.12.25 -- 添加需求，首次校验不需要进行提示错误（9050） - orderLevelVO.setIsEnough(true); - return AjaxResult.success(orderLevelVO); - } else { - throw e; - } + log.error("校验会员等级异常", e); + orderLevelVO.setMsg("校验会员等级异常"); +// if (EYesNo.YES.getIntValue() == levelParam.getFirstCheck()) { +// // 2024.12.25 -- 添加需求，首次校验不需要进行提示错误（9050） +// orderLevelVO.setIsEnough(true); +// return AjaxResult.success(orderLevelVO); +// } else { +// throw e; +// } } return AjaxResult.success(orderLevelVO); } @@ -147,11 +149,11 @@ public class ApiRetailOrderController { */ @PostMapping("/valid-relation") public AjaxResult validRelation(@Valid @RequestBody RetailOrderRelationParam relationParam) { - // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一（9035） - String relationStr = iMemberServiceApi.checkRegisterRelation(relationParam.getPhone(), relationParam.getParentCode()).getData(); - if (relationStr != null) { - return AjaxResult.error(relationStr); - } + // TODO new 手机号可以重复，不需要进行是否重复校验 -- 已经跳过，此处可以不需要当前判断 +// String relationStr = iMemberServiceApi.checkRegisterRelation(relationParam.getPhone(), relationParam.getParentCode()).getData(); +// if (relationStr != null) { +// return AjaxResult.error(relationStr); +// } return AjaxResult.success(); } @@ -225,11 +227,12 @@ public class ApiRetailOrderController { return AjaxResult.error(checkStr); } - // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一 - String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); - if (relationStr != null) { - return AjaxResult.error(relationStr); - } + // TODO new 手机号可以重复，不需要进行是否重复校验 -- 已经跳过，此处可以不需要当前判断 +// // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一 +// String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); +// if (relationStr != null) { +// return AjaxResult.error(relationStr); +// } // 购物车中获取商品信息 registerParam.setOrderItemsParams(convertShoppingCarToSku(registerParam.getPkCreator(), registerParam.getShopList())); @@ -268,11 +271,12 @@ public class ApiRetailOrderController { return AjaxResult.error(checkStr); } - // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一 - String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); - if (relationStr != null) { - return AjaxResult.error(relationStr); - } + // TODO new 手机号可以重复，不需要进行是否重复校验 -- 已经跳过，此处可以不需要当前判断 +// // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一 +// String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); +// if (relationStr != null) { +// return AjaxResult.error(relationStr); +// } // 封装会员信息 CuMember newMember = iRetailOrderService.packageCuMember(registerParam); @@ -338,6 +342,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("升级编号不存在，请重试"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, upgradeParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } upgradeParam.setUpgradeMember(updateGradeMember); // 购物车中获取商品信息 @@ -371,6 +379,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("升级编号不存在，请重试"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, payParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } // 封装订单信息 SaOrderExt saOrderExt = iRetailOrderService.createSaOrder(upgradeParam, null, updateGradeMember); @@ -649,12 +661,12 @@ public class ApiRetailOrderController { orderParam.setPkParent(orderParam.getPkCreator()); if (!creatorMember.getMemberCode().equals(orderParam.getParentCode())) { - // 校验推荐人是否大于V0，不然不能当推荐人 + CuMember parentMember = iMemberServiceApi.getRetailMember(null, orderParam.getParentCode()).getData(); if (null == parentMember) { return "推荐编号不存在"; } -// // 校验推荐人等级是否为V0，如果是V0不能进行注册 +// // 校验推荐人是否大于V0，不然不能当推荐人 // BdGrade parentGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(parentMember.getPkSettleGrade())).findFirst().get(); // if (EGrade.START_UP.getValue() == parentGrade.getGradeValue()) { // return orderParam.getParentCode() + " 不能做为推荐人"; @@ -706,9 +718,9 @@ public class ApiRetailOrderController { if (null == buyMember) { return "购买会员编号不存在，请重试"; } - if (ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { - // 2025.02.24 新需求，升级专区取消，V0可以直接购买复购专区 - // 判断购买会员是否是V0，V0不允许下升级以外订单 + if (ESpecialArea.RETAIL_UPGRADE.getValue() != specialArea + && ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { + // 判断购买会员是否是V0，V0不允许下升级、复购以外订单 GradeDTO gradeDTO = iGradeServiceApi.getGrade(buyMember.getPkSettleGrade()).getData(); if (gradeDTO.getGradeValue() == EGrade.START_UP.getValue()) { return "当前购买会员编号不允许下单"; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 50ec4cdd..7ac2a093 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.hzs.common.domain.sale.ext.BdWaresDetailExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderWaresLimitExt; import com.hzs.common.domain.sale.order.*; +import com.hzs.common.domain.sale.product.BdProduct; import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.config.BdGrade; @@ -36,6 +37,7 @@ import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresNumberParam; import com.hzs.sale.order.service.*; import com.hzs.sale.order.service.impl.SaOrderHandle; +import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.wares.service.IBdWaresDetailService; import com.hzs.sale.wares.service.IBdWaresExtendService; import com.hzs.sale.wares.service.IBdWaresRangeService; @@ -82,6 +84,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService { private ISaOrderTempService iSaOrderTempService; @Autowired private ISaOrderWaresLimitService iSaOrderWaresLimitService; + @Autowired + private IBdProductService iBdProductService; @Autowired private RedisService redisService; @@ -107,9 +111,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 封装订单信息 SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember); - // 测试环境特殊处理 - this.testHandle(registerParam.getPkCreator(), saOrderExt); - // 订单缓存（60分钟有效，防止在线支付回调慢） redisService.setCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode(), saOrderExt, CacheConstants.RETAIL_ORDER_EXPIRE_TIME * 2, TimeUnit.MINUTES); registerParam.setPkGrade(newMember.getPkSettleGrade()); @@ -130,9 +131,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 封装订单信息 SaOrderExt saOrderExt = this.createSaOrder(upgradeParam, null, upgradeMember); - // 测试环境特殊处理 - this.testHandle(upgradeParam.getPkCreator(), saOrderExt); - // 订单缓存（60分钟有效，防止在线支付回调慢） redisService.setCacheObject(CacheConstants.RETAIL_TEMP_ORDER + upgradeParam.getPkCreator() + upgradeParam.getOrderCode(), saOrderExt, CacheConstants.RETAIL_ORDER_EXPIRE_TIME * 2, TimeUnit.MINUTES); upgradeParam.setPkGrade(upgradeMember.getPkSettleGrade()); @@ -213,9 +211,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService { } if (ESpecialArea.RETAIL_REGISTER.getValue() == orderParam.getSpecialArea() - || ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() - || ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()) { - // 2025.02.24 升级专区取消，复购盒数商品满足条件也可以升级 + || ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) { // 注册、升级订单，计算会员等级 BdGrade newGrade = iSaOrderService.calculateGrade(orderParam.getSpecialArea(), orderParam.getOrderItemsParams(), gradeList, cuMember, orderParam.getSystemType()); // if (null == newGrade) { @@ -268,10 +264,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 订单明细信息 List orderItemsList = new ArrayList<>(); - // 需要计算等级，以及商品价格 - if (CollectionUtil.isEmpty(gradeList)) { - gradeList = iGradeServiceApi.getRetailGradeList().getData(); - } +// // 需要计算等级，以及商品价格 +// if (CollectionUtil.isEmpty(gradeList)) { +// gradeList = iGradeServiceApi.getRetailGradeList().getData(); +// } if (null == currency) { currency = iCurrencyServiceApi.getCurrency(orderParam.getPkCountry()).getData(); } @@ -283,127 +279,131 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 邮费模板map（key：邮费模板ID，value：邮费订单明细） Map> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresDetailExtList.size())); - // 升级盒数基数 - int baseBoxNum = 0; -// // 是否购买过（手动升级第一单升级订单价格、复购第一单价格209） -// boolean buyFlag = false; +// // 升级盒数基数 +// int baseBoxNum = 0; - // 当前会员等级 - BdGrade memberGrade = null; - if (null != cuMember.getPkSettleGrade()) { - // 获取当前会员等级（注册专区，目前没有会员等级） - memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(cuMember.getPkSettleGrade())).findFirst().get(); - } - // 2025.02.24 升级专区取消，复购专区指定盒数商品走升级逻辑 - if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()) { -// // 复购订单 -// if (HzsUtil.checkOnlineTime()) { -// // 2025.03.01 之前还需要处理首单209，校验是否购买过首单 -// buyFlag = iSaOrderItemsService.getRetailWaresQuantity(cuMember.getPkId(), boxProductList, null, -// Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue(), EOrderType.RETAIL_REPURCHASE.getValue()), orderParam.getSystemType()) > 0; -// } - // 获取升级盒数基数 - baseBoxNum = iSaOrderService.handleBaseBoxNum(cuMember, memberGrade, gradeList, boxProductList, orderParam.getSystemType()); - } +// // 当前会员等级 +// BdGrade memberGrade = null; +// if (null != cuMember.getPkSettleGrade()) { +// // 获取当前会员等级（注册专区，目前没有会员等级） +// memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(cuMember.getPkSettleGrade())).findFirst().get(); +// } +// // 2025.02.24 升级专区取消，复购专区指定盒数商品走升级逻辑 +// if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()) { +// // 获取升级盒数基数 +// baseBoxNum = iSaOrderService.handleBaseBoxNum(cuMember, memberGrade, gradeList, boxProductList, orderParam.getSystemType()); +// } // 当前盒数 int boxNum = 0; - // 2025.03.11 添加需求，复购专区、重消专区，指定盒数商品每用户每月限购50件 - this.checkWaresLimit(cuMember.getPkId(), orderParam.getSpecialArea(), waresDetailExtList, boxProductList); +// // 2025.03.11 添加需求，复购专区、重消专区，指定盒数商品每用户每月限购50件 +// this.checkWaresLimit(cuMember.getPkId(), orderParam.getSpecialArea(), waresDetailExtList, boxProductList); + + // 商品编号列表 + List waresCodeList = waresDetailExtList.stream().map(BdWaresDetailExt::getWaresCode).collect(Collectors.toList()); + // 根据商品获取商品下所有产品数据 + Map productMap = iBdProductService.listProductInfoByWaresCode(orderParam.getSpecialArea(), waresCodeList); // 遍历生成订单明细数据 for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { +// // 价格KEY（商品编号 + 价格） +// String waresGroupKey = null; +// // 商品数量 +// int waresQuantity = 1; + // 订单明细 - SaOrderItems orderItems = null; - // 价格KEY（商品编号 + 价格） - String waresGroupKey = null; - // 商品数量 - int waresQuantity = 1; + SaOrderItems orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); - if (ESpecialArea.RETAIL_REGISTER.getValue() == orderParam.getSpecialArea() - && boxProductList.contains(waresDetailExt.getWaresCode()) - && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { - // 会员专区（注册） 并且 指定的商品不为赠品，需要根据盒数重新计算价格 - // 指定盒数商品，价格需要按等级和购买数量重新计算 - for (int i = 0; i < waresDetailExt.getWaresQuantity(); i++) { - // 存在商品，盒数累加1 - boxNum += 1; - // 按盒数计算当前商品实际支付金额 - BigDecimal price = this.getWaresPrice(baseBoxNum + boxNum, gradeList); - - if (null == waresGroupKey || !waresGroupKey.equals(waresDetailExt.getWaresCode() + "-" + price)) { - // 第一盒 或者 商品 + 价格有变化，累计商品数量 - waresGroupKey = waresDetailExt.getWaresCode() + "-" + price; - waresQuantity = 1; - - orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); - orderItems.setPrice(price); - } else { - waresQuantity += 1; - } - orderItems.setWaresQuantity(waresQuantity); - orderItems.setQuantity(waresDetailExt.getQuantity() * waresQuantity); - } - } else { - // 非会员专区 - if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea() - && memberGrade.getGradeValue() < EGrade.MAKER.getValue() - && boxProductList.contains(waresDetailExt.getWaresCode()) - && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { - // 复购专区，如果会员等级小于V3，并且为盒数商品，需要计算等级和价格 - // 2025.02.24 升级专区取消，复购专区指定盒数商品可以升级，需要根据盒数商品重新计算价格 - for (int i = 0; i < waresDetailExt.getWaresQuantity(); i++) { - // 存在商品，盒数累加1 - boxNum += 1; - - // 产品价格 - BigDecimal price = this.getWaresPrice(baseBoxNum + boxNum, gradeList); -// if (HzsUtil.checkOnlineTime() && !buyFlag) { -// // 如果是 2025.03.01 之前，并且没有买过，默认第一盒为209 -// price = ERetailWaresPrice.FIRST.getPrice(); -// buyFlag = true; -// } else { -// // 根据等级盒数计算实际价格 -// price = this.getWaresPrice(baseBoxNum + boxNum, gradeList); -// } - - if (null == waresGroupKey || !waresGroupKey.equals(waresDetailExt.getWaresCode() + "-" + price)) { - // 第一盒 或者 商品 + 价格有变化，累计商品数量 - waresGroupKey = waresDetailExt.getWaresCode() + "-" + price; - waresQuantity = 1; - - orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); - orderItems.setPrice(price); - } else { - waresQuantity += 1; - } - orderItems.setWaresQuantity(waresQuantity); - orderItems.setQuantity(waresDetailExt.getQuantity() * waresQuantity); - } - } else { - if ((ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea() - || ESpecialArea.RETAIL_RESCISSION.getValue() == orderParam.getSpecialArea()) - && boxProductList.contains(waresDetailExt.getWaresCode()) - && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { - // 重消也累计盒数 - boxNum += waresDetailExt.getWaresQuantity(); - } - orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); + // 不是赠品，需要累积包邮邮费 + if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { + // 包邮金额 + freePostage = freePostage.add(orderItems.getPrice().multiply(new BigDecimal(orderItems.getQuantity()))); + if (EYesNo.NO.getIntValue() == waresDetailExt.getIsFreeMail()) { + // 不包邮，处理邮费模板map + saOrderHandle.setPostageTmpMap(orderParam.getTranType(), postageMap, waresDetailExt, orderItems); } - // 不包邮 并且 不是赠品，需要累积包邮邮费 - // 2025.02.12 调整需求，专区包邮金额需要计算包邮商品金额，只有赠品不计算包邮金额 -// if (EYesNo.NO.getIntValue() == waresDetailExt.getIsFreeMail() && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { - if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { - // 包邮金额 - freePostage = freePostage.add(orderItems.getPrice().multiply(new BigDecimal(orderItems.getQuantity()))); - if (EYesNo.NO.getIntValue() == waresDetailExt.getIsFreeMail()) { - // 不包邮，处理邮费模板map - saOrderHandle.setPostageTmpMap(orderParam.getTranType(), postageMap, waresDetailExt, orderItems); - } + if (null != productMap.get(orderItems.getPkProduct()) + && boxProductList.contains(productMap.get(orderItems.getPkProduct()).getProductCode())) { + // 产品是盒数产品，需要累计数量 + boxNum += orderItems.getQuantity(); } } + +// if (ESpecialArea.RETAIL_REGISTER.getValue() == orderParam.getSpecialArea() +// && boxProductList.contains(waresDetailExt.getWaresCode()) +// && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { +// // 会员专区（注册） 并且 指定的商品不为赠品，需要根据盒数重新计算价格 +// // 指定盒数商品，价格需要按等级和购买数量重新计算 +// for (int i = 0; i < waresDetailExt.getWaresQuantity(); i++) { +// // 存在商品，盒数累加1 +// boxNum += 1; +// // 按盒数计算当前商品实际支付金额 +// BigDecimal price = this.getWaresPrice(baseBoxNum + boxNum, gradeList); +// +// if (null == waresGroupKey || !waresGroupKey.equals(waresDetailExt.getWaresCode() + "-" + price)) { +// // 第一盒 或者 商品 + 价格有变化，累计商品数量 +// waresGroupKey = waresDetailExt.getWaresCode() + "-" + price; +// waresQuantity = 1; +// +// orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); +// orderItems.setPrice(price); +// } else { +// waresQuantity += 1; +// } +// orderItems.setWaresQuantity(waresQuantity); +// orderItems.setQuantity(waresDetailExt.getQuantity() * waresQuantity); +// } +// } else { +// // 非会员专区 +// if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea() +// && memberGrade.getGradeValue() < EGrade.MAKER.getValue() +// && boxProductList.contains(waresDetailExt.getWaresCode()) +// && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { +// // 复购专区，如果会员等级小于V3，并且为盒数商品，需要计算等级和价格 +// // 2025.02.24 升级专区取消，复购专区指定盒数商品可以升级，需要根据盒数商品重新计算价格 +// for (int i = 0; i < waresDetailExt.getWaresQuantity(); i++) { +// // 存在商品，盒数累加1 +// boxNum += 1; +// +// // 产品价格 +// BigDecimal price = this.getWaresPrice(baseBoxNum + boxNum, gradeList); +// +// if (null == waresGroupKey || !waresGroupKey.equals(waresDetailExt.getWaresCode() + "-" + price)) { +// // 第一盒 或者 商品 + 价格有变化，累计商品数量 +// waresGroupKey = waresDetailExt.getWaresCode() + "-" + price; +// waresQuantity = 1; +// +// orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); +// orderItems.setPrice(price); +// } else { +// waresQuantity += 1; +// } +// orderItems.setWaresQuantity(waresQuantity); +// orderItems.setQuantity(waresDetailExt.getQuantity() * waresQuantity); +// } +// } else { +// if ((ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea() +// || ESpecialArea.RETAIL_RESCISSION.getValue() == orderParam.getSpecialArea()) +// && boxProductList.contains(waresDetailExt.getWaresCode()) +// && EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { +// // 重消也累计盒数 +// boxNum += waresDetailExt.getWaresQuantity(); +// } +// orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); +// } +// +// // 不包邮 并且 不是赠品，需要累积包邮邮费 +// if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { +// // 包邮金额 +// freePostage = freePostage.add(orderItems.getPrice().multiply(new BigDecimal(orderItems.getQuantity()))); +// if (EYesNo.NO.getIntValue() == waresDetailExt.getIsFreeMail()) { +// // 不包邮，处理邮费模板map +// saOrderHandle.setPostageTmpMap(orderParam.getTranType(), postageMap, waresDetailExt, orderItems); +// } +// } +// } } // 计算订单邮费 @@ -499,12 +499,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 去掉升级条件带有累计盒数的（V4,V5）并且升级购买合数小于等于订单商品盒数的，再进行等级值倒序排序 gradeList = gradeList.stream().filter(tmpGrade -> tmpGrade.getBoxTotal() == 0 && tmpGrade.getBoxNumber() <= boxNum).sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed()).collect(Collectors.toList()); -// // 2025.02.21 添加需求，在 2025.03.01 前，第一盒还是按209走，之后恢复正常 -// // 2024.12.30 添加需求，购买第一盒直接给209元 -// if (HzsUtil.checkOnlineTime() && boxNum == ERetailWaresPrice.FIRST.getValue()) { -// return ERetailWaresPrice.FIRST.getPrice(); -// } - for (BdGrade bdGrade : gradeList) { if (boxNum > bdGrade.getBoxNumber()) { // 盒数大于等于购买盒数 @@ -922,19 +916,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService { } } - /*** - * 处理测试数据 - * @param pkMember 下单人 - * @param saOrderExt 订单信息 - */ - private void testHandle(Long pkMember, SaOrderExt saOrderExt) { - if (EEnv.TEST.getValue().equals(HzsConfig.getEnv()) - && pkMember.equals(615831L)) { - // 测试环境，指定会员，下单时金额处理 - saOrderExt.setOrderAmount(RandomUtil.randomBigDecimal(new BigDecimal("0.02"), new BigDecimal("0.1")).setScale(2, BigDecimal.ROUND_HALF_UP)); - } - } - @Transactional(rollbackFor = Exception.class) @Override public Long savePickOrder(SaOrder saOrder, List saOrderItemsList) { @@ -979,31 +960,39 @@ public class RetailOrderServiceImpl implements IRetailOrderService { */ private Boolean handleMemberActivate(CuMember cuMember, SaOrderExt saOrder) { if (null == cuMember.getIsActivate()) { - // 会员激活状态为空，按未激活处理 - cuMember.setIsActivate(EYesNo.NO.getIntValue()); - } +// // 会员激活状态为空，按未激活处理 +// cuMember.setIsActivate(EYesNo.NO.getIntValue()); - if (EYesNo.YES.getIntValue() != cuMember.getIsActivate() - && (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() - || EOrderType.RETAIL_UPGRADE.getValue() == saOrder.getOrderType() - || EOrderType.RETAIL_REPURCHASE.getValue() == saOrder.getOrderType()) - ) { - // 会员未激活，并且是 注册、升级、复购 订单，判断会员是否激活 - List boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrder.getSystemType()); - - for (SaOrderItems saOrderItems : saOrder.getOrderItemsList()) { - if (boxProductList.contains(saOrderItems.getWareCode())) { - // 存在指定盒数商品 - cuMember.setIsActivate(EYesNo.YES.getIntValue()); - if (EPayStatus.UNPAID.getValue() == cuMember.getPayStatus()) { - cuMember.setPayTime(saOrder.getPayTime()); - cuMember.setPayStatus(EPayStatus.PAID.getValue()); - } - return true; - } + // TODO new 暂时不处理激活，只要是会员就按激活处理，有订单就有支付状态和时间 + cuMember.setIsActivate(EYesNo.YES.getIntValue()); + if (null != saOrder) { + cuMember.setPayTime(saOrder.getPayTime()); + cuMember.setPayStatus(EPayStatus.PAID.getValue()); } } - return false; + return true; + +// if (EYesNo.YES.getIntValue() != cuMember.getIsActivate() +// && (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() +// || EOrderType.RETAIL_UPGRADE.getValue() == saOrder.getOrderType() +// || EOrderType.RETAIL_REPURCHASE.getValue() == saOrder.getOrderType()) +// ) { +// // 会员未激活，并且是 注册、升级、复购 订单，判断会员是否激活 +// List boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrder.getSystemType()); +// +// for (SaOrderItems saOrderItems : saOrder.getOrderItemsList()) { +// if (boxProductList.contains(saOrderItems.getWareCode())) { +// // 存在指定盒数商品 +// cuMember.setIsActivate(EYesNo.YES.getIntValue()); +// if (EPayStatus.UNPAID.getValue() == cuMember.getPayStatus()) { +// cuMember.setPayTime(saOrder.getPayTime()); +// cuMember.setPayStatus(EPayStatus.PAID.getValue()); +// } +// return true; +// } +// } +// } +// return false; } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderLevelParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderLevelParam.java index 89dcf8fc..3ca7cb46 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderLevelParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderLevelParam.java @@ -10,11 +10,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 新零售订单等级入参 - * @Author: jiang chao - * @Time: 2024/12/12 17:22 - * @Classname: RetailerOrderLevelParam - * @PackageName: com.hzs.retail.sale.param + * 新零售订单等级入参 */ @Data public class RetailOrderLevelParam implements Serializable { @@ -31,11 +27,11 @@ public class RetailOrderLevelParam implements Serializable { @NotNull(message = "缺少商品信息") private List shopList; - /** - * 首次校验（0=首次校验） - */ - @NotNull(message = "缺少参数") - private Integer firstCheck; +// /** +// * 首次校验（0=首次校验） +// */ +// @NotNull(message = "缺少参数") +// private Integer firstCheck; /** * 升级编号 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderParam.java index ef8d689d..18de1236 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderParam.java @@ -21,11 +21,7 @@ import java.math.BigDecimal; import java.util.List; /** - * @Description: 新零售订单入参 - * @Author: jiang chao - * @Time: 2024/12/12 10:03 - * @Classname: RetailOrderParam - * @PackageName: com.hzs.retail.sale.param + * 新零售订单入参 */ @Builder @AllArgsConstructor diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java index c375f2c8..576f317d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java @@ -22,7 +22,6 @@ import com.hzs.common.domain.sale.wares.BdWaresLabel; import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; import com.hzs.common.domain.system.config.BdLabel; -import com.hzs.common.domain.system.config.BdRetailRange; import com.hzs.common.domain.system.ext.BdLabelExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.IMemberServiceApi; @@ -37,7 +36,6 @@ import com.hzs.sale.wares.service.IBdWaresSpecsSkuService; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.IRetailRangeServiceApi; import com.hzs.system.config.dto.AreaCurrencyDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -53,11 +51,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 商品相关控制器 - * @Author: jiang chao - * @Time: 2024/12/9 14:24 - * @Classname: ApiWaresController - * @PackageName: com.hzs.retail.wares.controller.api + * 商品相关控制器 */ @RestController @RequestMapping("/api/retail-wares") @@ -79,8 +73,6 @@ public class ApiRetailWaresController extends BaseController { IAreaCurrencyServiceApi iAreaCurrencyServiceApi; @DubboReference IMemberServiceApi iMemberServiceApi; - @DubboReference - IRetailRangeServiceApi iRetailRangeServiceApi; /** * 商品列表 @@ -207,17 +199,11 @@ public class ApiRetailWaresController extends BaseController { List waresRangeList = new ArrayList<>(); if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 新零售复购专区，需要处理级差 - // 2024.12.30 添加需求，复消也需要处理级差 + // 复购、复消需要处理级差 if (waresIdList.size() > 0) { waresRangeList = iBdWaresRangeService.listRetailWaresRange(pkGrade, waresIdList); } } - // 专区级差 - BdRetailRange retailRange = new BdRetailRange(); - if (ESpecialArea.RETAIL_SHOP_ORDER.getValue() == specialArea) { - - } for (BdWaresExt bdWaresExt : bdWaresExtList) { if (null != list) { @@ -261,8 +247,7 @@ public class ApiRetailWaresController extends BaseController { if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 新零售复购需要处理极差 - // 2024.12.30 添加需求，复消也需要处理级差 + // 复购、复消需要处理级差 for (BdWaresRange waresRange : waresRangeList) { if (bdWaresExt.getPkId().equals(waresRange.getPkWares())) { waresPrice = waresPrice.add(waresRange.getPrice()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/RetailWaresParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/RetailWaresParam.java index 7f661f78..29346f6c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/RetailWaresParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/RetailWaresParam.java @@ -6,11 +6,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * @Description: 新零售商品查询入参 - * @Author: jiang chao - * @Time: 2024/12/9 14:29 - * @Classname: WaresParams - * @PackageName: com.hzs.retail.wares.param + * 新零售商品查询入参 */ @Data public class RetailWaresParam implements Serializable { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java index 4a46dd72..328e1ae6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java @@ -215,23 +215,25 @@ public class SaDeliverController extends BaseController { public AjaxResult batchDeliverImport(MultipartFile file, @RequestParam("idList") List idList) throws Exception { ExcelUtil util = new ExcelUtil<>(DeliverTemplateParam.class); List deliverTemplateParamList = util.importExcel(file.getInputStream()); - Map templateParamMap = deliverTemplateParamList.stream().collect(Collectors.toMap(DeliverTemplateParam::getDeliverCode, val -> val)); // 返回数据 List resultList = new ArrayList<>(idList.size()); // 查询发货单信息 - List saDeliverList = iSaDeliverService.listDataBatch(idList); + List saDeliverList = iSaDeliverService.listByIds(idList); for (SaDeliver saDeliver : saDeliverList) { - DeliverTemplateParam deliverTemplate = templateParamMap.get(saDeliver.getDeliverCode()); - if (null != deliverTemplate) { - // 发货单号相同 ，则进行返回 - resultList.add(DeliverTemplateVO.builder() - .pkId(saDeliver.getPkId()) - .logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) - .logisticsCode(deliverTemplate.getLogisticsCode().trim()) - .build()); + // 遍历导入数据，匹配发货单发货数据，如果相同则封装返回发货信息 + for (DeliverTemplateParam deliverTemplate : deliverTemplateParamList) { + if (saDeliver.getDeliverCode().equals(deliverTemplate.getDeliverCode())) { + // 物流单号相同，进行返回 + resultList.add(DeliverTemplateVO.builder() + .pkId(saDeliver.getPkId()) + .logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) + .logisticsCode(deliverTemplate.getLogisticsCode().trim()) + .build()); + break; + } } } return AjaxResult.success(resultList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java index c4dfe5e9..2334a220 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java @@ -3,6 +3,7 @@ package com.hzs.sale.deliver.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.DesensitizedUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.annotation.RepeatSubmitSimple; @@ -18,6 +19,7 @@ import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.sale.deliver.SaDeliver; +import com.hzs.common.domain.sale.deliver.SaDeliverBarCode; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; @@ -43,11 +45,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 发货清单已合单控制器 - * @Author: jiang chao - * @Time: 2022/10/19 16:43 - * @Classname: SaDeliverController - * @PackageName: com.hzs.sale.order.controller.manager + * 发货清单已合单控制器 */ @RestController @RequestMapping("/manage/deliver-handled") @@ -162,6 +160,74 @@ public class SaDeliverHandledController extends BaseController { util.exportExcel(response, resultList, "发货清单已合单导出"); } + /** + * 仓储导出 + * + * @param response + * @param param + */ + @PostMapping("/wms-export") + public void wmsExport(HttpServletResponse response, DeliverHandledParam param) { + DateUtils.handTimeStartAndEnd(param.getCreationTime()); + DateUtils.handTimeStartAndEnd(param.getPayTime()); + + // 国家ID + Integer pkCountry = SecurityUtils.getPkCountry(); + + List voList = new ArrayList<>(); + + // 获取管理员权限（角色地区范围、体系列表、团队列表） + UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); + param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); + param.setVertexIdList(userAuthorityDTO.getVertexIdList()); + param.setTeamList(userAuthorityDTO.getUserTeamList()); + + List resultList = iSaDeliverService.queryDeliverHandledList(param, pkCountry); + + // 当查询有数据才进行处理 + if (resultList.size() > 0) { + // 获取行政区划map + Map areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData(); + + String deliverCode = ""; + DeliverWmsVO vo = null; + // 合并 key： 发货单号 + 仓储编号 + 规格，一样的累计数量 + String key = null; + for (DeliverHandledVO deliverHandled : resultList) { + if (null == key || !key.equals(deliverHandled.getDeliverCode() + "-" + deliverHandled.getWmsCode() + "-" + deliverHandled.getSpecsName())) { + // key： 发货单号 + 仓储编号 + 规格，一样的累计数量 + key = deliverHandled.getDeliverCode() + "-" + deliverHandled.getWmsCode() + "-" + deliverHandled.getSpecsName(); + + vo = DeliverWmsVO.builder() + .wmsCode(deliverHandled.getWmsCode()) + .productName(deliverHandled.getProductName()) + .specsName(deliverHandled.getSpecsName()) + .quantity(deliverHandled.getQuantity()) + .price(BigDecimal.ZERO) + .build(); + if (!deliverCode.equals(deliverHandled.getDeliverCode())) { + deliverCode = deliverHandled.getDeliverCode(); + vo.setDeliverCode(deliverHandled.getDeliverCode()); + vo.setRecName(deliverHandled.getRecName()); + vo.setRecPhone(deliverHandled.getRecPhone()); + + // 省市区处理 + OrderUtil.handleOrderAddress(areaMap, deliverHandled); + String address = deliverHandled.getRecProvinceVal() + + (StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "") + + (StringUtils.isNotEmpty(deliverHandled.getRecCountyVal()) ? deliverHandled.getRecCountyVal() : "") + + deliverHandled.getRecAddress(); + vo.setRecAddress(address); + } + voList.add(vo); + } else { + vo.setQuantity(vo.getQuantity() + deliverHandled.getQuantity()); + } + } + } + ExcelUtil util = new ExcelUtil<>(DeliverWmsVO.class); + util.exportExcel(response, voList, "发货清单已合单导出"); + } /** * 打印货单 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java index 60b4f395..ce783341 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java @@ -4,48 +4,45 @@ import com.hzs.common.core.annotation.Excel; import lombok.Data; /** - * @Description: 导入发货数据参数 - * @Author: jiang chao - * @Time: 2022/10/31 10:00 - * @Classname: BatchDeliverVO - * @PackageName: com.hzs.sale.deliver.vo + * 导入发货数据参数 */ @Data public class DeliverTemplateParam { - /** - * 收货姓名 - */ - @Excel(name = "收货姓名") - private String recName; +// /** +// * 收货姓名 +// */ +// @Excel(name = "收货姓名") +// private String recName; +// +// /** +// * 收货电话 +// */ +// @Excel(name = "收货电话") +// private String recPhone; +// +// /** +// * 收货地址 +// */ +// @Excel(name = "收货地址") +// private String recAddress; - /** - * 收货电话 - */ - @Excel(name = "收货电话") - private String recPhone; - - /** - * 收货地址 - */ - @Excel(name = "收货地址") - private String recAddress; /** * 发货单号 */ - @Excel(name = "发货单号") + @Excel(name = "订单号") private String deliverCode; /** * 物流公司 */ - @Excel(name = "物流公司") + @Excel(name = "快递公司") private String logisticsCompany; /** * 物流单号 */ - @Excel(name = "物流单号") + @Excel(name = "快递单号") private String logisticsCode; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java index 18cba58e..6e53ffc5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java @@ -10,11 +10,7 @@ import lombok.Data; import java.util.Date; /** - * @Description: 发货单已合并列表VO - * @Author: jiang chao - * @Time: 2022/11/5 15:51 - * @Classname: DeliverHandledVO - * @PackageName: com.hzs.sale.deliver.vo + * 发货单已合并列表VO */ @Data public class DeliverHandledVO { @@ -68,7 +64,7 @@ public class DeliverHandledVO { * 订单类型显示 */ @Excel(name = "订单类型") - private String orderTypeVal; + private String orderTypeVal; /** * 订单状态（EOrderStatus） @@ -102,6 +98,13 @@ public class DeliverHandledVO { */ @Excel(name = "产品编号") private String productCode; + + /** + * 产品编号 + */ + @Excel(name = "仓储编号") + private String wmsCode; + /** * 产品名称 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java index d0d01ac3..d602ba53 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java @@ -11,11 +11,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 发货单未合并列表VO - * @Author: jiang chao - * @Time: 2022/11/4 11:29 - * @Classname: DeliverUnhandledVO - * @PackageName: com.hzs.sale.deliver.vo + * 发货单未合并列表VO */ @Data public class DeliverUnhandledVO { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java new file mode 100644 index 00000000..0d66a917 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java @@ -0,0 +1,106 @@ +package com.hzs.sale.deliver.vo; + +import com.hzs.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 发货单WMS导出VO + */ +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +public class DeliverWmsVO implements Serializable { + + @Excel(name = "<必填>订单号") + private String deliverCode; + + @Excel(name = "下单时间") + private String createTime; + @Excel(name = "付款时间") + private String payTime; + + @Excel(name = "交易类型") + private String payType; + @Excel(name = "业务员") + private String peopleName; + @Excel(name = "备注") + private String orderRemark; + @Excel(name = "买家留言") + private String buyRemark; + @Excel(name = "系统备注") + private String sysRemark; + @Excel(name = "仓库") + private String storeName; + @Excel(name = "总金额") + private BigDecimal totalAmount; + @Excel(name = "运费") + private String postAmount; + @Excel(name = "实付总额") + private String realTotalAmount; + @Excel(name = "本次收款") + private String receiveAmount; + @Excel(name = "结算账户") + private String settleAccount; + + @Excel(name = "<必填>收货人姓名") + private String recName; + + @Excel(name = "手机") + private String recPhone; + + @Excel(name = "固话") + private String fixedPhone; + + @Excel(name = "<必填>地址") + private String recAddress; + + @Excel(name = "邮编") + private String postal; + + @Excel(name = "电子邮箱") + private String email; + + @Excel(name = "<必填>商品编码") + private String wmsCode; + + @Excel(name = "产品名称") + private String productName; + + @Excel(name = "规格名称") + private String specsName; + + @Excel(name = "<必填>数量") + private Integer quantity; + + @Excel(name = "单价") + private BigDecimal price; + + @Excel(name = "实付") + private BigDecimal realPay; + + @Excel(name = "配送方式") + private String delivery; + + @Excel(name = "明细备注") + private String remark; + + @Excel(name = "批次号") + private String batchNo; + + @Excel(name = "生产日期") + private String produceDate; + + @Excel(name = "过期日期") + private String expireDate; + + + + +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java index dff29833..401f32db 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java @@ -66,11 +66,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 订单业务办理 - * @Author: jiang chao - * @Time: 2023/1/31 10:31 - * @Classname: OrderBusinessController - * @PackageName: com.hzs.sale.order.controller.manager + * 订单业务办理 */ @Slf4j @RestController diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresItemsParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresItemsParam.java index 3183400b..04fed1fe 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresItemsParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresItemsParam.java @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * @Description: 商品明细参数 - * @Author: sui q - * @Time: 2022/9/15 17:00 - * @Classname: WaresItemsParam - * @PackageName: com.hzs.sale.order.param + * 商品明细参数 */ @Data @Builder @@ -26,7 +22,7 @@ public class WaresItemsParam implements Serializable { private Integer pkWaresSpecsSku; /** - * 商品数量 + * 产品数量 */ private Integer quantity; @@ -35,4 +31,9 @@ public class WaresItemsParam implements Serializable { */ private Integer pkProduct; + /** + * 产品编号 + */ + private String productCode; + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java index fd3d8be5..7719a652 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java @@ -772,14 +772,12 @@ public class SaOrderHandle { } /** + * orderType 1 = 注册，注册不用找累计 2 升级需要 + * * @param specialArea 专区 * @param settleOrderAmount 订单金额 * @param settleOrderPv 订单业绩 * @param pkCountry 国家 - * @Description: orderType 1 = 注册，注册不用找累计 2 升级需要 - * @return: List - * @Author: sui q - * @Date: 2022/2/17 11:27 */ GradeDTO getMemberGradeAndAwardByCountry(CuMember cuMember, Integer specialArea, BigDecimal settleOrderAmount, BigDecimal settleOrderPv, Integer pkCountry, String upgradeWay) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index bb70f68e..ce3f48ec 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -76,13 +76,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl - **/ @Override public List waresListByOrderId(List orderIdList) { return baseMapper.waresListByOrderId(orderIdList); @@ -98,12 +91,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl selectByInvestmentList(WaresOrderParam waresOrderParam) { return baseMapper.selectByInvestmentList(waresOrderParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 4fc7ea34..9f36458e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -63,6 +63,7 @@ import com.hzs.sale.order.param.*; import com.hzs.sale.order.service.*; import com.hzs.sale.order.vo.*; import com.hzs.sale.product.service.IBdProductExtendService; +import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.wares.service.*; import com.hzs.scm.pub.IScmBillServiceApi; import com.hzs.system.base.IAreaServiceApi; @@ -150,7 +151,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Autowired private UserTokenService userTokenService; @Autowired - private IBdProductExtendService productExtendService; + private IBdProductService iBdProductService; + @Autowired + private IBdProductExtendService iBdProductExtendService; @Autowired private RabbitTemplate rabbitTemplate; @Autowired @@ -1307,7 +1310,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl for (SaOrderItems orderItem : orderItems) { orderItem.setPkOrder(saOrder.getPkId()); BdWares wares = waresService.getWares(orderItem.getPkWares()); - BdProductExtendExt productExtend = productExtendService.queryExtendAndProduct(orderItem.getPkProduct()); + BdProductExtendExt productExtend = iBdProductExtendService.queryExtendAndProduct(orderItem.getPkProduct()); orderItem.setPkWares(wares.getPkId()); orderItem.setPrice(wares.getWaresPrice().multiply(new BigDecimal(orderItem.getQuantity()))); orderItem.setPkRate(currency.getData().getPkId()); @@ -2534,11 +2537,12 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); } - } else { - // 累计升级制，传的订单是当前撤的订单 - GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); - cuMember.setPkSettleGrade(gradeDTO.getPkId()); } +// else { +// // 累计升级制，传的订单是当前撤的订单 +// GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); +// cuMember.setPkSettleGrade(gradeDTO.getPkId()); +// } Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId()); if (null == firstDate) { @@ -2560,33 +2564,34 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); } - // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 - if (this.count(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) - .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - ) == 0) { - // 带有盒数商品的订单，需要校验等级 - List gradeList = iGradeServiceApi.getRetailGradeList().getData(); - // 当前会员等级 - BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); - - // 需要添加的升级记录列表 - List createLevelList = new ArrayList<>(); - // 需要删除的升级记录列表 - List deleteLevelList = new ArrayList<>(); - // 新等级计算 - BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); - - if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { - // 当前会员等级不是V4或者V5 并且 新等级小于当前等级需要进行处理 - saOrderExt.setNewGrade(newGrade); - saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); - } - saOrderExt.setCreateLevelList(createLevelList); - saOrderExt.setDeleteLevelList(deleteLevelList); - } + // TODO new 恢复升级专区，复购专区不需要处理等级问题 +// // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 +// if (this.count(Wrappers.lambdaQuery() +// .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) +// .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) +// .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) +// .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) +// ) == 0) { +// // 带有盒数商品的订单，需要校验等级 +// List gradeList = iGradeServiceApi.getRetailGradeList().getData(); +// // 当前会员等级 +// BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); +// +// // 需要添加的升级记录列表 +// List createLevelList = new ArrayList<>(); +// // 需要删除的升级记录列表 +// List deleteLevelList = new ArrayList<>(); +// // 新等级计算 +// BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); +// +// if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { +// // 当前会员等级不是V4或者V5 并且 新等级小于当前等级需要进行处理 +// saOrderExt.setNewGrade(newGrade); +// saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); +// } +// saOrderExt.setCreateLevelList(createLevelList); +// saOrderExt.setDeleteLevelList(deleteLevelList); +// } } } else if (EOrderType.RETAIL_PICK.getValue() == saOrderExt.getOrderType()) { // 新提货订单 @@ -2636,16 +2641,21 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (CollectionUtil.isEmpty(gradeList)) { gradeList = iGradeServiceApi.getRetailGradeList().getData(); } - // 盒数商品 + + // 补全产品编号 + handleOrderItemsParamsProduct(orderItemsParams); + // 盒数产品 List boxProductList = BoxProductUtil.getBoxProductListBySystemType(systemType); - // 当前商品盒数 + // 当前产品盒数 int boxNum = 0; - // 判断订单明细中指定商品数量，校验达到等级，重算价格 + // 判断订单明细中指定产品数量，校验等级 for (OrderItemsParam orderItemsParam : orderItemsParams) { - if (boxProductList.contains(orderItemsParam.getWaresCode())) { - // 存在指定商品，需要累计合数 - boxNum += orderItemsParam.getQuantity(); + for (WaresItemsParam waresItemsParam : orderItemsParam.getWaresItemsParamList()) { + if (boxProductList.contains(waresItemsParam.getProductCode())) { + // 存在指定产品，需要累计盒数（产品数量 * 商品数量） + boxNum += waresItemsParam.getQuantity() * orderItemsParam.getQuantity(); + } } } @@ -2654,20 +2664,22 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (ESpecialArea.RETAIL_REGISTER.getValue() == specialArea) { // 注册专区直接算等级 bdGrade = this.getGradeByBox(boxNum, gradeList, null, true); - } else if (ESpecialArea.RETAIL_UPGRADE.getValue() == specialArea - || ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea) { - // 2025.02.24 升级专区取消，复购专区购买盒数商品可以升级，首日累积升级，次日一次性补差升级 + } else if (ESpecialArea.RETAIL_UPGRADE.getValue() == specialArea) { + // 升级专区取消，一次性补差升级 + if (boxNum == 0) { + // 不满足升级条件 + throw new ServiceException("不满足升级条件"); + } // 当前会员等级 BdGrade memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(updateGradeMember.getPkSettleGrade())).findFirst().get(); - if (boxNum == 0) { - return memberGrade; + if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0) { + // 会员等级大于等于V3（卓越），不能通过升级进行购买了 + throw new ServiceException("当前已经是可以购买的最高等级"); } - // 获取升级盒数基数 - int baseBoxNum = this.handleBaseBoxNum(updateGradeMember, memberGrade, gradeList, boxProductList, systemType); // 计算等级 - bdGrade = this.getGradeByBox(baseBoxNum + boxNum, gradeList, memberGrade, true); + bdGrade = this.getGradeByBox(boxNum, gradeList, memberGrade, true); // 会员等级比购买盒数的等级要高，则以会员当前等级为准 if (memberGrade.getGradeValue().compareTo(bdGrade.getGradeValue()) >= 0) { @@ -2694,29 +2706,31 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (null == memberGrade) { // 注册处理 - // 去掉升级条件带有累计盒数的（V4,V5）升级购买合数小于等于订单商品盒数的，升级盒数小于购买盒数的最大一个等级为注册等级 - return gradeList.stream().filter(tmpGrade -> tmpGrade.getBoxTotal() == 0 && tmpGrade.getBoxNumber() <= boxTotal).max(Comparator.comparingInt(BdGrade::getGradeValue)).get(); + // 去掉 V4,V5 升级盒数小于购买盒数的最大一个等级为注册等级 + return gradeList.stream() + .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.VIP.getValue() && tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getBoxNumber() <= boxTotal) + .max(Comparator.comparingInt(BdGrade::getGradeValue)).get(); } else { // 非注册处理 - if (checkUpgrade) { - // 当前等级大于等于V3 或 盒数商品为0，则直接返回当前等级 - if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0 - || boxTotal == 0) { - return memberGrade; - } - } else { - // 当前等级大于V3 或 盒数商品为0，则直接返回当前等级 - if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) > 0 - || boxTotal == 0) { - return memberGrade; - } - } +// if (checkUpgrade) { +// // 当前等级大于等于V3 或 盒数商品为0，则直接返回当前等级 +// if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0 +// || boxTotal == 0) { +// return memberGrade; +// } +// } else { +// // 当前等级大于V3 或 盒数商品为0，则直接返回当前等级 +// if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) > 0 +// || boxTotal == 0) { +// return memberGrade; +// } +// } - // 查询等级比现在当前等级大的，然后倒序排序，再查询等级盒数 >= 购买盒数 的第一个等级，就是当前升级的等级 + // 查询等级比现在当前等级大的，然后倒序排序，再查询 购买盒数 <= 等级盒数 的第一个等级，就是当前升级的等级 Optional gradeOptional = gradeList.stream().filter(tmpGrade -> tmpGrade.getGradeValue() > memberGrade.getGradeValue()) .sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed()) .filter(tmpGrade -> tmpGrade.getBoxNumber() != 0) - .filter(tmpGrade -> tmpGrade.getBoxNumber() <= boxTotal).findFirst(); + .filter(tmpGrade -> tmpGrade.getBoxNumber() - memberGrade.getBoxNumber() <= boxTotal).findFirst(); return gradeOptional.orElse(memberGrade); } } @@ -3594,4 +3608,29 @@ public class SaOrderServiceImpl extends ServiceImpl impl return cuMemberLevel; } + /** + * 处理订单明细产品编号信息 + * + * @param orderItemsParams + */ + private void handleOrderItemsParamsProduct(List orderItemsParams) { + if (CollectionUtil.isNotEmpty(orderItemsParams)) { + Set pkProductSet = new HashSet<>(); + for (OrderItemsParam orderItemsParam : orderItemsParams) { + for (WaresItemsParam waresItemsParam : orderItemsParam.getWaresItemsParamList()) { + pkProductSet.add(waresItemsParam.getPkProduct()); + } + } + if (pkProductSet.size() > 0) { + Map productCodeMap = iBdProductService.getProductCodeMap(pkProductSet); + for (OrderItemsParam orderItemsParam : orderItemsParams) { + for (WaresItemsParam waresItemsParam : orderItemsParam.getWaresItemsParamList()) { + // 补全产品编号 + waresItemsParam.setProductCode(productCodeMap.get(waresItemsParam.getPkProduct())); + } + } + } + } + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java index 9c56ea43..705ac976 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.constant.msg.ProductMsgConstants; @@ -48,13 +47,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/1 14:14 - * @Classname: BdProductController - * @PackageName: com.hzs.sale.product.controller.manage - */ @Slf4j @RestController @RequestMapping("/manage/product") @@ -226,16 +218,6 @@ public class BdProductController extends BaseController { if (productCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); } - if (productParams.getPkProductBas() != null) { - // 校验每个国家该产品bas只能有一款 - LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); - qe.eq(BdProduct::getPkProductBas, productParams.getPkProductBas()); - qe.eq(BdProduct::getPkCountry, SecurityUtils.getPkCountry()); - int ct = productService.count(qe); - if (ct > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_BAS_COUNTYR_FIRST)); - } - } productService.saveProduct(productParams, loginUser); return AjaxResult.success(); } @@ -276,17 +258,6 @@ public class BdProductController extends BaseController { if (productCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); } - if (productParams.getPkProductBas() != null) { - // 校验每个国家该产品bas只能有一款 - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(BdProduct::getPkProductBas, productParams.getPkProductBas()); - qw.eq(BdProduct::getPkCountry, SecurityUtils.getPkCountry()); - qw.notIn(BdProduct::getPkId, productParams.getPkId()); - int ct = productService.count(qw); - if (ct > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_BAS_COUNTYR_FIRST)); - } - } // 修改商品信息 productService.updateProduct(productParams, loginUser); return AjaxResult.success(productParams.getProductCode()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java index 624f6bae..143b509a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java @@ -7,13 +7,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/1 15:48 - * @Classname: Product - * @PackageName: com.hzs.sale.product.controller.manage.params - */ @Data public class ProductParams implements Serializable { @@ -258,4 +251,9 @@ public class ProductParams implements Serializable { */ private Date removalTime; + /** + * 仓储产品编号 + */ + private String wmsCode; + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java index 6b9cbe73..1109c14d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java @@ -13,11 +13,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 产品相关mapper - * @Author: yuhui - * @Time: 2022/8/29 10:59 - * @Classname: BdProductMapper - * @PackageName: com.hzs.sale.product.mapper + * 产品相关mapper */ public interface BdProductMapper extends BaseMapper { @@ -37,10 +33,7 @@ public interface BdProductMapper extends BaseMapper { List selectByQueryList(ProductParams productParams); /* - * @description: 根据规格、主键查询产品 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null + * 根据规格、主键查询产品 **/ List queryProductExtBySpecsId(@Param("productSpecsList") List productSpecsList, @Param("pkCountry") Integer pkCountry); @@ -68,4 +61,15 @@ public interface BdProductMapper extends BaseMapper { * @return */ ProductVo getByProductId(@Param("productId") Integer productId); + + /** + * 根据商品获取对应产品信息 + * + * @param specialArea 商品专区 + * @param waresCodeList 商品编码列表 + * @return + */ + List listProductInfoByWaresCode(@Param("specialArea") Integer specialArea, + @Param("waresCodeList") List waresCodeList); + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java index 92136316..1a979e36 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java @@ -123,4 +123,21 @@ public interface IBdProductService extends IService { */ ProductVo getByProductId(Integer productId); + /** + * 获取产品编号map + * + * @param pkProductSet + * @return + */ + Map getProductCodeMap(Collection pkProductSet); + + /** + * 根据商品获取对应产品信息 + * + * @param specialArea 商品专区 + * @param waresCodeList 商品编码列表 + * @return + */ + Map listProductInfoByWaresCode(Integer specialArea, List waresCodeList); + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java index e98e7a2e..59133912 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java @@ -25,7 +25,6 @@ import com.hzs.sale.product.vo.SupplierProductCensusVo; import com.hzs.sale.product.vo.WaresDetailVo; import com.hzs.sale.wares.service.IBdWaresDetailService; import com.hzs.sale.wares.service.IBdWaresExtendService; -import com.hzs.scm.product.IBdProductBasSpecsServiceApi; import com.hzs.system.base.ITransactionServiceApi; import com.hzs.system.sys.ICubasdocApi; import com.hzs.system.sys.dto.BusinessLogDTO; @@ -65,8 +64,6 @@ public class BdProductServiceImpl extends ServiceImpl cubasdocDTO = cubasdocApi.getCubasdoc(productParams.getPkCubasdoc()); CubasdocDTO cubasdoc = cubasdocDTO.getData(); @@ -110,6 +105,10 @@ public class BdProductServiceImpl extends ServiceImpl pkProductBasList) { - productBasSpecsServiceApi.removeByPkProductBasList(pkProductBasList); - } - @Override @Transactional(rollbackFor = Exception.class) public void updateProduct(ProductParams productParams, LoginUser loginUser) { @@ -239,19 +228,16 @@ public class BdProductServiceImpl extends ServiceImpl getProductCodeMap(Collection pkProductSet) { + Map productCodeMap = new HashMap<>(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdProduct::getPkId, pkProductSet); + List productList = this.list(queryWrapper); + for (BdProduct bdProduct : productList) { + productCodeMap.put(bdProduct.getPkId(), bdProduct.getProductCode()); + } + return productCodeMap; + } + + @Override + public Map listProductInfoByWaresCode(Integer specialArea, List waresCodeList) { + Map productMap = new HashMap<>(); + + List bdProductList = baseMapper.listProductInfoByWaresCode(specialArea, waresCodeList); + if (CollectionUtil.isNotEmpty(bdProductList)) { + for (BdProduct bdProduct : bdProductList) { + productMap.put(bdProduct.getPkId(), bdProduct); + } + } + return productMap; + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java index 9b37a0d4..51539862 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java @@ -1,27 +1,14 @@ package com.hzs.sale.product.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; -import com.hzs.common.domain.sale.product.BdProduct; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/10/28 16:26 - * @Classname: ProductVo - * @PackageName: com.hzs.sale.product.vo - */ @Data public class ProductVo implements Serializable { @@ -184,7 +171,7 @@ public class ProductVo implements Serializable { */ private Integer isMerge; /** - *合并发货 翻译 + * 合并发货 翻译 */ @Excel(name = "合并发货") private String isMergeVal; @@ -225,7 +212,7 @@ public class ProductVo implements Serializable { /** * 上下架 */ - @Excel(name = "上下架状态",readConverterExp = "0=上架,1=下架") + @Excel(name = "上下架状态", readConverterExp = "0=上架,1=下架") private Integer isPutOn; /** * 创建人ID @@ -235,7 +222,7 @@ public class ProductVo implements Serializable { /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @@ -297,5 +284,9 @@ public class ProductVo implements Serializable { */ private Integer pkCubasdoc; + /** + * 仓储产品编号 + */ + private String wmsCode; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/IShoppingCartService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/IShoppingCartService.java index 906156e8..6ce722ad 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/IShoppingCartService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/IShoppingCartService.java @@ -9,10 +9,7 @@ import java.util.Map; public interface IShoppingCartService { /* - * @description: 查询需要下单的购物车 - * @author: sui q - * @date: 2023/5/23 16:08 - * @param: null null + * 查询需要下单的购物车 **/ List queryShopping(Long userId, ShoppingCartVO sop); @@ -25,11 +22,7 @@ public interface IShoppingCartService { void batchDelShopping(Long userId, ShoppingCartVO sop); /** - * @description: 查询购物车 - * @author: zhang jing - * @date: 2022/12/13 16:40 - * @param: [shoppingCartOld] - * @return: com.hz.web.controller.api.vo.ShoppingCartVO + * 查询购物车 **/ List getShopping(Map innerShopMap, Integer specialArea, Integer pkCountry, Integer systemType); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java index bb99b007..3c0d6b6d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java @@ -25,11 +25,7 @@ import java.math.BigDecimal; import java.util.*; /** - * @description: 购物车服务实现 - * @author: zhang jing - * @date: 2022/11/22 14:47 - * @param: - * @return: + * 购物车服务实现 **/ @Service public class ShoppingCartServiceImpl implements IShoppingCartService { @@ -37,17 +33,11 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { @Autowired private RedisService redisService; @Autowired - private IBdWaresSpecsSkuService bdWaresSpecsSkuService; + private IBdWaresSpecsSkuService iBdWaresSpecsSkuService; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; - /** - * 查询需要下单的购物车 - * - * @param userId - * @param sop - */ @Override public List queryShopping(Long userId, ShoppingCartVO sop) { List deleteList = sop.getDeleteList(); @@ -73,12 +63,6 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { return newShoppingCartRedis; } - /** - * 批量删除购物车 - * - * @param userId - * @param sop - */ @Override public void batchDelShopping(Long userId, ShoppingCartVO sop) { List deleteList = sop.getDeleteList(); @@ -107,19 +91,12 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { } } - /** - * @description: 查询购物车 - * @author: zhang jing - * @date: 2022/12/12 19:03 - * @param: [shoppingCartOld] - * @return: com.hz.web.controller.api.vo.ShoppingCartVO - **/ @Override public List getShopping(Map innerShopMap, Integer specialArea, Integer pkCountry, Integer systemType) { Long userId = SecurityUtils.getUserId(); //汇率 List shoppingCartOld = new ArrayList<>(); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); if (StringUtils.isNotNull(specialArea)) { ShoppingCartVO scv = new ShoppingCartVO(); List shoppingCartList = new ArrayList<>(); @@ -184,14 +161,11 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { } /** - * @description: 获取购物车商品信息 - * @author: zhang jing - * @date: 2023/5/22 14:36 - * @param: [shoppingCart, specialArea, waresCode, userId, sst, waresPrice, achieve, assAchieve, currency,] + * 获取购物车商品信息 **/ private void getShoppingCart(ShoppingCart shoppingCart, Integer specialArea, String waresCode, Long userId, ShoppingCartRedis sst, BigDecimal waresPrice, BigDecimal achieve, BigDecimal assAchieve, R currency, Integer pkCountry, Integer systemType) { - CuWaresParams cuWaresParams = bdWaresSpecsSkuService.queryWaresSpecsSkuShopping(specialArea, waresCode, userId, pkCountry, systemType); + CuWaresParams cuWaresParams = iBdWaresSpecsSkuService.queryWaresSpecsSkuShopping(specialArea, waresCode, userId, pkCountry, systemType); if (cuWaresParams == null) { return; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ProductGroup.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ProductGroup.java index f1072f5a..813adedd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ProductGroup.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ProductGroup.java @@ -5,14 +5,11 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: 购物车产品SKU组合缓存实体类 - * @Author: zhangjing - * @Time: 2022/9/16 11:11 - * @Classname: ShoppingCartVO - * @PackageName: com.hzs.common.domain.sale.ext + * 购物车产品SKU组合缓存实体类 */ @Data public class ProductGroup implements Serializable { + /** * 产品主键 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java index a74729ee..408db2ed 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java @@ -6,11 +6,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 购物车缓存实体类 - * @Author: zhangjing - * @Time: 2022/9/16 11:11 - * @Classname: ShoppingCartVO - * @PackageName: com.hzs.common.domain.sale.ext + * 购物车缓存实体类 */ @Data public class ShoppingCartRedis implements Serializable { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java index 8fb34d72..97c68804 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java @@ -1,11 +1,4 @@ package com.hzs.sale.shopping.vo; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/20 14:03 - * @Classname: WaresItemVo - * @PackageName: com.hzs.sale.shopping.vo - */ import com.hzs.common.core.annotation.BigDecimalFormat; import lombok.AllArgsConstructor; @@ -16,14 +9,6 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.shopping.vo - *@Author: yh - *@CreateTime: 2023-03-20 14:03 - *@Description: TODO - *@Version: 1.0 - */ @Data @Builder @AllArgsConstructor @@ -41,6 +26,11 @@ public class WaresItemVo { */ private String waresCode; + /** + * 商品展示图片 + */ + private String cover; + /** * 商品展示图片 */ @@ -64,7 +54,6 @@ public class WaresItemVo { private BigDecimal achieve; /** * bv - * */ @BigDecimalFormat private BigDecimal assAchieve; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecialPostageMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecialPostageMapper.java index a4a6b273..31fa4ffc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecialPostageMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecialPostageMapper.java @@ -5,17 +5,13 @@ import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; import org.apache.ibatis.annotations.Param; /** - *

* 商品特殊邮费配置 Mapper 接口 - *

- * - * @author hzs - * @since 2023-10-27 */ public interface BdWaresSpecialPostageMapper extends BaseMapper { /** * 根据邮费主键删除邮费配置信息 + * * @param pkPostage */ void deleteByPkPostage(@Param("pkPostage") Integer pkPostage); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java index 6bedebdf..beaf1ad5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java @@ -14,9 +14,6 @@ import java.util.Set; /** * 规格sku表 Mapper 接口 - * - * @author hzs - * @since 2022-09-09 */ public interface BdWaresSpecsSkuMapper extends BaseMapper { @@ -26,9 +23,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * @param specialArea 专区 * @param systemType 系统类型 * @param waresCode 商品编号 - * @return: List - * @Author: sui q - * @Date: 2022/9/19 11:21 */ List queryWaresSpecsSku(@Param("specialArea") Integer specialArea, @Param("systemType") Integer systemType, @@ -38,9 +32,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * 根据sku主键查询规格名称 * * @param pkSkuId sku主键 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 15:25 */ List queryWaresSpecsNameSku(@Param("pkSkuIdList") Set pkSkuId); @@ -48,9 +39,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * 通过规格列表查询商品最小库存单位， * * @param cuWaresItemsParams 专区 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 */ BdWaresSpecsSkuExt queryWaresDetailSkuBySpecs(@Param("cuWaresItemsParams") CuWaresItemsParams cuWaresItemsParams); @@ -85,12 +73,9 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { */ List selectByPkIds(@Param("pkWaresSpecsSku") List pkWaresSpecsSku); - /* - * @description: 查询商品封装为返回到会员端商品信息 - * @author: sui q - * @date: 2023/5/10 19:57 - * @param: null null - **/ + /** + * 查询商品封装为返回到会员端商品信息 + */ WaresItemVo selectWaresItemsVO(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("productGroup") List productGroup); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java index 9c91b489..1e6c3135 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java @@ -14,9 +14,6 @@ import java.util.List; /** * 商品发布明细表 服务类 - * - * @author hzs - * @since 2022-09-09 */ public interface IBdWaresDetailService extends IService { @@ -25,9 +22,6 @@ public interface IBdWaresDetailService extends IService { * * @param specialArea 专区 * @param transType 运输方式 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 */ List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams, Integer systemTyype); @@ -36,9 +30,6 @@ public interface IBdWaresDetailService extends IService { * * @param specialArea 专区 * @param orderItemsParams 参数 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 */ List queryWaresDetailSpecsByCondition(Integer specialArea, Integer pkCountry, Integer pkCorp, Integer pkStorehouse, Integer province, String parentCode, CuMember cuMember, List orderItemsParams); @@ -68,7 +59,6 @@ public interface IBdWaresDetailService extends IService { */ List listByPkProduct(List pkProduct); - /** * 商品下产品查询 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecialPostageService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecialPostageService.java index 231b1771..1a212c8c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecialPostageService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecialPostageService.java @@ -6,25 +6,21 @@ import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; import java.util.List; /** - *

* 商品特殊邮费配置 服务类 - *

- * - * @author hzs - * @since 2023-10-27 */ public interface IBdWaresSpecialPostageService extends IService { /** * 查询特殊邮费商品ID列表 - * param pkCountry * + * @param pkCountry * @return */ List querySpecialPostagePkWares(Integer pkCountry); /** * 根据邮费主键删除邮费配置信息 + * * @param pkPostage */ void deleteByPkPostage(Integer pkPostage); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java index 64d39fa6..aa0f66bf 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java @@ -32,15 +32,12 @@ import java.util.Map; /** * 商品发布明细表 服务实现类 - * - * @author hzs - * @since 2022-09-09 */ @Service public class BdWaresDetailServiceImpl extends ServiceImpl implements IBdWaresDetailService { @DubboReference - IAreaServiceApi areaServiceApi; + IAreaServiceApi iAreaServiceApi; @Autowired private IActivityService iActivityService; @@ -156,7 +153,7 @@ public class BdWaresDetailServiceImpl extends ServiceImpl 0 && province != null) { // 根据产品，省查看是否由仓库，有仓库的话修改仓库 - List bdProductStorehouseList = areaServiceApi.queryBdProductStorehouseByCondition(productIdList, province).getData(); + List bdProductStorehouseList = iAreaServiceApi.queryBdProductStorehouseByCondition(productIdList, province).getData(); Map bdProductStorehouseMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(bdProductStorehouseList)) { bdProductStorehouseList.forEach(bdProductStorehouse -> bdProductStorehouseMap.put(bdProductStorehouse.getPkProduct(), bdProductStorehouse)); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index 9f006d3f..c09a2d95 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -48,9 +48,6 @@ import java.util.stream.Collectors; /** * 商品 服务实现类 - * - * @author hzs - * @since 2022-09-08 */ @Service public class BdWaresServiceImpl extends ServiceImpl implements IBdWaresService { @@ -1220,21 +1217,14 @@ public class BdWaresServiceImpl extends ServiceImpl impl rangePriceVoList.add(rangePriceVo); } } - // 对结果值进行排序 rangePriceVoList.sort(Comparator.comparing(RangePriceVo::getPkRange)); computeWaresPrice.setRangePriceVoList(rangePriceVoList); } } return computeWaresPriceList; - } - /** - * 查询商品团队信息 - * - * @return - */ @Override public Map> getWaresAuthority(List pkWaresList) { Map> map = new HashMap<>(); @@ -1247,34 +1237,16 @@ public class BdWaresServiceImpl extends ServiceImpl impl return map; } - /** - * 扣减预售数量库存 - * - * @param waresCode - * @param quantity - */ @Override public void updatePreSaleQuantityByWaresCode(String waresCode, Integer quantity) { baseMapper.updatePreSaleQuantityByWaresCode(waresCode, quantity); } - /** - * 查询商品可见类型 - * - * @param pkWares - * @return - */ @Override public WaresAuthorityVo getWaresAuthorityFirst(Integer pkWares) { return baseMapper.getWaresAuthorityFirst(pkWares); } - /** - * 置底 - * - * @param waresId - * @param loginUser - */ @Override public void bottomUp(Integer waresId, LoginUser loginUser) { BdWares bdWares = new BdWares(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java index 9a7fe6ec..0b5d46a8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecialPostageServiceImpl.java @@ -1,8 +1,7 @@ package com.hzs.sale.wares.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.domain.sale.wares.BdWaresSpecialPostage; import com.hzs.sale.wares.mapper.BdWaresSpecialPostageMapper; import com.hzs.sale.wares.service.IBdWaresSpecialPostageService; @@ -12,28 +11,19 @@ import java.util.List; import java.util.stream.Collectors; /** - *

* 商品特殊邮费配置 服务实现类 - *

- * - * @author hzs - * @since 2023-10-27 */ @Service public class BdWaresSpecialPostageServiceImpl extends ServiceImpl implements IBdWaresSpecialPostageService { @Override public List querySpecialPostagePkWares(Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdWaresSpecialPostage::getPkCountry, pkCountry); List pkWaresList = this.list(queryWrapper); return pkWaresList.stream().map(BdWaresSpecialPostage::getPkPostage).collect(Collectors.toList()); } - /** - * 根据邮费主键删除邮费配置信息 - * @param pkPostage - */ @Override public void deleteByPkPostage(Integer pkPostage) { baseMapper.deleteByPkPostage(pkPostage); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index 3371dd83..5565f0ae 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -49,42 +49,42 @@ import java.util.stream.Collectors; public class BdWaresSpecsSkuServiceImpl extends ServiceImpl implements IBdWaresSpecsSkuService { @Autowired - private IBdWaresSpecsRelationService waresSpecsRelationService; + private IBdWaresSpecsRelationService iBdWaresSpecsRelationService; @Autowired - private IBdWaresLabelService waresLabelService; + private IBdWaresLabelService iBdWaresLabelService; @Autowired - private IBdWaresDetailService waresDetailService; + private IBdWaresDetailService iBdWaresDetailService; @Autowired - private IBdWaresRangeService bdWaresRangeService; + private IBdWaresRangeService iBdWaresRangeService; @Autowired - private ISaOrderService saOrderService; + private ISaOrderService iSaOrderService; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference - IRangeServiceApi rangeServiceApi; + IRangeServiceApi iRangeServiceApi; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @Override public CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) { List bdWaresSpecsSkuExtList; - R memberDate = memberServiceApi.getMember(loginMemberId); + R memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.MALL_ORDER.getValue() == specialArea || EOrderType.COOPERATE_ORDER.getValue() == specialArea) { int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); + BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) { level = cuMember.getPkAwards(); rangeType = ERangeType.AWARDS.getValue(); } - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -94,7 +94,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Set pkSkuIdList = new HashSet<>(); bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt -> @@ -115,7 +115,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 保证标签 List ensureLabelList = new ArrayList<>(); // 卖点标签 @@ -147,9 +147,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl kgCurrency = null; if (pkCountry != null) { - kgCurrency = currencyServiceApi.getCurrency(pkCountry); + kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); } - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -168,7 +168,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { @@ -194,12 +193,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl memberDate = memberServiceApi.getMember(loginMemberId); + R memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -212,10 +211,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size())); CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 前台传递结算国 跨国报单计算价格使用 - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -243,28 +242,20 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List bdWaresSpecsSkuExtList; - if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea || EOrderType.RETAIL_CONSUME.getValue() == specialArea) { - // 2024.12.30 添加需求，复消也需要处理级差 + // 复消也需要处理级差 int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -295,7 +286,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl kgCurrency; if (pkCountry != null && !pkCountry.equals(SecurityUtils.getPkCountry())) { - kgCurrency = currencyServiceApi.getCurrency(pkCountry); + kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal inExchangeRate = cuWaresParams.getInExchangeRate(); BigDecimal kgInExchangeRate = kgCurrency.getData().getInExchangeRate(); cuWaresItemsParamsList.forEach(item -> { @@ -305,7 +296,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = productParams.stream() .peek(param -> { List list = cuWaresItemsParamsList.stream() @@ -321,14 +312,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl - * @Author: sui q - * @Date: 2022/9/27 10:51 */ private List setUpWaresItemsParams(List bdWaresSpecsSkuExtList, Map specsNameMap, BigDecimal inExchangeRate) { List cuWaresItemsParamsList = new ArrayList<>(); @@ -377,46 +364,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsTypeParamsMap) { - SpecsTypeParams bdWaresSpecs = SpecsTypeParams.builder() - .pkSpecsType(bdWaresSpecsSkuExt.getPkSpecsType()) - .typeName(bdWaresSpecsSkuExt.getSpecsTypeName()) - .build(); - // 规格 - Set specsParamsSet = new HashSet<>(); - setSpecsParams(bdWaresSpecsSkuExt, specsParamsSet); - bdWaresSpecs.setSpecsParamsSet(specsParamsSet); - specsTypeParamsMap.put(bdWaresSpecs.getPkSpecsType(), bdWaresSpecs); - } - - /** - * 设置规格明细 - * - * @param bdWaresSpecsSkuExt sku - * @param specsParamsList 规格明细 - */ - private void setSpecsParams(BdWaresSpecsSkuExt bdWaresSpecsSkuExt, Set specsParamsList) { - SpecsParams specsParams = SpecsParams.builder() - .pkSpecs(bdWaresSpecsSkuExt.getPkSpecs()) - .specsName(bdWaresSpecsSkuExt.getSpecsName()) - .build(); - specsParamsList.add(specsParams); - } - - /** - * 通过规格列表查询商品最小库存单位， - * - * @param cuWaresItemsParams 明细参数 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 - */ @Override public SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams) { BdWaresSpecsSkuExt bdWaresSpecsSkuExt = baseMapper.queryWaresDetailSkuBySpecs(cuWaresItemsParams); @@ -427,44 +374,21 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByWaresSpecsSku(List waresIds) { return baseMapper.selectByWaresSpecsSku(waresIds); } - /** - * 根据id 批量查询sku 信息 - * - * @param pkWaresSpecsSku - * @return - */ @Override public List selectByPkIds(List pkWaresSpecsSku) { return baseMapper.selectByPkIds(pkWaresSpecsSku); @@ -489,7 +413,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl { waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo); // 设置规格值 名称拼接 - List waresSpecsRelationExts = waresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); + List waresSpecsRelationExts = iBdWaresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); Set specsNames = waresSpecsRelationExts.stream().map(BdWaresSpecsRelationExt::getSpecsName).collect(Collectors.toSet()); waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ",")); }); @@ -497,11 +421,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList()); - List bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); + List bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); bdWaresRangeList.forEach(bdWaresRange -> { String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku(); if (waresDetailExtMap.containsKey(key)) { @@ -519,11 +443,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); if (pkCountry != null) { // 当登陆人的结算国和前端结算国不一致 即为跨国报单 if (!pkCountry.equals(SecurityUtils.getPkCountry())) { - R kgCurrency = currencyServiceApi.getCurrency(pkCountry); + R kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal price = waresItemVo.getPrice(); waresItemVo.setPrice(price.multiply(currency.getData().getInExchangeRate()).divide(kgCurrency.getData().getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP)); @@ -539,23 +463,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByMinWaresSpecsSkuByPkWaresList(List pkWaresIds) { return baseMapper.selectByMinWaresSpecsSkuByPkWaresList(pkWaresIds); } - /** - * 根据id 查询 - * - * @param pkWaresSpecsSku - * @return - */ @Override public BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku) { return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku); @@ -573,7 +485,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 商品关联产品规格ID Set pkSkuIdList = waresSpecsSkuExtList.stream().map(BdWaresSpecsSkuExt::getPkId).collect(Collectors.toSet()); @@ -609,7 +521,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 保证标签 List ensureLabelList = new ArrayList<>(); @@ -640,7 +552,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl cuWaresItemsParamsList = setUpWaresItemsParams(waresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 商品编号查询产品详情 - List productList = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productList = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productResultList = new ArrayList<>(); for (CuProductParams productVO : productList) { List list = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml index 0b81bb6a..c2eec23a 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml @@ -188,16 +188,6 @@ and bp.product_name like '%' || #{param.productName} || '%' - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in @@ -368,16 +358,6 @@ and bp.product_name like '%' || #{param.productName} || '%' - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml index 55534716..a8b1b4c3 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml @@ -373,16 +373,6 @@ and sd.deliver_time >= #{param.deliverTime[0]} and #{param.deliverTime[1]} >= sd.deliver_time - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml index 5583f98e..94c7cf87 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml @@ -30,6 +30,7 @@ + @@ -75,6 +76,7 @@ + - select bp.pk_id,bp.product_code,bp.product_name,bp.pk_country,bp.cover,bc.pk_id pk_specs_id,bc.pk_specs_type,bc.specs_name from bd_product bp + select bp.pk_id,bp.product_code,bp.product_name,bp.pk_country,bp.cover,bc.pk_id pk_specs_id,bc.pk_specs_type,bc.specs_name from bd_product + bp inner join bd_product_extend be on bp.pk_id = be.pk_product inner join bd_product_specs bs @@ -232,4 +235,24 @@ and bp.pk_id = #{productId} + + + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index b6766159..da3e9700 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -373,6 +373,7 @@ bw.WARES_CODE, bw.WARES_NAME, PK_AREA_CLASSIFY, + COVER, COVER1, bw.WARES_PRICE, bw.WARES_ACHIEVE, diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml index 59fa24d7..1f44c020 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml @@ -15,7 +15,9 @@ - delete from BD_WARES_SPECIAL_POSTAGE where PK_POSTAGE = #{pkPostage} + delete + from BD_WARES_SPECIAL_POSTAGE + where PK_POSTAGE = #{pkPostage} diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml index 66ae7eeb..06418e05 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml @@ -52,6 +52,7 @@ + @@ -144,10 +145,10 @@ and br.del_flag = 0 and bk.del_flag = 0 - and wd.DEL_FLAG=0 - and bs.DEL_FLAG=0 - and st.DEL_FLAG=0 - and sp.DEL_FLAG=0 + and wd.DEL_FLAG = 0 + and bs.DEL_FLAG = 0 + and st.DEL_FLAG = 0 + and sp.DEL_FLAG = 0 order by bs.PK_SPECS_TYPE @@ -217,7 +218,8 @@ - select bw.wares_code,bw.cover1,bw.WARES_NAME,be.is_maker_gift, - bs.price price,bs.achieve achieve,bs.ass_achieve ass_achieve, - bd.pk_id pk_wares_detail,bs.pk_id pk_wares_specs_sku,bp.product_name, - bs.spec_cover,#{item.quantity} quantity from BD_WARES bw + select bw.wares_code, + bw.cover, + bw.cover1, + bw.WARES_NAME, + be.is_maker_gift, + bs.price price, + bs.achieve achieve, + bs.ass_achieve ass_achieve, + bd.pk_id pk_wares_detail, + bs.pk_id pk_wares_specs_sku, + bp.product_name, + bs.spec_cover, + #{item.quantity} quantity + from BD_WARES bw inner join bd_wares_extend be on bw.pk_id = be.pk_wares inner join bd_wares_detail bd diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java deleted file mode 100644 index 1ffcf7e6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.system.base.controller.api; - -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.FeedbackVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** - * 意见反馈 前端控制器 - * - * @author hzs - * @since 2023-02-05 - */ -@RestController -@RequestMapping("/api/feedback") -public class ApiFeedbackController extends BaseController { - - @Autowired - IBdFeedbackService bdFeedbackService; - - /** - * 添加意见反馈 - * - * @return - */ - @PostMapping("save") - public AjaxResult save(@Valid @RequestBody FeedbackVO feedbackVO) { - feedbackVO.setPkMember(SecurityUtils.getUserId()); - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - return toAjax(bdFeedbackService.saveFeedback(feedbackVO)); - } - - - @GetMapping("index-list") - public TableDataInfo indexList(Integer isShowDay) { - Integer pkCountry = SecurityUtils.getPkCountry(); - FeedbackVO feedbackVO = FeedbackVO.builder().pkCountry(pkCountry).isShowDay(isShowDay) - .pkMember(SecurityUtils.getUserId()) - .build(); - startPage(); - Object[] objects = bdFeedbackService.selectFeedbackList(feedbackVO); - TableDataInfo tableDataInfo = getDataTable((List) objects[0]); - tableDataInfo.setRows((List) objects[1]); - return tableDataInfo; - } - - @GetMapping("index-detail") - public AjaxResult index(Long pkId) { - return AjaxResult.success(bdFeedbackService.showFeedbackVOById(pkId)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java index c91955cf..c3f8af3f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java @@ -8,7 +8,6 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.base.BdNotice; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.base.service.IBdFeedbackService; import com.hzs.system.base.service.IBdNoticeService; import com.hzs.system.base.vo.BdNoticeCountVO; import com.hzs.system.base.vo.BdNoticeVO; @@ -22,12 +21,6 @@ import java.util.List; /** * 公告、站内信 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/6 16:52 - * @Classname: ApiNoticeController - * @Package_name: com.hzs.system.base.controller.api */ @RestController @RequestMapping("/api/notice") @@ -36,9 +29,6 @@ public class ApiNoticeController extends BaseController { @Autowired private IBdNoticeService noticeService; - @Autowired - private IBdFeedbackService bdFeedbackService; - /** * 首页显示公告、站内信 * @@ -83,7 +73,7 @@ public class ApiNoticeController extends BaseController { } /** - * 会员首页 公告、站内信、意见反馈数 + * 会员首页 公告、站内信 * * @return */ @@ -100,11 +90,8 @@ public class ApiNoticeController extends BaseController { BdNoticeVO stationVO = BdNoticeVO.builder().pkCountry(pkCountry).pkMember(SecurityUtils.getUserId()) .websiteType(websiteType).functionType(ENoticeFunctionType.MAIL.getValue()).build(); Integer stationNum = noticeService.showIndexMailCount(stationVO); - //查询意见反馈数 - Integer feedbackNum = bdFeedbackService.selectIndexFeedbackCount(pkCountry, SecurityUtils.getUserId()); BdNoticeCountVO noticeCountVO = BdNoticeCountVO.builder() - .noticeNum(noticeNum).stationNum(stationNum) - .feedbackNum(feedbackNum).build(); + .noticeNum(noticeNum).stationNum(stationNum).build(); return AjaxResult.success(noticeCountVO); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java deleted file mode 100644 index 5ad79d83..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.hzs.system.base.controller.manage; - - -import cn.hutool.core.collection.CollUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.msg.FinanceMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import com.hzs.system.base.vo.FeedbackVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - *

- * 意见反馈 前端控制器 - *

- * - * @author hzs - * @since 2023-02-05 - */ -@RestController -@RequestMapping("/manage/feedback") -public class BdFeedbackController extends BaseController { - - @Autowired - IBdFeedbackService bdFeedbackService; - - @Autowired - IBdFeedbackReplyService bdFeedbackReplyService; - - - @Autowired - ITransactionCommonService iTransactionCommonService; - - /** - * 查询列表 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.SELECT) - @PostMapping("list") - public TableDataInfo getFeedbackList(@RequestBody FeedbackVO feedbackVO) { - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - Object[] objects = bdFeedbackService.selectFeedbackList(feedbackVO); - - TableDataInfo tableDataInfo = getDataTable((List) objects[0]); - tableDataInfo.setRows((List) objects[1]); - return tableDataInfo; - - } - - - /** - * 意见反馈列表导出 - * - * @param response 响应 - * @param feedbackVO 查询入参 - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, FeedbackVO feedbackVO) { - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - List feedbackVOList = (List) bdFeedbackService.selectFeedbackList(feedbackVO)[1]; - if (CollUtil.isNotEmpty(feedbackVOList)) { - //枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EFeedbackType.values(), EFeedbackStatus.values()); - for (FeedbackVO feedback : feedbackVOList) { - feedback.setTypeVal(transactionMap.get(EnumsPrefixConstants.FEEDBACK_TYPE + feedback.getType())); - feedback.setStatusVal(transactionMap.get(EnumsPrefixConstants.FEEDBACK_STATUS + feedback.getStatus())); - } - } - ExcelUtil util = new ExcelUtil<>(FeedbackVO.class); - util.exportExcel(response, feedbackVOList, "意见反馈"); - } - - /** - * 删除公告信息 - * - * @param pkId - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.DELETE) - @GetMapping("/delete") - public AjaxResult delete(Long pkId) { - FeedbackVO feedbackVO = new FeedbackVO(); - feedbackVO.setPkId(pkId); - feedbackVO.setPkModified(SecurityUtils.getUserId()); - return toAjax(bdFeedbackService.deleteById(feedbackVO)); - } - - /** - * 查询修改状态 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.UPDATE) - @GetMapping("/show") - public AjaxResult showFeedbackVOById(Long pkId) { - return AjaxResult.success(bdFeedbackService.showFeedbackVOById(pkId)); - } - - - /** - * 添加意见反馈 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.INSERT, remark = "意见反馈") - @PostMapping("save") - public AjaxResult save(@RequestBody BdFeedbackReplyVO feedbackReplyVO) { - - if (null == feedbackReplyVO.getReplyContent()) { - return AjaxResult.error("回复内容不能为空！"); - } - feedbackReplyVO.setPkCreator(SecurityUtils.getUserId()); - feedbackReplyVO.setPkCountry(SecurityUtils.getPkCountry()); - return toAjax(bdFeedbackReplyService.saveFeedbackReplyInfo(feedbackReplyVO)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java deleted file mode 100644 index b2fdf28c..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.system.base.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.system.base.vo.FeedbackVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 意见反馈 Mapper 接口 - *

- * - * @author hzs - * @since 2023-02-05 - */ -public interface BdFeedbackMapper extends BaseMapper { - - /** - * 查询意见反馈列表 - * - * @param feedbackVO VO - * @return List - */ - List selectFeedbackList(FeedbackVO feedbackVO); - - - /** - * 删除信息 - * - * @param feedbackVO 参数 - * @return pkCountry - */ - Integer deleteById(FeedbackVO feedbackVO); - - /** - * 查看详情 - * - * @param pkId 主键ID - * @return BdFeedbackExt - */ - BdFeedbackExt showFeedbackVOById(Long pkId); - - /** - * 查询会员首页意见反馈数 - * - * @param pkCountry 国家ID - * @return pkCountry - */ - Integer selectIndexFeedbackCount(@Param("pkCountry") Integer pkCountry,@Param("pkMember") Long pkMember); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java deleted file mode 100644 index 65656290..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.base.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.base.BdFeedbackReply; - -/** - *

- * 意见反馈回复 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-25 - */ -public interface BdFeedbackReplyMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java deleted file mode 100644 index e6a68a70..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.system.base.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.base.BdFeedbackReply; -import com.hzs.system.base.vo.BdFeedbackReplyVO; - -import java.util.List; - -/** - *

- * 意见反馈回复 服务类 - *

- * - * @author hzs - * @since 2023-04-25 - */ -public interface IBdFeedbackReplyService extends IService { - - /** - * 保存意见反馈回复 - * - * @param feedbackReplyVO 意见反馈回复信息 - * @return Boolean - */ - Boolean saveFeedbackReplyInfo(BdFeedbackReplyVO feedbackReplyVO); - - /** - * 根据意见反馈ID查询回复信息 - * - * @param pkFeedbackId - * @param pkCountry - * @return - */ - List selectFeedbackReplyById(Long pkFeedbackId, Integer pkCountry); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java deleted file mode 100644 index 757fbb5a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.system.base.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.system.base.vo.FeedbackVO; - -/** - *

- * 意见反馈 服务类 - *

- * - * @author hzs - * @since 2023-02-05 - */ -public interface IBdFeedbackService extends IService { - /** - * 保存意见反馈 - * - * @param feedbackVO - * @return - */ - Integer saveFeedback(FeedbackVO feedbackVO); - - /** - * 查询意见反馈列表 - * - * @param feedbackVO VO - * @return List - */ - Object[] selectFeedbackList(FeedbackVO feedbackVO); - - /** - * 删除信息 - * - * @param feedbackVO - * @return - */ - Integer deleteById(FeedbackVO feedbackVO); - - /** - * 查看详情 - * - * @param pkId - * @return - */ - FeedbackVO showFeedbackVOById(Long pkId); - - /** - * 根据ID修改状态 - * - * @param pkMember 用户ID - * @param pkId 主健 - * @return Boolean - */ - Boolean updateFeedbackById(Long pkMember, Long pkId); - - - /** - * 查询会员首页意见反馈数 - * - * @param pkCountry 国家ID - * @return pkCountry - */ - Integer selectIndexFeedbackCount(Integer pkCountry,Long pkMember); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java deleted file mode 100644 index bcc37edc..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.system.base.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EFeedbackStatus; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.base.BdFeedbackReply; -import com.hzs.system.base.mapper.BdFeedbackReplyMapper; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

- * 意见反馈回复 服务实现类 - *

- * - * @author hzs - * @since 2023-04-25 - */ -@Service -public class BdFeedbackReplyServiceImpl extends ServiceImpl implements IBdFeedbackReplyService { - @Autowired - IBdFeedbackService bdFeedbackService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveFeedbackReplyInfo(BdFeedbackReplyVO feedbackReplyVO) { - BdFeedback BdFeedback = bdFeedbackService.getById(feedbackReplyVO.getPkFeedbackId()); - if (BdFeedback.getStatus().equals(EFeedbackStatus.NO_FEEDBACK.getValue())) { - bdFeedbackService.updateFeedbackById(feedbackReplyVO.getPkCreator(), feedbackReplyVO.getPkFeedbackId()); - } - return save(BeanUtil.copyProperties(feedbackReplyVO, BdFeedbackReply.class)); - } - - @Override - public List selectFeedbackReplyById(Long pkFeedbackId, Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_FEEDBACK_ID", pkFeedbackId); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.orderByAsc("CREATION_TIME"); - return BeanUtil.copyToList(baseMapper.selectList(queryWrapper), BdFeedbackReplyVO.class); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java deleted file mode 100644 index edcd8675..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzs.system.base.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EFeedbackStatus; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.system.base.mapper.BdFeedbackMapper; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import com.hzs.system.base.vo.FeedbackVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 意见反馈 服务实现类 - *

- * - * @author hzs - * @since 2023-02-05 - */ -@Service -public class BdFeedbackServiceImpl extends ServiceImpl implements IBdFeedbackService { - - @Autowired - IBdFeedbackReplyService bdFeedbackReplyService; - - @Override - public Integer saveFeedback(FeedbackVO feedbackVO) { - BdFeedback bdFeedback = BeanUtil.copyProperties(feedbackVO, BdFeedback.class); - bdFeedback.setPkCreator(feedbackVO.getPkMember()); - return baseMapper.insert(bdFeedback); - } - - @Override - public Object[] selectFeedbackList(FeedbackVO feedbackVO) { - FeedbackVO feedback; - List feedbackVOList = new ArrayList<>(); - List feedbackExtList = baseMapper.selectFeedbackList(feedbackVO); - if (CollUtil.isNotEmpty(feedbackExtList)) { - for (BdFeedbackExt feedbackExt : feedbackExtList) { - List bdFeedbackReplyVOList = bdFeedbackReplyService.selectFeedbackReplyById(feedbackExt.getPkId(), feedbackExt.getPkCountry()); - feedback = BeanUtil.copyProperties(feedbackExt, FeedbackVO.class); - feedback.setFeedbackReplyList(bdFeedbackReplyVOList); - feedbackVOList.add(feedback); - } - } - Object[] objects = new Object[]{feedbackExtList, feedbackVOList}; - return objects; - } - - @Override - public Integer deleteById(FeedbackVO feedbackVO) { - return baseMapper.deleteById(feedbackVO); - - } - - @Override - public FeedbackVO showFeedbackVOById(Long pkId) { - FeedbackVO feedbackVO = BeanUtil.copyProperties(baseMapper.showFeedbackVOById(pkId), FeedbackVO.class); - List bdFeedbackReplyVOList = bdFeedbackReplyService.selectFeedbackReplyById(feedbackVO.getPkId(), feedbackVO.getPkCountry()); - feedbackVO.setFeedbackReplyList(bdFeedbackReplyVOList); - return feedbackVO; - } - - @Override - public Boolean updateFeedbackById(Long pkMember, Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("STATUS", EFeedbackStatus.FEEDBACK_PROVIDED.getValue()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.eq("PK_ID", pkId); - return update(updateWrapper); - } - - @Override - public Integer selectIndexFeedbackCount(Integer pkCountry,Long pkMember) { - return baseMapper.selectIndexFeedbackCount(pkCountry,pkMember); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java deleted file mode 100644 index 9029cca6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.system.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 意见反馈回复VO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/25 14:01 - * @Classname: BdFeedbackReplyVO - * @Package_name: com.hzs.system.base.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class BdFeedbackReplyVO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 主表ID - */ - private Long pkFeedbackId; - - /** - * 回复内容 - */ - private String replyContent; - - /** - * 会员主键 - */ - private Long pkCreator; - - /** - * 国家 ID - */ - private Integer pkCountry; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java index 67f974e2..9eb053fe 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java @@ -9,12 +9,6 @@ import java.io.Serializable; /** * 会员首页 记录数显示 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/9 17:37 - * @Classname: BdNoticeCountVO - * @Package_name: com.hzs.system.base.vo */ @Data @Builder @@ -31,9 +25,4 @@ public class BdNoticeCountVO implements Serializable { */ private Integer stationNum; - /** - * 意见反馈数 - */ - private Integer feedbackNum; - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java deleted file mode 100644 index def40552..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.hzs.system.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 意见反馈VO - * - * @Description: - * @Author: ljc - * @Time: 2023/2/5 14:05 - * @Classname: Feedback - * @Package_name: com.hzs.system.base.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class FeedbackVO implements Serializable { - private static final long serialVersionUID = -847776348100846568L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - - /** - * 国家 ID - */ - private Integer pkCountry; - - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员名称 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 体系名称 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - - - /** - * 类型：1：业务 2：平台BUG 3：客服问题 4：商品问题 - */ - @NotNull(message = "请选择反馈类型") - @Transaction(transactionKey = EnumsPrefixConstants.FEEDBACK_TYPE) - private Integer type; - - @Excel(name = "类型") - private String typeVal; - - /** - * 意见 - */ - @NotEmpty(message = "请填写反馈内容") - @Size(max = 500, message = "个人意见不能超过500位") - @Excel(name = "个人意见") - private String idea; - - /** - * 状态（1：已反馈 2：未反馈"） - */ - @Transaction(transactionKey = EnumsPrefixConstants.FEEDBACK_STATUS) - private Integer status; - - @Excel(name = "反馈状态") - private String statusVal; - - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "填写日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 会员昵称 - */ - private String nickName; - - - /** - * 会员头像 - */ - private String headPath; - - /** - * 是否显示七天的数据 - */ - private Integer isShowDay; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 开始时间 - */ - private String startDate; - /** - * 结束时间 - */ - private String endDate; - /** - * 隶属体系 - */ - private Integer pkVertex; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - - - - - - /** - * 回复信息 - */ - private List feedbackReplyList; -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java index e9f94a0e..6c283d1c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 会员特殊消费配置 Mapper 接口 - * - * @author hzs - * @since 2025-02-20 */ public interface BdMemberSpecialCurrencyMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 2090313a..9aaa2233 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -1540,26 +1540,7 @@ public class EnumsController extends BaseController { } /** - * 意见反馈类型 - * - * @return AjaxResult - */ - @GetMapping("/feedback-type") - public AjaxResult getFeedback() { - List enumEntityList = new ArrayList<>(); - for (EFeedbackType value : EFeedbackType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.FEEDBACK_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - - - /** - * @description: 发布位置 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 发布位置 **/ @GetMapping("/position") public AjaxResult getEPosition() { @@ -1571,11 +1552,7 @@ public class EnumsController extends BaseController { } /** - * @description: 发布位置 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 发布位置 **/ @GetMapping("/position-two") public AjaxResult getEPositionTwo() { @@ -2441,21 +2418,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - - /** - * 意见反馈状态 - * - * @return - */ - @GetMapping("/get-feedback-status") - public AjaxResult getFeedbackStatus() { - List enumEntityList = new ArrayList<>(); - for (EFeedbackStatus value : EFeedbackStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.FEEDBACK_STATUS)); - } - return AjaxResult.success(enumEntityList); - } - /** * 比率类型 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index 77e67035..34cac8aa 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -481,13 +481,6 @@ public class EnumsInitController { for (ENoticeGrade value : ENoticeGrade.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - - /** - * 意见反馈类型 - */ - for (EFeedbackType value : EFeedbackType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } /** * 业务办理流程类型 */ @@ -629,10 +622,6 @@ public class EnumsInitController { for (EReachState value : EReachState.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 意见反馈状态 - for (EFeedbackStatus value : EFeedbackStatus.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } // 比率类型 for (ERatioType value : ERatioType.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml deleted file mode 100644 index 880905bf..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, TYPE, IDEA - - - - - - - - - - update bd_feedback f - set f.del_flag = 1, f.modified_time = sysdate, f.pk_modified = #{pkModified} - where f.pk_id = #{pkId} - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml deleted file mode 100644 index 161b4906..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_FEEDBACK_ID, REPLY_CONTENT - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 904fd928..09876792 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -821,12 +821,6 @@ public class EnumsPrefixConstants { */ public static final String NOTICE_GRADE = "ENU_NOTICE_GRADE_"; - - /** - * 意见反馈类型 - */ - public static final String FEEDBACK_TYPE = "ENU_FEEDBACK_T_"; - /** * 注水方式 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java deleted file mode 100644 index be3bfff8..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.common.core.constant; - -import java.util.Arrays; -import java.util.List; - -/** - * 美业商品常量类 - */ -public class MyProductConstants { - - /** - * 盒数商品列表 - */ - public static final List BOX_WARES_LIST = Arrays.asList( - // 会员商品 - "HZS202541301", "HZS202541302", "HZS202541303", "HZS202541304", - // 复购专区 - "HZS202543301", "HZS202543302", "HZS202543303", "HZS202543304", - // 重消专区 - "HZS202544301", "HZS202544302", "HZS202544303", "HZS202544304" - ); - -} 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 ad5d0f46..8f6550f7 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 @@ -9,29 +9,17 @@ import java.util.List; public class RetailProductConstants { /** - * 盒数商品列表 -- 新零售 + * 盒数产品列表 */ - public static final List BOX_WARES_LIST = Arrays.asList( - // 会员商品 - "HZS202412001", "HZS202412002", "HZS202412003", "HZS202412004", "HZS202412005", "HZS202412006", - // 复购专区 - "HZS202412431", "HZS202412432", "HZS202412433", "HZS202412434", "HZS202412435", "HZS202412436", - // 重消专区 - "HZS202412441", "HZS202412442", "HZS202412443", "HZS202412444", "HZS202412445", "HZS202412446" + public static final List BOX_PRODUCT_LIST = Arrays.asList( + "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" ); + /** + * 盒数产品列表 + */ public static final List ALL_BOX_WARES_LIST = Arrays.asList( - // 会员商品 - "HZS202412001", "HZS202412002", "HZS202412003", "HZS202412004", "HZS202412005", "HZS202412006", - // 复购专区 - "HZS202412431", "HZS202412432", "HZS202412433", "HZS202412434", "HZS202412435", "HZS202412436", - // 重消专区 - "HZS202412441", "HZS202412442", "HZS202412443", "HZS202412444", "HZS202412445", "HZS202412446", - // 会员商品 - "HZS202541301", "HZS202541302", "HZS202541303", "HZS202541304", - // 复购专区 - "HZS202543301", "HZS202543302", "HZS202543303", "HZS202543304", - // 重消专区 - "HZS202544301", "HZS202544302", "HZS202544303", "HZS202544304" + "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" ); + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 23f1b60f..ac23007c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -14,9 +14,9 @@ public class SysConstants { */ public static final String RETAIL_PREFIX = "RE"; /** - * 新零售顶点 + * 顶点 */ - public static final String RETAIL_TOP_CODE = "HZS30720290"; + public static final String RETAIL_TOP_CODE = "GJ30720200"; /** * 登录密码 @@ -29,13 +29,13 @@ public class SysConstants { public static final String PAY_PASSWORD = "222222"; /** - * 小市场2万业绩（人民币） + * 血缘累计业绩30万 */ - public static final BigDecimal SMALL_AREA_PV = new BigDecimal("20000"); + public static final BigDecimal TOTAL_AREA_PV = new BigDecimal("300000"); /** * 开放使用会员编号（用于支付登录查看数据） */ - public static final List CONTROL_MEMBER_LIST = Arrays.asList("HZS20240001", "HZS20240002"); + public static final List CONTROL_MEMBER_LIST = Arrays.asList("RE20240001", "RE20240002"); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java index ad675870..6bed3b4b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java @@ -8,40 +8,40 @@ public class ActivityMsgConstants { /** * 会员点击抽奖按钮，验证抽奖次数 -- 抽奖次数不足！ */ - public static final String DRAW_AVAILABLE_NUMBER = "MSG_ACTIVITY_002"; +public static final String DRAW_AVAILABLE_NUMBER = "抽奖次数不足！"; /** * 会员点击抽奖按钮，验证抽奖次数 -- 抽奖活动已经结束，不能抽奖！ */ - public static final String DRAW_OVER = "MSG_ACTIVITY_003"; +public static final String DRAW_OVER = "抽奖活动已经结束，不能抽奖！"; /** * 修改或者提货时，提货相关数据已经不存在 -- 会员提货商品不存在 */ - public static final String PICK_PRODUCT_NOT_EXIST = "MSG_ACTIVITY_005"; +public static final String PICK_PRODUCT_NOT_EXIST = "会员提货商品不存在"; /** * 会员提货时，提货数量不足 -- 会员提货商品数量不足 */ - public static final String PICK_QUANTITY_NOT_ENOUGH = "MSG_ACTIVITY_006"; +public static final String PICK_QUANTITY_NOT_ENOUGH = "会员提货商品数量不足"; /** * 会员提货时，不包邮但是邮费模板配置有错误或者缺失 -- 提货邮费计算错误 */ - public static final String PICK_POSTAGE_ERROR = "MSG_ACTIVITY_008"; +public static final String PICK_POSTAGE_ERROR = "提货邮费计算错误"; /** * 签呈处理，提货充值记录已经没有了 -- 签呈处理失败：提货充值记录不存在 */ - public static final String PICK_NOT_EXIST = "MSG_ACTIVITY_009"; +public static final String PICK_NOT_EXIST = "签呈处理失败：提货充值记录不存在"; /** * 签呈处理，提货充值记录已经处理过了 -- 签呈处理失败：提货充值记录已处理 */ - public static final String PICK_PROCESSED = "MSG_ACTIVITY_010"; +public static final String PICK_PROCESSED = "签呈处理失败：提货充值记录已处理"; /** * 奖品信息填写不完整 -- 奖品规则信息填写不完整 */ - public static final String DRAW_RULE_COMPLETE_INFO = "MSG_ACTIVITY_011"; +public static final String DRAW_RULE_COMPLETE_INFO = "奖品规则信息填写不完整"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java index b140148e..192bcb96 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java @@ -13,9 +13,9 @@ public class AreaMsgConstants { /** * 地区名称已存在 -- 地区名称已存在 */ - public static final String AREA_NAME_EXIST = "MSG_AREA_001"; +public static final String AREA_NAME_EXIST = "地区名称已存在"; /** * 地区不存在 -- 地区不存在 */ - public static final String AREA_NOT_EXIST = "MSG_AREA_002"; +public static final String AREA_NOT_EXIST = "地区不存在"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java index dc959d66..3c66e55b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java @@ -145,24 +145,24 @@ public class BonusMsgConstants { /** * 奖金重算 -- 只能重算7天内的奖金！ */ - public static final String SETTLE_VALIDATE_DATE = "MSG_BONUS_022"; +public static final String SETTLE_VALIDATE_DATE = "只能重算7天内的奖金！"; /** * 奖金重算 -- 只能公布近7天的奖金！ */ - public static final String PUBLISH_VALIDATE_DATE = "MSG_BONUS_023"; +public static final String PUBLISH_VALIDATE_DATE = "只能公布近7天的奖金！"; /** * 奖金重算 -- 只能不公布近昨天的奖金！ */ - public static final String NO_PUBLISH_VALIDATE_DATE = "MSG_BONUS_024"; +public static final String NO_PUBLISH_VALIDATE_DATE = "只能不公布近昨天的奖金！"; /** * 奖金发放 -- 只能发放7天以外的奖金！ */ - public static final String GRANT_VALIDATE_DATE = "MSG_BONUS_025"; +public static final String GRANT_VALIDATE_DATE = "只能发放7天以外的奖金！"; /** * 奖金发放 -- 只能提现14天以外的奖金！ */ - public static final String WITHDRAW_VALIDATE_DATE = "MSG_BONUS_026"; +public static final String WITHDRAW_VALIDATE_DATE = "只能提现14天以外的奖金！"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java index 2fa09c0b..369575d8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java @@ -12,34 +12,34 @@ public class CommonMsgConstants { /** * 前后台数据传入中少了部分数据参数 -- 缺少参数 */ - public static final String MISSING_PARAM = "MSG_COMMON_001"; +public static final String MISSING_PARAM = "缺少参数"; /** * 接口数据处理因代码原因未成功 -- 操作失败 */ - public static final String OPERATION_FAILED = "MSG_COMMON_002"; +public static final String OPERATION_FAILED = "操作失败"; /** * 一般用于三方对接，处理失败，用户刷新后可以重新进行操作提示 -- 操作失败，请刷新后重试 */ - public static final String OPERATION_FAILED_FLUSH = "MSG_COMMON_003"; +public static final String OPERATION_FAILED_FLUSH = "操作失败，请刷新后重试"; /** * 用户已转结算国，不能进行处理相关操作 -- 用户已转结算国，不能进行操作 */ - public static final String SETTLEMENT_COUNTRY_NOT_OPERATE = "MSG_COMMON_004"; +public static final String SETTLEMENT_COUNTRY_NOT_OPERATE = "用户已转结算国，不能进行操作"; /** * 签呈处理失败 -- 签呈处理失败 */ - public static final String APPROVAL_ERROR = "MSG_COMMON_005"; +public static final String APPROVAL_ERROR = "签呈处理失败"; /** * 签呈审批时，签呈数据不存在或者被删除 -- 签呈处理失败：签呈不存在 */ - public static final String APPROVAL_NOT_EXIST = "MSG_COMMON_006"; +public static final String APPROVAL_NOT_EXIST = "签呈处理失败：签呈不存在"; /** * 签呈审批时，签呈已经被审批 -- 签呈处理失败：签呈已处理 */ - public static final String APPROVAL_PROCESSED = "MSG_COMMON_007"; +public static final String APPROVAL_PROCESSED = "签呈处理失败：签呈已处理"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index 8e022a50..674fdf53 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -7,178 +7,178 @@ public class ConfigMsgConstants { /** * 最低提现金额不能为空 -- 最低提现金额不能为空！ */ - public static final String MIN_AMOUNT_NOT_NULL = "MSG_CONFIG_001"; +public static final String MIN_AMOUNT_NOT_NULL = "最低提现金额不能为空！"; /** * 手续费类型不能为空 -- 手续费类型不能为空！ */ - public static final String SERVICE_TYPE_NOT_NULL = "MSG_CONFIG_002"; +public static final String SERVICE_TYPE_NOT_NULL = "手续费类型不能为空！"; /** * 提现个税扣除类型不能为空 -- 提现个税扣除类型不能为空！ */ - public static final String TAX_SERVICE_TYPE_NOT_NULL = "MSG_CONFIG_003"; +public static final String TAX_SERVICE_TYPE_NOT_NULL = "提现个税扣除类型不能为空！"; /** * 提现个税明细不能为空 -- 提现个税明细不能为空！ */ - public static final String BD_WITHDRAWAL_TAX_DETAILS_NOT_NULL = "MSG_CONFIG_004"; +public static final String BD_WITHDRAWAL_TAX_DETAILS_NOT_NULL = "提现个税明细不能为空！"; /** * 手续费值不能为空 -- 手续费金额不能为空！ */ - public static final String SERVICE_RATIO_NOT_NULL = "MSG_CONFIG_005"; +public static final String SERVICE_RATIO_NOT_NULL = "手续费金额不能为空！"; /** * 手续费重复 -- 手续费重复！ */ - public static final String SERVICE_TYPE_REPEAT = "MSG_CONFIG_006"; +public static final String SERVICE_TYPE_REPEAT = "手续费重复！"; /** * 最高提现金额不能为空 -- 最高提现金额不能为空！ */ - public static final String MAX_AMOUNT_NOT_NULL = "MSG_CONFIG_007"; +public static final String MAX_AMOUNT_NOT_NULL = "最高提现金额不能为空！"; /** * 最低自动提现金额不能为空 -- 最低自动提现金额不能为空！ */ - public static final String LOWER_BOUND_NOT_NULL = "MSG_CONFIG_008"; +public static final String LOWER_BOUND_NOT_NULL = "最低自动提现金额不能为空！"; /** * 个税上界不能为空 -- 个税上界不能为空！ */ - public static final String TAX_MAX_AMOUNT_NOT_NULL = "MSG_CONFIG_009"; +public static final String TAX_MAX_AMOUNT_NOT_NULL = "个税上界不能为空！"; /** * 个税下界不能为空 -- 个税下界不能为空！ */ - public static final String TAX_LOWER_BOUND_NOT_NULL = "MSG_CONFIG_010"; +public static final String TAX_LOWER_BOUND_NOT_NULL = "个税下界不能为空！"; /** * 个税扣除不能为空 -- 个税扣除不能为空！ */ - public static final String TAX_RATIO_NOT_NULL = "MSG_CONFIG_011"; +public static final String TAX_RATIO_NOT_NULL = "个税扣除不能为空！"; /** * 提现个税周期不能为空 -- 提现个税周期不能为空！ */ - public static final String TAX_CYCLE_NOT_NULL = "MSG_CONFIG_012"; +public static final String TAX_CYCLE_NOT_NULL = "提现个税周期不能为空！"; /** * 提现个税周期不能小于0大于12 -- 提现个税周期不能小于0大于12！ */ - public static final String TAX_CYCLE_NOT_STANDARD = "MSG_CONFIG_013"; +public static final String TAX_CYCLE_NOT_STANDARD = "提现个税周期不能小于0大于12！"; /** * 最高自动提现金额不能为空 -- 最高自动提现金额不能为空！ */ - public static final String UPPER_BOUND_NOT_NULL = "MSG_CONFIG_014"; +public static final String UPPER_BOUND_NOT_NULL = "最高自动提现金额不能为空！"; /** * 是否自动不能为空 -- 是否自动不能为空！ */ - public static final String IS_AUTO_NOT_NULL = "MSG_CONFIG_015"; +public static final String IS_AUTO_NOT_NULL = "是否自动不能为空！"; /** * 是否整取不能为空 -- 是否整取不能为空！ */ - public static final String IS_ROUNDING_NOT_NULL = "MSG_CONFIG_016"; +public static final String IS_ROUNDING_NOT_NULL = "是否整取不能为空！"; /** * 是否血缘不能为空 -- 是否血缘不能为空 */ - public static final String BD_TRANSFER_IS_REFERENCE_NOT_NULL = "MSG_CONFIG_017"; +public static final String BD_TRANSFER_IS_REFERENCE_NOT_NULL = "是否血缘不能为空"; /** * 提现次数不能为空 -- 提现次数不能为空 */ - public static final String WITHDRAWAL_NUMBER_NOT_NULL = "MSG_CONFIG_018"; +public static final String WITHDRAWAL_NUMBER_NOT_NULL = "提现次数不能为空"; /** * 提现周期不能为空 -- 提现周期不能为空 */ - public static final String WITHDRAWAL_CYCLE_NOT_NULL = "MSG_CONFIG_019"; +public static final String WITHDRAWAL_CYCLE_NOT_NULL = "提现周期不能为空"; /** * 最低提现金额不能大于最高提现金额 -- 最低提现金额不能大于最高提现金额 */ - public static final String COMPARISON_OF_SIZE = "MSG_CONFIG_020"; +public static final String COMPARISON_OF_SIZE = "最低提现金额不能大于最高提现金额"; /** * 生效日期不能为空 -- 生效日期不能为空 */ - public static final String EFFECTIVE_DATE_NOT_NULL = "MSG_CONFIG_021"; +public static final String EFFECTIVE_DATE_NOT_NULL = "生效日期不能为空"; /** * 倍数不能为空 -- 倍数不能为空 */ - public static final String MULTIPLE_NOT_NULL = "MSG_CONFIG_022"; +public static final String MULTIPLE_NOT_NULL = "倍数不能为空"; /** * 显示顺序不能为空 -- 显示顺序不能为空 */ - public static final String SORT_NOT_NULL = "MSG_CONFIG_024"; +public static final String SORT_NOT_NULL = "显示顺序不能为空"; /** * 显示顺序重复 -- 显示顺序重复 */ - public static final String SORT_NOT_REPEAT = "MSG_CONFIG_025"; +public static final String SORT_NOT_REPEAT = "显示顺序重复"; /** * 在线充值重复 -- 在线充值重复 */ - public static final String RECHARGE_NOT_REPEAT = "MSG_CONFIG_026"; +public static final String RECHARGE_NOT_REPEAT = "在线充值重复"; /** * 账户名称不能为空 -- 账户名称不能为空 */ - public static final String ACCOUNT_NAME_NOT_NULL = "MSG_CONFIG_027"; +public static final String ACCOUNT_NAME_NOT_NULL = "账户名称不能为空"; /** * 洲际名称不能为空 -- 大洲名称不能为空 */ - public static final String CONTINENT_NAME_NOT_NULL = "MSG_CONFIG_028"; +public static final String CONTINENT_NAME_NOT_NULL = "大洲名称不能为空"; /** * 大区名称不能为空 -- 大区名称不能为空 */ - public static final String REGION_NAME_NOT_NULL = "MSG_CONFIG_029"; +public static final String REGION_NAME_NOT_NULL = "大区名称不能为空"; /** * 地区名称不能为空 -- 地区名称不能为空 */ - public static final String CONTINENT_AREA_NAME_NOT_NULL = "MSG_CONFIG_030"; +public static final String CONTINENT_AREA_NAME_NOT_NULL = "地区名称不能为空"; /** * 上一级不能为空 -- 上一级不能为空 */ - public static final String UPPER_LEVEL_NOT_NULL = "MSG_CONFIG_031"; +public static final String UPPER_LEVEL_NOT_NULL = "上一级不能为空"; /** * 请选择要关联的国家 -- 请选择要关联的国家 */ - public static final String BINDING_COUNTRY_NOT_NULL = "MSG_CONFIG_032"; +public static final String BINDING_COUNTRY_NOT_NULL = "请选择要关联的国家"; /** * 请选择要关联的省 -- 请选择要关联的省 */ - public static final String BINDING_PROVINCE_NOT_NULL = "MSG_CONFIG_033"; +public static final String BINDING_PROVINCE_NOT_NULL = "请选择要关联的省"; /** * 账户值不能为空 -- 账户值不能为空 */ - public static final String ACCOUNT_VALUE_NOT_NULL = "MSG_CONFIG_034"; +public static final String ACCOUNT_VALUE_NOT_NULL = "账户值不能为空"; /** * 办理业务手续费不存在 -- 办理业务手续费不存在 */ - public static final String BUSINESS_ACCOUNT_IS_NULL = "MSG_CONFIG_036"; +public static final String BUSINESS_ACCOUNT_IS_NULL = "办理业务手续费不存在"; /** * 办理业务手续费退款失败 -- 办理业务手续费退款失败 */ - public static final String BUSINESS_ACCOUNT_IS_REFUND = "MSG_CONFIG_037"; +public static final String BUSINESS_ACCOUNT_IS_REFUND = "办理业务手续费退款失败"; /** * 所属专区不能为空 -- 所属专区不能为空 */ - public static final String SPECIAL_AREA_NOT_NULL = "MSG_CONFIG_038"; +public static final String SPECIAL_AREA_NOT_NULL = "所属专区不能为空"; /** * 账户类型不能为空 -- 账户类型不能为空 */ - public static final String PK_ACCOUNT_NOT_NULL = "MSG_CONFIG_040"; +public static final String PK_ACCOUNT_NOT_NULL = "账户类型不能为空"; /** * 扣款顺序重复 -- 扣款顺序重复 */ - public static final String DEDUCT_SORT_NOT_REPEAT = "MSG_CONFIG_041"; +public static final String DEDUCT_SORT_NOT_REPEAT = "扣款顺序重复"; /** * 扣款顺序不能为空 -- 扣款顺序不能为空 */ - public static final String DEDUCT_SORT_NOT_NULL = "MSG_CONFIG_042"; +public static final String DEDUCT_SORT_NOT_NULL = "扣款顺序不能为空"; /** * 扣款比例不能超过100% -- 扣款比例不能超过100% */ - public static final String DEDUCT_EXCEED_MAX = "MSG_CONFIG_043"; +public static final String DEDUCT_EXCEED_MAX = "扣款比例不能超过100%"; /** * 政策币扣款比例必须大于0 */ @@ -187,35 +187,35 @@ public class ConfigMsgConstants { /** * 扣款比例不能大于 -- 扣款比例不能大于 */ - public static final String DEDUCT_RATIO_NOT_MORE_THAN = "MSG_CONFIG_044"; +public static final String DEDUCT_RATIO_NOT_MORE_THAN = "扣款比例不能大于"; /** * 配置扣款比例不足 -- 扣款比例不足 */ - public static final String DEDUCT_RATIO_NOT_ENOUGH = "MSG_CONFIG_045"; +public static final String DEDUCT_RATIO_NOT_ENOUGH = "扣款比例不足"; /** * 扣款比例不能为空 -- 扣款比例不能为空 */ - public static final String DEDUCT_RATIO_NOT_NULL = "MSG_CONFIG_046"; +public static final String DEDUCT_RATIO_NOT_NULL = "扣款比例不能为空"; /** * 扣款不能为空 -- 扣款不能为空 */ - public static final String DEDUCT_NOT_NULL = "MSG_CONFIG_047"; +public static final String DEDUCT_NOT_NULL = "扣款不能为空"; /** * 扣款比例已满100 -- 扣款比例已满100 */ - public static final String DEDUCT_RATIO_FULL = "MSG_CONFIG_048"; +public static final String DEDUCT_RATIO_FULL = "扣款比例已满100"; /** * 比例不能为空 -- 比例不能为空 */ - public static final String RATIO_NOT_NULL = "MSG_CONFIG_050"; +public static final String RATIO_NOT_NULL = "比例不能为空"; /** * 会员编号不能为空 -- 会员编号不能为空 */ - public static final String MEMBER_CODE_NOT_NULL = "MSG_CONFIG_051"; +public static final String MEMBER_CODE_NOT_NULL = "会员编号不能为空"; /** * 会员名称不能为空 -- 会员名称不能为空 */ - public static final String MEMBER_NAME_NOT_NULL = "MSG_CONFIG_056"; +public static final String MEMBER_NAME_NOT_NULL = "会员名称不能为空"; /** * 安置部门不能为空 -- 安置部门不能为空 @@ -224,41 +224,41 @@ public class ConfigMsgConstants { /** * 会员编号前两位编号不能修改 -- 会员编号前两位编号不能修改 */ - public static final String MEMBER_CODE_NOT_EQUAL = "MSG_CONFIG_058"; +public static final String MEMBER_CODE_NOT_EQUAL = "会员编号前两位编号不能修改"; /** * 请选择注水业绩 -- 请选择注水业绩 */ - public static final String ACHIEVE_NOT_NULL = "MSG_CONFIG_063"; +public static final String ACHIEVE_NOT_NULL = "请选择注水业绩"; /** * 会员信息不存在 -- 会员信息不存在 */ - public static final String MEMBER_NOT_VALID = "MSG_CONFIG_064"; +public static final String MEMBER_NOT_VALID = "会员信息不存在"; /** * 变更后会员编号重复 -- 变更后会员编号重复 */ - public static final String UPDATE_MEMBER_CODE_REPEAT = "MSG_CONFIG_065"; +public static final String UPDATE_MEMBER_CODE_REPEAT = "变更后会员编号重复"; /** * 审批修改 -- 当前有修改正在进行中 */ - public static final String MEMBER_PARENT_UPDATE = "MSG_CONFIG_067"; +public static final String MEMBER_PARENT_UPDATE = "当前有修改正在进行中"; /** * 最低转账金额不能为空 -- 最低转账金额不能为空 */ - public static final String MIN_AMOUNT_TRANSFER_NOT_NULL = "MSG_CONFIG_068"; +public static final String MIN_AMOUNT_TRANSFER_NOT_NULL = "最低转账金额不能为空"; /** * 最高转账金额不能为空 -- 最高转账金额不能为空 */ - public static final String MAX_AMOUNT_TRANSFER_NOT_NULL = "MSG_CONFIG_069"; +public static final String MAX_AMOUNT_TRANSFER_NOT_NULL = "最高转账金额不能为空"; /** * 转账特殊设置 -- 转账特殊设置不能为空 */ - public static final String TRANSFER_SPECIAL_MIN_AMOUNT_NOT_NULL = "MSG_CONFIG_070"; +public static final String TRANSFER_SPECIAL_MIN_AMOUNT_NOT_NULL = "转账特殊设置不能为空"; /** * 最低转账金额 -- 最低转账金额不能为空 */ - public static final String MIN_AMOUNT_MONEY_NOT_NULL = "MSG_CONFIG_071"; +public static final String MIN_AMOUNT_MONEY_NOT_NULL = "最低转账金额不能为空"; /** * 结算值 注册金额/业绩不能为空 -- 注册金额/业绩不能为 */ @@ -266,123 +266,123 @@ public class ConfigMsgConstants { /** * 拓展比例不能为空 -- 拓展比例不能为空 */ - public static final String EXPAND_RATIO_NOT_NULL = "MSG_CONFIG_074"; +public static final String EXPAND_RATIO_NOT_NULL = "拓展比例不能为空"; /** * 拓展封顶不能为空 -- 拓展封顶不能为空 */ - public static final String EXPAND_CAPPING_NOT_NULL = "MSG_CONFIG_075"; +public static final String EXPAND_CAPPING_NOT_NULL = "拓展封顶不能为空"; /** * 复购拓展封顶不能为空 -- 复购拓展封顶不能为空 */ - public static final String REPURCHASE_CAPPING_NOT_NULL = "MSG_CONFIG_076"; +public static final String REPURCHASE_CAPPING_NOT_NULL = "复购拓展封顶不能为空"; /** * 复购拓展比例不能为空 -- 复购拓展比例不能为空 */ - public static final String REPURCHASE_RATIO_NOT_NULL = "MSG_CONFIG_077"; +public static final String REPURCHASE_RATIO_NOT_NULL = "复购拓展比例不能为空"; /** * 小区考核不能为空 -- 小区考核起不能为空 */ - public static final String COMMUNITY_CHECK_NOT_NULL = "MSG_CONFIG_078"; +public static final String COMMUNITY_CHECK_NOT_NULL = "小区考核起不能为空"; /** * 辅导代数不能为空 -- 辅导代数不能为空 */ - public static final String COACH_ALGEBRA_NOT_NULL = "MSG_CONFIG_079"; +public static final String COACH_ALGEBRA_NOT_NULL = "辅导代数不能为空"; /** * 辅导比例不能为空 -- 辅导比例不能为空 */ - public static final String COACH_RATIO_NOT_NULL = "MSG_CONFIG_081"; +public static final String COACH_RATIO_NOT_NULL = "辅导比例不能为空"; /** * 分红比例不能为空 -- 分红比例不能为空 */ - public static final String ABONUS_RATIO_NOT_NULL = "MSG_CONFIG_082"; +public static final String ABONUS_RATIO_NOT_NULL = "分红比例不能为空"; /** * 复购考核不能为空 -- 复购考核不能为空 */ - public static final String PURCHASE_CHECK_NOT_NULL = "MSG_CONFIG_083"; +public static final String PURCHASE_CHECK_NOT_NULL = "复购考核不能为空"; /** * 分红考核不能为空 -- 分红考核不能为空 */ - public static final String SHARE_CHECK_NOT_NULL = "MSG_CONFIG_084"; +public static final String SHARE_CHECK_NOT_NULL = "分红考核不能为空"; /** * 环球积分不能为空 -- 环球积分不能为空 */ - public static final String GLOBAL_INTEGRAL_NOT_NULL = "MSG_CONFIG_086"; +public static final String GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; /** * 车奖积分不能为空 -- 车奖积分不能为空 */ - public static final String CAR_AWARD_POINTS_NOT_NULL = "MSG_CONFIG_087"; +public static final String CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; /** * 真实奖衔不能为空 -- 真实奖衔不能为空 */ - public static final String AWARDS_NAME_NOT_NULL = "MSG_CONFIG_088"; +public static final String AWARDS_NAME_NOT_NULL = "真实奖衔不能为空"; /** * 左右区奖衔不能为空 -- 左右区奖衔不能为空 */ - public static final String LEFT_RIGHT_AWARDS_NAME_NOT_NULL = "MSG_CONFIG_089"; +public static final String LEFT_RIGHT_AWARDS_NAME_NOT_NULL = "左右区奖衔不能为空"; /** * 颜色不能为空 -- 颜色不能为空 */ - public static final String COLOR_NOT_NULL = "MSG_CONFIG_091"; +public static final String COLOR_NOT_NULL = "颜色不能为空"; /** * 真实奖衔属性不能为空 -- 真实奖衔属性不能为空 */ - public static final String AWARDS_VALUE_NOT_NULL = "MSG_CONFIG_092"; +public static final String AWARDS_VALUE_NOT_NULL = "真实奖衔属性不能为空"; /** * 极差名称不能为空 -- 极差名称不能为空 */ - public static final String RANGE_NAME_NOT_NULL = "MSG_CONFIG_093"; +public static final String RANGE_NAME_NOT_NULL = "极差名称不能为空"; /** * 金额比例不能为空 -- 金额比例不能为空 */ - public static final String RANGE_MONEY_RATIO_NOT_NULL = "MSG_CONFIG_094"; +public static final String RANGE_MONEY_RATIO_NOT_NULL = "金额比例不能为空"; /** * 业绩比例不能为空 -- 业绩比例不能为空 */ - public static final String RANGE_ACHIEVE_RATIO_NOT_NULL = "MSG_CONFIG_095"; +public static final String RANGE_ACHIEVE_RATIO_NOT_NULL = "业绩比例不能为空"; /** * 极差值不能为空 -- 极差值不能为空 */ - public static final String RANGE_VALUE_NOT_NULL = "MSG_CONFIG_096"; +public static final String RANGE_VALUE_NOT_NULL = "极差值不能为空"; /** * 极差值不能重复 -- 极差值不能重复 */ - public static final String RANGE_VALUE_REPEAT = "MSG_CONFIG_097"; +public static final String RANGE_VALUE_REPEAT = "极差值不能重复"; /** * 审核状态不能为空 -- 审核状态不能为空 */ - public static final String APPROVE_OPERATION_NOT_NULL = "MSG_CONFIG_098"; +public static final String APPROVE_OPERATION_NOT_NULL = "审核状态不能为空"; /** * 等级或奖衔不能为空 -- 等级或奖衔不能为空 */ - public static final String PK_GRADE_AWARDS_NOT_NULL = "MSG_CONFIG_100"; +public static final String PK_GRADE_AWARDS_NOT_NULL = "等级或奖衔不能为空"; /** * 拓展次数不能为空 -- 拓展次数不能为空 */ - public static final String EXPAND_NUMBER_NOT_NULL = "MSG_CONFIG_101"; +public static final String EXPAND_NUMBER_NOT_NULL = "拓展次数不能为空"; /** * 4-N配置不能为空 -- 4-N配置不能为空 */ - public static final String BONUS_EXPANDS_NOT_NULL = "MSG_CONFIG_102"; +public static final String BONUS_EXPANDS_NOT_NULL = "4-N配置不能为空"; /** * 区代名称不能为空 -- 区代名称不能为空 */ - public static final String AGENT_NAME_NOT_NULL = "MSG_CONFIG_103"; +public static final String AGENT_NAME_NOT_NULL = "区代名称不能为空"; /** * 区代值不能为空 -- 区代值不能为空 */ - public static final String AGENT_VALUE_NOT_NULL = "MSG_CONFIG_104"; +public static final String AGENT_VALUE_NOT_NULL = "区代值不能为空"; /** * 等级不能为空 -- 等级不能为空 */ - public static final String PK_GRADE_NOT_NULL = "MSG_CONFIG_105"; +public static final String PK_GRADE_NOT_NULL = "等级不能为空"; /** * 修改后推荐编号不能是本身或者血缘伞下 */ @@ -403,375 +403,375 @@ public class ConfigMsgConstants { /** * 注册权限不能为空 -- 注册权限不能为空 */ - public static final String REGISTER_AUTHORITY_NOT_NULL = "MSG_CONFIG_112"; +public static final String REGISTER_AUTHORITY_NOT_NULL = "注册权限不能为空"; /** * 关系类型不能为空 -- 关系类型不能为空 */ - public static final String RELATION_TYPE_NOT_NULL = "MSG_CONFIG_113"; +public static final String RELATION_TYPE_NOT_NULL = "关系类型不能为空"; /** * 考核奖衔不能为空 -- 考核奖衔不能为空 */ - public static final String PK_CHECK_AWARDS_NOT_NULL = "MSG_CONFIG_114"; +public static final String PK_CHECK_AWARDS_NOT_NULL = "考核奖衔不能为空"; /** * 保存失败 -- 保存失败 */ - public static final String FAILED_TO_SAVE = "MSG_CONFIG_115"; +public static final String FAILED_TO_SAVE = "保存失败"; /** * 协议标题不能为空 -- 协议标题不能为空 */ - public static final String PROTOCOL_TITLE_NOT_NULL = "MSG_CONFIG_117"; +public static final String PROTOCOL_TITLE_NOT_NULL = "协议标题不能为空"; /** * 协议内容不能为空 -- 协议内容不能为空 */ - public static final String PROTOCOL_CONTENT_NOT_NULL = "MSG_CONFIG_118"; +public static final String PROTOCOL_CONTENT_NOT_NULL = "协议内容不能为空"; /** * 内容不能为空 -- 内容不能为空 */ - public static final String HO_CONTENT_NOT_NULL = "MSG_CONFIG_119"; +public static final String HO_CONTENT_NOT_NULL = "内容不能为空"; /** * 协议不能为空 -- 协议不能为空 */ - public static final String PK_AGREEMENT_NOT_NULL = "MSG_CONFIG_122"; +public static final String PK_AGREEMENT_NOT_NULL = "协议不能为空"; /** * 店铺名称不能为空 -- 店铺名称不能为空 */ - public static final String SHOP_NAME_NOT_NULL = "MSG_CONFIG_123"; +public static final String SHOP_NAME_NOT_NULL = "店铺名称不能为空"; /** * 店铺等级名称不能为空 -- 店铺等级名称不能为空 */ - public static final String STORE_LEVEL_NAME_NOT_NULL = "MSG_CONFIG_124"; +public static final String STORE_LEVEL_NAME_NOT_NULL = "店铺等级名称不能为空"; /** * 店铺等级属性不能为空 -- 店铺等级属性不能为空 */ - public static final String LEVEL_VALUE_NOT_NULL = "MSG_CONFIG_125"; +public static final String LEVEL_VALUE_NOT_NULL = "店铺等级属性不能为空"; /** * 店铺等级业绩和比例不能为空 -- 店铺等级业绩和比例不能为空 */ - public static final String STORE_DETAIL_NOT_NULL = "MSG_CONFIG_126"; +public static final String STORE_DETAIL_NOT_NULL = "店铺等级业绩和比例不能为空"; /** * 店铺等级重复 -- 店铺等级重复 */ - public static final String LEVEL_VALUE_REPEAT = "MSG_CONFIG_127"; +public static final String LEVEL_VALUE_REPEAT = "店铺等级重复"; /** * 仓库编号不能为空 -- 仓库编号不能为空 */ - public static final String STOREHOUSE_CODE_NOT_NULL = "MSG_CONFIG_132"; +public static final String STOREHOUSE_CODE_NOT_NULL = "仓库编号不能为空"; /** * 仓库不能为空 -- 仓库不能为空 */ - public static final String STOREHOUSE_NOT_NULL = "MSG_CONFIG_133"; +public static final String STOREHOUSE_NOT_NULL = "仓库不能为空"; /** * 仓库名称不能为空 -- 仓库名称不能为空 */ - public static final String STOREHOUSE_NAME_NOT_NULL = "MSG_CONFIG_134"; +public static final String STOREHOUSE_NAME_NOT_NULL = "仓库名称不能为空"; /** * 仓库编号重复 -- 仓库编号重复 */ - public static final String STOREHOUSE_CODE_REPEAT = "MSG_CONFIG_135"; +public static final String STOREHOUSE_CODE_REPEAT = "仓库编号重复"; /** * 地区已绑定仓库 -- 已绑定仓库 */ - public static final String AREA_BINDING_REPEAT = "MSG_CONFIG_136"; +public static final String AREA_BINDING_REPEAT = "已绑定仓库"; /** * 配送中心名称不能为空 -- 配送中心名称不能为空 */ - public static final String DELIVERY_NAME_NOT_NULL = "MSG_CONFIG_140"; +public static final String DELIVERY_NAME_NOT_NULL = "配送中心名称不能为空"; /** * 补贴比例不能为空 -- 补贴比例不能为空 */ - public static final String SUBSIDY_PROPORTION_NOT_NULL = "MSG_CONFIG_141"; +public static final String SUBSIDY_PROPORTION_NOT_NULL = "补贴比例不能为空"; /** * 统计值不能为空 -- 统计值不能为空 */ - public static final String CENSUS_VALUE_NOT_NULL = "MSG_CONFIG_143"; +public static final String CENSUS_VALUE_NOT_NULL = "统计值不能为空"; /** * 配送中心等级不能为空 -- 配送中心等级不能为空 */ - public static final String DELIVERY_GRADE_NOT_NULL = "MSG_CONFIG_144"; +public static final String DELIVERY_GRADE_NOT_NULL = "配送中心等级不能为空"; /** * 等级属性不能为空 -- 等级属性不能为空 */ - public static final String GRADE_VALUE_NOT_NULL = "MSG_CONFIG_145"; +public static final String GRADE_VALUE_NOT_NULL = "等级属性不能为空"; /** * 收益类型不能为空 -- 收益类型不能为空 */ - public static final String CLOUD_TYPE_NOT_NULL = "MSG_CONFIG_146"; +public static final String CLOUD_TYPE_NOT_NULL = "收益类型不能为空"; /** * 收益比例不能为空 -- 收益比例不能为空 */ - public static final String CLOUD_RATIO_NOT_NULL = "MSG_CONFIG_147"; +public static final String CLOUD_RATIO_NOT_NULL = "收益比例不能为空"; /** * 结算业绩不能为空 -- 结算业绩不能为空 */ - public static final String SHOP_SETTLE_VALUE_NOT_NULL = "MSG_CONFIG_150"; +public static final String SHOP_SETTLE_VALUE_NOT_NULL = "结算业绩不能为空"; /** * 联系人不能为空 -- 联系人不能为空 */ - public static final String CONTACTS_NOT_NULL = "MSG_CONFIG_151"; +public static final String CONTACTS_NOT_NULL = "联系人不能为空"; /** * 配送费不能为空 -- 配送费不能为空 */ - public static final String DELIVERY_FEE_NOT_NULL = "MSG_CONFIG_152"; +public static final String DELIVERY_FEE_NOT_NULL = "配送费不能为空"; /** * 联系方式不能为空 -- 联系方式不能为空 */ - public static final String MOBILEPHONE_NOT_NULL = "MSG_CONFIG_153"; +public static final String MOBILEPHONE_NOT_NULL = "联系方式不能为空"; /** * 配送中心等级名称重复 -- 配送中心等级名称重复 */ - public static final String SHOP_NAME_REPEAT = "MSG_CONFIG_161"; +public static final String SHOP_NAME_REPEAT = "配送中心等级名称重复"; /** * 配送中心名称重复 -- 配送中心名称重复 */ - public static final String DELIVERY_NAME_REPEAT = "MSG_CONFIG_162"; +public static final String DELIVERY_NAME_REPEAT = "配送中心名称重复"; /** * 团队名称不能为空 -- 团队名称不能为空 */ - public static final String TEAM_NAME_NOT_NULL = "MSG_CONFIG_163"; +public static final String TEAM_NAME_NOT_NULL = "团队名称不能为空"; /** * 团队编号不能为空 -- 团队编号不能为空 */ - public static final String TEAM_CODE_NOT_NULL = "MSG_CONFIG_164"; +public static final String TEAM_CODE_NOT_NULL = "团队编号不能为空"; /** * 体系不能为空 -- 体系不能为空 */ - public static final String PK_BD_VERTEX_NOT_NULL = "MSG_CONFIG_165"; +public static final String PK_BD_VERTEX_NOT_NULL = "体系不能为空"; /** * 会员已经加入团队 -- 会员已经加入团队 */ - public static final String MEMBER_CODE_REPEAT = "MSG_CONFIG_166"; +public static final String MEMBER_CODE_REPEAT = "会员已经加入团队"; /** * 结算期间不能为空 -- 结算期间不能为空 */ - public static final String PERIOD_NOT_NULL = "MSG_CONFIG_167"; +public static final String PERIOD_NOT_NULL = "结算期间不能为空"; /** * 直推收益不能为空 -- 推收益不能为空 */ - public static final String IS_REFERENCE_NOT_NULL = "MSG_CONFIG_168"; +public static final String IS_REFERENCE_NOT_NULL = "直推收益不能为空"; /** * 拓展收益不能为空 -- 拓展收益不能为空 */ - public static final String IS_EXPAND_NOT_NULL = "MSG_CONFIG_169"; +public static final String IS_EXPAND_NOT_NULL = "拓展收益不能为空"; /** * 辅导收益不能为空 -- 辅导收益不能为空 */ - public static final String IS_COACH_NOT_NULL = "MSG_CONFIG_170"; +public static final String IS_COACH_NOT_NULL = "辅导收益不能为空"; /** * 分红收益不能为空 -- 分红收益不能为空 */ - public static final String IS_SHARE_NOT_NULL = "MSG_CONFIG_171"; +public static final String IS_SHARE_NOT_NULL = "分红收益不能为空"; /** * 服务补贴不能为空 -- 服务补贴不能为空 */ - public static final String IS_SERVICE_NOT_NULL = "MSG_CONFIG_172"; +public static final String IS_SERVICE_NOT_NULL = "服务补贴不能为空"; /** * 复购极差收益不能为空 -- 复购极差收益不能为空 */ - public static final String IS_PURCHASE_RANGE_NOT_NULL = "MSG_CONFIG_173"; +public static final String IS_PURCHASE_RANGE_NOT_NULL = "复购极差收益不能为空"; /** * 消费拓展收益不能为空 -- 消费拓展收益不能为空 */ - public static final String IS_CONSUME_EXPAND_NOT_NULL = "MSG_CONFIG_174"; +public static final String IS_CONSUME_EXPAND_NOT_NULL = "消费拓展收益不能为空"; /** * 商城重销不能为空 -- 商城重销不能为空 */ - public static final String IS_MALL_RESALE_NOT_NULL = "MSG_CONFIG_175"; +public static final String IS_MALL_RESALE_NOT_NULL = "商城重销不能为空"; /** * 平台服务费不能为空 -- 平台服务费不能为空 */ - public static final String IS_PLATFORM_FEE_NOT_NULL = "MSG_CONFIG_176"; +public static final String IS_PLATFORM_FEE_NOT_NULL = "平台服务费不能为空"; /** * 复购券不能为空 -- 复购券不能为空 */ - public static final String IS_COUPONS_NOT_NULL = "MSG_CONFIG_177"; +public static final String IS_COUPONS_NOT_NULL = "复购券不能为空"; /** * 云代直推收益不能为空 -- 云代直推收益不能为空 */ - public static final String IS_CLOUD_REFERENCE_NOT_NULL = "MSG_CONFIG_179"; +public static final String IS_CLOUD_REFERENCE_NOT_NULL = "云代直推收益不能为空"; /** * 云代首购收益不能为空 -- 云代首购收益不能为空 */ - public static final String IS_CLOUD_FIRST_NOT_NULL = "MSG_CONFIG_180"; +public static final String IS_CLOUD_FIRST_NOT_NULL = "云代首购收益不能为空"; /** * 云代复购收益不能为空 -- 云代复购收益不能为空 */ - public static final String IS_CLOUD_REPEAT_NOT_NULL = "MSG_CONFIG_181"; +public static final String IS_CLOUD_REPEAT_NOT_NULL = "云代复购收益不能为空"; /** * 全球分红不能为空 -- 全球分红不能为空 */ - public static final String IS_GLOBAL_DIVIDEND_NOT_NULL = "MSG_CONFIG_182"; +public static final String IS_GLOBAL_DIVIDEND_NOT_NULL = "全球分红不能为空"; /** * 环球积分不能为空 -- 环球积分不能为空 */ - public static final String IS_GLOBAL_INTEGRAL_NOT_NULL = "MSG_CONFIG_183"; +public static final String IS_GLOBAL_INTEGRAL_NOT_NULL = "环球积分不能为空"; /** * 车奖积分不能为空 -- 车奖积分不能为空 */ - public static final String IS_CAR_AWARD_POINTS_NOT_NULL = "MSG_CONFIG_184"; +public static final String IS_CAR_AWARD_POINTS_NOT_NULL = "车奖积分不能为空"; /** * 月份不能为空 -- 月份不能为空 */ - public static final String MONTH_NOT_NULL = "MSG_CONFIG_185"; +public static final String MONTH_NOT_NULL = "月份不能为空"; /** * 期末总额不能为空 -- 期末总额不能为空 */ - public static final String TOTAL_AMOUNT_NOT_NULL = "MSG_CONFIG_186"; +public static final String TOTAL_AMOUNT_NOT_NULL = "期末总额不能为空"; /** * 本月新增不能为空 -- 本月新增不能为空 */ - public static final String ADD_AMOUNT_NOT_NULL = "MSG_CONFIG_187"; +public static final String ADD_AMOUNT_NOT_NULL = "本月新增不能为空"; /** * 本月发放不能为空 -- 本月发放不能为空 */ - public static final String USED_AMOUNT_NOT_NULL = "MSG_CONFIG_188"; +public static final String USED_AMOUNT_NOT_NULL = "本月发放不能为空"; /** * 本月结余不能为空 -- 本月结余不能为空 */ - public static final String BALANCE_AMOUNT_NOT_NULL = "MSG_CONFIG_189"; +public static final String BALANCE_AMOUNT_NOT_NULL = "本月结余不能为空"; /** * 当月标杆不能为空 -- 当月标杆不能为空 */ - public static final String BASE_AMOUNT_NOT_NULL = "MSG_CONFIG_190"; +public static final String BASE_AMOUNT_NOT_NULL = "当月标杆不能为空"; /** * 是否发放不能为空 -- 是否发放不能为空 */ - public static final String IS_GRANT_NOT_NULL = "MSG_CONFIG_191"; +public static final String IS_GRANT_NOT_NULL = "是否发放不能为空"; /** * 分红配置重复 -- 分红配置重复 */ - public static final String SHARE_REPEAT = "MSG_CONFIG_192"; +public static final String SHARE_REPEAT = "分红配置重复"; /** * 主键不能为空 -- 主键不能为空 */ - public static final String PKID_NOT_NULL = "MSG_CONFIG_193"; +public static final String PKID_NOT_NULL = "主键不能为空"; /** * 分红配置不能为空 -- 分红配置不能为空 */ - public static final String PK_SHARE_NOT_NULL = "MSG_CONFIG_194"; +public static final String PK_SHARE_NOT_NULL = "分红配置不能为空"; /** * 晋升人数不能为空 -- 晋升人数不能为空 */ - public static final String TOTAL_NUMBER_NOT_NULL = "MSG_CONFIG_195"; +public static final String TOTAL_NUMBER_NOT_NULL = "晋升人数不能为空"; /** * 达标人数不能为空 -- 达标人数不能为空 */ - public static final String REACH_NUMBER_NOT_NULL = "MSG_CONFIG_196"; +public static final String REACH_NUMBER_NOT_NULL = "达标人数不能为空"; /** * 预发金额不能为空 -- 预发金额不能为空 */ - public static final String ADVANCE_MONEY_NOT_NULL = "MSG_CONFIG_197"; +public static final String ADVANCE_MONEY_NOT_NULL = "预发金额不能为空"; /** * 实发金额不能为空 -- 实发金额不能为空 */ - public static final String PAY_MONEY_NOT_NULL = "MSG_CONFIG_198"; +public static final String PAY_MONEY_NOT_NULL = "实发金额不能为空"; /** * 图片不能为空 -- 图片不能为空 */ - public static final String HO_PICTURE_NOT_NULL = "MSG_CONFIG_199"; +public static final String HO_PICTURE_NOT_NULL = "图片不能为空"; /** * 发布位置不能为空 -- 发布位置不能为空 */ - public static final String HO_POSITION_NOT_NULL = "MSG_CONFIG_200"; +public static final String HO_POSITION_NOT_NULL = "发布位置不能为空"; /** * 地区不能为空 -- 地区不能为空 */ - public static final String HO_REGION_NOT_NULL = "MSG_CONFIG_201"; +public static final String HO_REGION_NOT_NULL = "地区不能为空"; /** * 国家不能为空 -- 国家不能为空 */ - public static final String HO_PKCOUNTRY_NOT_NULL = "MSG_CONFIG_203"; +public static final String HO_PKCOUNTRY_NOT_NULL = "国家不能为空"; /** * 省不能为空 -- 省不能为空 */ - public static final String GLO_PROVINCE_NOT_NULL = "MSG_CONFIG_204"; +public static final String GLO_PROVINCE_NOT_NULL = "省不能为空"; /** * 市不能为空 -- 市不能为空 */ - public static final String GLO_CITY_NOT_NULL = "MSG_CONFIG_205"; +public static final String GLO_CITY_NOT_NULL = "市不能为空"; /** * 分公司不能为空 -- 分公司不能为空 */ - public static final String HO_COMPANY_NOT_NULL = "MSG_CONFIG_206"; +public static final String HO_COMPANY_NOT_NULL = "分公司不能为空"; /** * 联系人不能为空 -- 联系人不能为空 */ - public static final String HO_CONTACTS_NOT_NULL = "MSG_CONFIG_207"; +public static final String HO_CONTACTS_NOT_NULL = "联系人不能为空"; /** * 联系方式不能为空 -- 联系方式不能为空 */ - public static final String HO_PHONE_NOT_NULL = "MSG_CONFIG_208"; +public static final String HO_PHONE_NOT_NULL = "联系方式不能为空"; /** * 详细地址不能为空 -- 详细地址不能为空 */ - public static final String HO_ADDRESS_NOT_NULL = "MSG_CONFIG_209"; +public static final String HO_ADDRESS_NOT_NULL = "详细地址不能为空"; /** * 链接不能为空 -- 详细地址不能为空 */ - public static final String HO_LINK_ADDRESS_NOT_NULL = "MSG_CONFIG_211"; +public static final String HO_LINK_ADDRESS_NOT_NULL = "链接不能为空"; /** * 排序不能为空 -- 排序不能为空 */ - public static final String HO_SORT_NOT_NULL = "MSG_CONFIG_212"; +public static final String HO_SORT_NOT_NULL = "排序不能为空"; /** * 排序重复 -- 排序重复 */ - public static final String HO_SORT_NOT_REPEAT = "MSG_CONFIG_213"; +public static final String HO_SORT_NOT_REPEAT = "排序重复"; /** * 数据不存在 -- 数据不存在 */ - public static final String HO_OBJECT_NOT_REPEAT = "MSG_CONFIG_214"; +public static final String HO_OBJECT_NOT_REPEAT = "数据不存在"; /** * 标题名称不能为空 -- 标题名称不能为空 */ - public static final String TITLE_NAME_NOT_NULL = "MSG_CONFIG_215"; +public static final String TITLE_NAME_NOT_NULL = "标题名称不能为空"; /** * 副标题名称不能为空 -- 副标题名称不能为空 */ - public static final String TWO_TITLE_NAME_NOT_NULL = "MSG_CONFIG_216"; +public static final String TWO_TITLE_NAME_NOT_NULL = "副标题名称不能为空"; /** * 主键不能为空 -- 主键不能为空 */ - public static final String PK_ID_NOT_NULL = "MSG_CONFIG_217"; +public static final String PK_ID_NOT_NULL = "主键不能为空"; /** * 时间不能为空 -- 时间不能为空 */ - public static final String TITLE_SETUP_TIME_NOT_NULL = "MSG_CONFIG_218"; +public static final String TITLE_SETUP_TIME_NOT_NULL = "时间不能为空"; /** * 上传视频不能为空 -- 上传视频不能为空 */ - public static final String VIDEO_ADDRESS_NOT_NULL = "MSG_CONFIG_219"; +public static final String VIDEO_ADDRESS_NOT_NULL = "上传视频不能为空"; /** * 封面图片不能为空 -- 封面图片不能为空 */ - public static final String COVER_ADDRESS_NOT_NULL = "MSG_CONFIG_220"; +public static final String COVER_ADDRESS_NOT_NULL = "封面图片不能为空"; /** * 商品分类不能为空 -- 商品分类不能为空 */ - public static final String PK_HO_PRODUCT_RANGE_NOT_NULL = "MSG_CONFIG_224"; +public static final String PK_HO_PRODUCT_RANGE_NOT_NULL = "商品分类不能为空"; /** * 产品不能为空 -- 产品不能为空 */ - public static final String PK_PRODUCT_NOT_NULL = "MSG_CONFIG_226"; +public static final String PK_PRODUCT_NOT_NULL = "产品不能为空"; /** * 可提数量需大于0 -- 可提数量需大于0 */ @@ -791,362 +791,362 @@ public class ConfigMsgConstants { /** * 条形码前缀不能为空 -- 条形码前缀不能为空 */ - public static final String PREFIX_NOT_NULL = "MSG_CONFIG_228"; +public static final String PREFIX_NOT_NULL = "条形码前缀不能为空"; /** * 条形码前缀位数不能超过两位 -- 条形码前缀位数不能超过两位 */ - public static final String PREFIX_DIGIT_ERROR = "MSG_CONFIG_229"; +public static final String PREFIX_DIGIT_ERROR = "条形码前缀位数不能超过两位"; /** * 条形码是否年列不能为空 -- 条形码是否年列不能为空 */ - public static final String IS_YEAR_NOT_NULL = "MSG_CONFIG_230"; +public static final String IS_YEAR_NOT_NULL = "条形码是否年列不能为空"; /** * 条形码是否月不能为空 -- 条形码是否月不能为空 */ - public static final String IS_MONTH_NOT_NULL = "MSG_CONFIG_231"; +public static final String IS_MONTH_NOT_NULL = "条形码是否月不能为空"; /** * 条形码尾号位数不能为空 -- 条形码尾号位数不能为空 */ - public static final String TAIL_NUMBER_NOT_NULL = "MSG_CONFIG_232"; +public static final String TAIL_NUMBER_NOT_NULL = "条形码尾号位数不能为空"; /** * 条形码尾号位数长度不能大于9位 -- 条形码尾号位数长度不能大于9位 */ - public static final String TAIL_NUMBER_DIGIT_ERROR = "MSG_CONFIG_233"; +public static final String TAIL_NUMBER_DIGIT_ERROR = "条形码尾号位数长度不能大于9位"; /** * 条形码是否初始化不能为空 -- 条形码是否初始化不能为空 */ - public static final String IS_INITIALIZE_NOT_NULL = "MSG_CONFIG_234"; +public static final String IS_INITIALIZE_NOT_NULL = "条形码是否初始化不能为空"; /** * 条形码尾号不能为空 -- 条形码尾号不能为空 */ - public static final String END_NUMBER_NOT_NULL = "MSG_CONFIG_235"; +public static final String END_NUMBER_NOT_NULL = "条形码尾号不能为空"; /** * 条形码当前尾号不能为空 -- 商品所属系列不能为空 */ - public static final String CURRENT_NUMBER_NOT_NULL = "MSG_CONFIG_239"; +public static final String CURRENT_NUMBER_NOT_NULL = "商品所属系列不能为空"; /** * 是否启用不能为空 -- 是否启用不能为空 */ - public static final String ENABLE_STATE_NOT_NULL = "MSG_CONFIG_246"; +public static final String ENABLE_STATE_NOT_NULL = "是否启用不能为空"; /** * 启用数据不能删除 -- 启用数据不能删除 */ - public static final String ENABLE_STATE_NOT_DELETE = "MSG_CONFIG_247"; +public static final String ENABLE_STATE_NOT_DELETE = "启用数据不能删除"; /** * 条形码配置无效 -- 条形码配置无效 */ - public static final String PK_BAR_CODE_NOT_NULL = "MSG_CONFIG_248"; +public static final String PK_BAR_CODE_NOT_NULL = "条形码配置无效"; /** * 生成条形码数量不能为空 -- 生成条形码数量不能为空 */ - public static final String GENERATE_COUNT_NOT_NULL = "MSG_CONFIG_249"; +public static final String GENERATE_COUNT_NOT_NULL = "生成条形码数量不能为空"; /** * 会员礼包收货地址主键不能为空 -- 会员礼包收货地址主键不能为空 */ - public static final String CU_MEMBER_GIFT_PKID_NOT_NULL = "MSG_CONFIG_250"; +public static final String CU_MEMBER_GIFT_PKID_NOT_NULL = "会员礼包收货地址主键不能为空"; /** * 收货地址不能为空 -- 收货地址不能为空 */ - public static final String GIFT_ADDRESS_NOT_NULL = "MSG_CONFIG_251"; +public static final String GIFT_ADDRESS_NOT_NULL = "收货地址不能为空"; /** * 收货人姓名不能为空 -- 收货人姓名不能为空 */ - public static final String GIFT_NAME_NOT_NULL = "MSG_CONFIG_252"; +public static final String GIFT_NAME_NOT_NULL = "收货人姓名不能为空"; /** * 收货人手机不能为空 -- 收货人手机不能为空 */ - public static final String GIFT_PHONE_NOT_NULL = "MSG_CONFIG_253"; +public static final String GIFT_PHONE_NOT_NULL = "收货人手机不能为空"; /** * 收货地址省不能为空 -- 收货地址省不能为空 */ - public static final String GIFT_PROVINCE_NOT_NULL = "MSG_CONFIG_254"; +public static final String GIFT_PROVINCE_NOT_NULL = "收货地址省不能为空"; /** * 收货地址市不能为空 -- 收货地址市不能为空 */ - public static final String GIFT_CITY_NOT_NULL = "MSG_CONFIG_255"; +public static final String GIFT_CITY_NOT_NULL = "收货地址市不能为空"; /** * 收货地址县不能为空 -- 收货地址县不能为空 */ - public static final String GIFT_COUNTY_NOT_NULL = "MSG_CONFIG_256"; +public static final String GIFT_COUNTY_NOT_NULL = "收货地址县不能为空"; /** * 等级不能为空 -- 等级不能为空 */ - public static final String PK_SCOPE_NOT_NULL = "MSG_CONFIG_257"; +public static final String PK_SCOPE_NOT_NULL = "等级不能为空"; /** * 注册金额不能为空 -- 注册金额不能为空 */ - public static final String REGISTER_VALUE_NOT_NULL = "MSG_CONFIG_258"; +public static final String REGISTER_VALUE_NOT_NULL = "注册金额不能为空"; /** * 奖项名称不能为空 -- 奖项名称不能为空 */ - public static final String BONUS_NAME_NOT_NULL = "MSG_CONFIG_262"; +public static final String BONUS_NAME_NOT_NULL = "奖项名称不能为空"; /** * 结算周期不能为空 -- 结算周期不能为空 */ - public static final String SETTLE_TYPE_NOT_NULL = "MSG_CONFIG_263"; +public static final String SETTLE_TYPE_NOT_NULL = "结算周期不能为空"; /** * 公布时间不能为空 -- 公布时间不能为空 */ - public static final String PUBLISH_TIME_NOT_NULL = "MSG_CONFIG_264"; +public static final String PUBLISH_TIME_NOT_NULL = "公布时间不能为空"; /** * 公布日期不能为空 -- 公布日期不能为空 */ - public static final String PUBLISH_DATE_NOT_NULL = "MSG_CONFIG_265"; +public static final String PUBLISH_DATE_NOT_NULL = "公布日期不能为空"; /** * 发布日期不能为空 -- 发布日期不能为空 */ - public static final String GRANT_DATE_NOT_NULL = "MSG_CONFIG_266"; +public static final String GRANT_DATE_NOT_NULL = "发布日期不能为空"; /** * 可提现日期不能为空 -- 可提现日期不能为空 */ - public static final String WITHDRAWAL_DATE_NOT_NULL = "MSG_CONFIG_267"; +public static final String WITHDRAWAL_DATE_NOT_NULL = "可提现日期不能为空"; /** * 变更后会员编号不能为空 -- 变更后会员编号不能为空 */ - public static final String MEMBER_CODE_NEW_NOT_NULL = "MSG_CONFIG_268"; +public static final String MEMBER_CODE_NEW_NOT_NULL = "变更后会员编号不能为空"; /** * 变更后结算国不能为空 -- 变更后结算国不能为空 */ - public static final String SETTLE_COUNTRY_NEW_NOT_NULL = "MSG_CONFIG_269"; +public static final String SETTLE_COUNTRY_NEW_NOT_NULL = "变更后结算国不能为空"; /** * 结算国不能为空 -- 结算国不能为空 */ - public static final String SETTLE_COUNTRY_OLD_NOT_NULL = "MSG_CONFIG_270"; +public static final String SETTLE_COUNTRY_OLD_NOT_NULL = "结算国不能为空"; /** * 存在7天内奖金结算未完成 -- 存在7天内奖金结算未完成 */ - public static final String BONUS_SETTLE_NOT_COMPLETED = "MSG_CONFIG_271"; +public static final String BONUS_SETTLE_NOT_COMPLETED = "存在7天内奖金结算未完成"; /** * 会员手机不能为空 -- 会员手机不能为空 */ - public static final String MEMBER_PHONE_NOT_NULL = "MSG_CONFIG_272"; +public static final String MEMBER_PHONE_NOT_NULL = "会员手机不能为空"; /** * 签呈流程类型不能为空 -- 签呈流程类型不能为空 */ - public static final String PROCESS_TYPE_NOT_NULL = "MSG_CONFIG_273"; +public static final String PROCESS_TYPE_NOT_NULL = "签呈流程类型不能为空"; /** * 业务类型不能为空 -- 业务类型不能为空 */ - public static final String WORK_TYPE_NOT_NULL = "MSG_CONFIG_274"; +public static final String WORK_TYPE_NOT_NULL = "业务类型不能为空"; /** * 业务单号不能为空 -- 业务单号不能为空 */ - public static final String WORK_NO_NOT_NULL = "MSG_CONFIG_275"; +public static final String WORK_NO_NOT_NULL = "业务单号不能为空"; /** * 会员余额不足 -- 会员余额不足 */ - public static final String MEMBER_BALANCE_INSUFFICIENT = "MSG_CONFIG_277"; +public static final String MEMBER_BALANCE_INSUFFICIENT = "会员余额不足"; /** * 数据不能为空 -- 数据不能为空 */ - public static final String MEMBER_DATA_NOT_NULL = "MSG_CONFIG_278"; +public static final String MEMBER_DATA_NOT_NULL = "数据不能为空"; /** * 会员存在未审核数据 -- 会员存在未审核数据 */ - public static final String MEMBER_UPDATE_CODE_REPEAT = "MSG_CONFIG_279"; +public static final String MEMBER_UPDATE_CODE_REPEAT = "会员存在未审核数据"; /** * 订单超过24小时无法申请 -- 订单超过24小时无法申请 */ - public static final String ORDER_TIMEOUT = "MSG_CONFIG_280"; +public static final String ORDER_TIMEOUT = "订单超过24小时无法申请"; /** * 会员账户余额不为零 -- 会员账户余额不为零 */ - public static final String MEMBER_ACCOUNT_NOT_ZERO = "MSG_CONFIG_281"; +public static final String MEMBER_ACCOUNT_NOT_ZERO = "会员账户余额不为零"; /** * 会员有充值未审核 -- 会员有充值未审核 */ - public static final String MEMBER_CECHARGE_REPEAT = "MSG_CONFIG_282"; +public static final String MEMBER_CECHARGE_REPEAT = "会员有充值未审核"; /** * 会员有提现未审核 -- 会员有提现未审核 */ - public static final String MEMBER_WITHDRAW_REPEAT = "MSG_CONFIG_283"; +public static final String MEMBER_WITHDRAW_REPEAT = "会员有提现未审核"; /** * 会员有绑定的银行卡 -- 会员有绑定的银行卡 */ - public static final String MEMBER_BINDING_BANK = "MSG_CONFIG_284"; +public static final String MEMBER_BINDING_BANK = "会员有绑定的银行卡"; /** * 会员有未审核注水业绩 -- 会员有未审核注水业绩 */ - public static final String MEMBER_ACHIEVE_REPEAT = "MSG_CONFIG_285"; +public static final String MEMBER_ACHIEVE_REPEAT = "会员有未审核注水业绩"; /** * 只能注水7天以内业绩 -- 只能注水7天以内业绩 */ - public static final String ACHIEVE_WITHIN_SEVEN_DAYS = "MSG_CONFIG_286"; +public static final String ACHIEVE_WITHIN_SEVEN_DAYS = "只能注水7天以内业绩"; /** * 修改会员编号扣款失败 -- 修改会员编号扣款失败 */ - public static final String MEMBER_UPDATE_CODE_MONEY = "MSG_CONFIG_287"; +public static final String MEMBER_UPDATE_CODE_MONEY = "修改会员编号扣款失败"; /** * 变更后国家等级未配置 -- 变更后国家等级未配置 */ - public static final String UPDATE_COUNTRY_AFTER_GRADE_IS_NULL = "MSG_CONFIG_288"; +public static final String UPDATE_COUNTRY_AFTER_GRADE_IS_NULL = "变更后国家等级未配置"; /** * 变更后国家奖衔未配置 -- 变更后国家奖衔未配置 */ - public static final String UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL = "MSG_CONFIG_289"; +public static final String UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL = "变更后国家奖衔未配置"; /** * 修改安置编号扣款失败 -- 修改会员编号扣款失败 */ - public static final String MEMBER_UPDATE_PLACE_MONEY = "MSG_CONFIG_290"; +public static final String MEMBER_UPDATE_PLACE_MONEY = "修改会员编号扣款失败"; /** * 修改安置发起失败 -- 修改安置发起失败 */ - public static final String MEMBER_UPDATE_PLACE_PARENT = "MSG_CONFIG_291"; +public static final String MEMBER_UPDATE_PLACE_PARENT = "修改安置发起失败"; /** * 修改会员编号发起签呈失败 -- 修改会员编号发起签呈失败 */ - public static final String MEMBER_UPDATE_PETITION = "MSG_CONFIG_292"; +public static final String MEMBER_UPDATE_PETITION = "修改会员编号发起签呈失败"; /** * 注水业绩发起签呈失败 -- 注水业绩发起签呈失败 */ - public static final String MEMBER_ACHIEVE_DEDUCT_PETITION = "MSG_CONFIG_293"; +public static final String MEMBER_ACHIEVE_DEDUCT_PETITION = "注水业绩发起签呈失败"; /** * 添加真实奖衔控制重复 -- 添加真实奖衔控制重复 */ - public static final String AWARDS_CONTROL_SAVE_REPEAT = "MSG_CONFIG_294"; +public static final String AWARDS_CONTROL_SAVE_REPEAT = "添加真实奖衔控制重复"; /** * 添加真实奖衔控制发起签呈失败 -- 添加真实奖衔控制发起签呈失败 */ - public static final String AWARDS_CONTROL_SAVE_PETITION = "MSG_CONFIG_295"; +public static final String AWARDS_CONTROL_SAVE_PETITION = "添加真实奖衔控制发起签呈失败"; /** * 修改真实奖衔控制发起签呈失败 -- 修改真实奖衔控制发起签呈失败 */ - public static final String AWARDS_CONTROL_MODIFY_PETITION = "MSG_CONFIG_296"; +public static final String AWARDS_CONTROL_MODIFY_PETITION = "修改真实奖衔控制发起签呈失败"; /** * 删除真实奖衔控制发起签呈失败 -- 删除真实奖衔控制发起签呈失败 */ - public static final String AWARDS_CONTROL_DELETE_PETITION = "MSG_CONFIG_297"; +public static final String AWARDS_CONTROL_DELETE_PETITION = "删除真实奖衔控制发起签呈失败"; /** * 修改结算国发起签呈失败 -- 修改结算国发起签呈失败 */ - public static final String UPDATE_SETTLE_PETITION = "MSG_CONFIG_298"; +public static final String UPDATE_SETTLE_PETITION = "修改结算国发起签呈失败"; /** * 修改政策币发起签呈失败 -- 修改政策币发起签呈失败 */ - public static final String POLICY_CURRENCY_PETITION = "MSG_CONFIG_299"; +public static final String POLICY_CURRENCY_PETITION = "修改政策币发起签呈失败"; /** * 自助服务-修改收货地址 -- 自助服务修改收货地址发起签呈失败 */ - public static final String SELF_MODIFY_ADDRESS = "MSG_CONFIG_300"; +public static final String SELF_MODIFY_ADDRESS = "自助服务修改收货地址发起签呈失败"; /** * 零元撤单扣款失败 -- 零元撤单扣款失败 */ - public static final String ZERO_ELEMENT_REVOKE_MONEY = "MSG_CONFIG_301"; +public static final String ZERO_ELEMENT_REVOKE_MONEY = "零元撤单扣款失败"; /** * 修改结算国扣款失败 -- 修改结算国扣款失败 */ - public static final String UPDATE_SETTLE_MONEY = "MSG_CONFIG_302"; +public static final String UPDATE_SETTLE_MONEY = "修改结算国扣款失败"; /** * 修改政策币扣款失败 -- 修改政策币扣款失败 */ - public static final String POLICY_CURRENCY_MONEY = "MSG_CONFIG_303"; +public static final String POLICY_CURRENCY_MONEY = "修改政策币扣款失败"; /** * 注水业绩扣款失败 -- 注水业绩扣款失败 */ - public static final String MEMBER_ACHIEVE_DEDUCT_MONEY = "MSG_CONFIG_304"; +public static final String MEMBER_ACHIEVE_DEDUCT_MONEY = "注水业绩扣款失败"; /** * 审批特殊业务流程出错 -- 审批特殊业务流程出错 */ - public static final String MEMBER_UPDATE_CODE_ERROR = "MSG_CONFIG_305"; +public static final String MEMBER_UPDATE_CODE_ERROR = "审批特殊业务流程出错"; /** * 签呈不存在 -- 签呈不存在 */ - public static final String PETITION_ABSENT_ERROR = "MSG_CONFIG_306"; +public static final String PETITION_ABSENT_ERROR = "签呈不存在"; /** * 签呈已审核 -- 签呈已审核 */ - public static final String PETITION_AUDITED_ERROR = "MSG_CONFIG_307"; +public static final String PETITION_AUDITED_ERROR = "签呈已审核"; /** * 审批流程不能为空 -- 审批流程不能为空 */ - public static final String EXAMINE_AND_APPROVE_NOT_NULL = "MSG_CONFIG_308"; +public static final String EXAMINE_AND_APPROVE_NOT_NULL = "审批流程不能为空"; /** * 错误数据 -- 错误数据 */ - public static final String MEMBER_DATA_ERROR = "MSG_CONFIG_309"; +public static final String MEMBER_DATA_ERROR = "错误数据"; /** * 数据重复 -- 数据重复 */ - public static final String DATA_REPEAT = "MSG_CONFIG_310"; +public static final String DATA_REPEAT = "数据重复"; /** * 注水日期不能为空 -- 注水日期不能为空 */ - public static final String SETTLEDATE_NOT_VALID = "MSG_CONFIG_311"; +public static final String SETTLEDATE_NOT_VALID = "注水日期不能为空"; /** * 零元撤单发起签呈失败 -- 零元撤单发起签呈失败 */ - public static final String ZERO_ELEMENT_REVOKE_PETITION = "MSG_CONFIG_312"; +public static final String ZERO_ELEMENT_REVOKE_PETITION = "零元撤单发起签呈失败"; /** * 注水日期不能大于结束日期 -- 注水日期不能大于结束日期 */ - public static final String SETTLE_DUE_DATE_COMPARE = "MSG_CONFIG_313"; +public static final String SETTLE_DUE_DATE_COMPARE = "注水日期不能大于结束日期"; /** * 注水业绩类型不能为空 -- 注水业绩类型不能为空 */ - public static final String INFUSING_WATER_TYPE_NOT_NULL = "MSG_CONFIG_314"; +public static final String INFUSING_WATER_TYPE_NOT_NULL = "注水业绩类型不能为空"; /** * 变更后注水业绩不能为空 -- 变更后注水业绩不能为空 */ - public static final String INFUSING_WATER_PV_NOT_NULL = "MSG_CONFIG_316"; +public static final String INFUSING_WATER_PV_NOT_NULL = "变更后注水业绩不能为空"; /** * 4-N配置 -- 4-N配置 */ - public static final String FOUR_N_DISPOSE = "MSG_CONFIG_322"; +public static final String FOUR_N_DISPOSE = "4-N配置"; /** * 签呈文件类型不能为空 -- 签呈文件类型不能为空 */ - public static final String SIGN_TYPE_NOT_NULL = "MSG_CONFIG_323"; +public static final String SIGN_TYPE_NOT_NULL = "签呈文件类型不能为空"; /** * 扣款币种 （页面固定文字） -- 扣款币种 */ - public static final String DEDUCTION_CURRENCY = "MSG_CONFIG_324"; +public static final String DEDUCTION_CURRENCY = "扣款币种"; /** * 变更后 （页面固定文字） -- 变更后 */ - public static final String AFTER_THE_CHANGE = "MSG_CONFIG_325"; +public static final String AFTER_THE_CHANGE = "变更后"; /** * 汇率配置至少存在一条,无法禁用 -- 汇率配置至少存在一条,无法禁用 */ - public static final String CURRENCY_UNABLE_TO_FAIL = "MSG_CONFIG_326"; +public static final String CURRENCY_UNABLE_TO_FAIL = "汇率配置至少存在一条,无法禁用"; /** * 活动不能为空 -- 活动不能为空 */ - public static final String ACTIVITY_NOT_NULL = "MSG_CONFIG_327"; +public static final String ACTIVITY_NOT_NULL = "活动不能为空"; /** * 活动已存在 -- 活动已存在 @@ -1156,55 +1156,55 @@ public class ConfigMsgConstants { /** * 左右区结余不能同时大于零 -- 左右区结余不能同时大于零 */ - public static final String BALANCE_NOT_ZERO = "MSG_CONFIG_334"; +public static final String BALANCE_NOT_ZERO = "左右区结余不能同时大于零"; /** * 政策币启用状态不能为空 -- 政策币启用状态不能为空 */ - public static final String ENABLE_STATUS_NOT_NULL = "MSG_CONFIG_337"; +public static final String ENABLE_STATUS_NOT_NULL = "政策币启用状态不能为空"; /** * 政策币扣款比例不能为空 -- 政策币扣款比例不能为空 */ - public static final String DEDUCT_MONEY_NOT_NULL = "MSG_CONFIG_338"; +public static final String DEDUCT_MONEY_NOT_NULL = "政策币扣款比例不能为空"; /** * 政策币转账不能为空 -- 政策币转账不能为空 */ - public static final String TRANSFER_NOT_NULL = "MSG_CONFIG_339"; +public static final String TRANSFER_NOT_NULL = "政策币转账不能为空"; /** * 基础业务模板 -- 基础业务模板 */ - public static final String BASIC_BUSINESS = "MSG_CONFIG_344"; +public static final String BASIC_BUSINESS = "基础业务模板"; /** * 邮费模板名称必填 -- 邮费模板名称必填 */ - public static final String POSTAGE_TEMPLATE_IS_REQUIRED = "MSG_CONFIG_345"; +public static final String POSTAGE_TEMPLATE_IS_REQUIRED = "邮费模板名称必填"; /** * 营业执照状态 -- 营业执照状态不能为空 */ - public static final String LICENSE_STATE_NOT_EMPTY = "MSG_CONFIG_347"; +public static final String LICENSE_STATE_NOT_EMPTY = "营业执照状态不能为空"; /** * 业务模块不能为空 -- 业务模块不能为空 */ - public static final String BUSINESS_MODULE = "MSG_CONFIG_348"; +public static final String BUSINESS_MODULE = "业务模块不能为空"; /** * 会员编号不能为空 -- 会员编号不能为空 */ - public static final String MEMBER_CODE_NOT_EMPTY = "MSG_CONFIG_349"; +public static final String MEMBER_CODE_NOT_EMPTY = "会员编号不能为空"; /** * 会员不存在 -- 会员不存在 */ - public static final String MEMBER_NOT_EXIST = "MSG_CONFIG_350"; +public static final String MEMBER_NOT_EXIST = "会员不存在"; /** * 提现权限或转账权限不能为空 -- 提现权限或转账权限不能为空 */ - public static final String WITHDRAWAL_NOT_EMPTY = "MSG_CONFIG_351"; +public static final String WITHDRAWAL_NOT_EMPTY = "提现权限或转账权限不能为空"; /** * 修改安置安置位置已被占用 -- 修改安置安置位置已被占用 */ @@ -1212,37 +1212,37 @@ public class ConfigMsgConstants { /** * 请填写驳回信息 -- 请填写驳回信息 */ - public static final String REJECT_MSG_NOT_NULL = "MSG_CONFIG_353"; +public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; /** * 统计体系不能为空 -- 联创统计 */ - public static final String LIANCHUANG_STAT_CODE = "MSG_CONFIG_355"; +public static final String LIANCHUANG_STAT_CODE = "统计体系编号不能为空"; /** * 统计名称不能为空 -- 联创统计 */ - public static final String LIANCHUANG_STAT_NAME = "MSG_CONFIG_356"; +public static final String LIANCHUANG_STAT_NAME = "统计名称不能为空"; /** * 统计加区不能为空 -- 联创统计 */ - public static final String LIANCHUANG_STAT_ADD_REGION = "MSG_CONFIG_357"; +public static final String LIANCHUANG_STAT_ADD_REGION = "统计加区不能为空"; /** * 修改免考状态无效 -- 办理业务 */ - public static final String FREE_ASSESSMENT_STATE_INVALID = "MSG_CONFIG_358"; +public static final String FREE_ASSESSMENT_STATE_INVALID = "修改免考状态无效"; /** * 办理业务手续费退款失败 -- 真实奖衔控制驳回签呈退费失败 */ - public static final String AWARDS_CONTROL_IS_REFUND = "MSG_CONFIG_359"; +public static final String AWARDS_CONTROL_IS_REFUND = "真实奖衔控制驳回签呈退费失败"; /** * 注水业绩扣款失败 -- 注水业绩驳回签呈退款失败 */ - public static final String MEMBER_ACHIEVE_IS_REFUND = "MSG_CONFIG_360"; +public static final String MEMBER_ACHIEVE_IS_REFUND = "注水业绩驳回签呈退款失败"; /** * 请选择政策币业务 -- 请选择政策币业务 */ - public static final String POLICY_CURRENCY_NOT_NULL = "MSG_CONFIG_364"; +public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务"; /** * 领用用途重复 -- 领用用途重复 */ @@ -1254,16 +1254,16 @@ public class ConfigMsgConstants { /** * 会员控制配置重复 -- 会员控制配置重复 */ - public static final String MEMBER_AUTHORITY_CONTROL = "MSG_CONFIG_370"; +public static final String MEMBER_AUTHORITY_CONTROL = "会员控制配置重复"; /** * 会员实名认证重复 -- 会员实名认证重复 */ - public static final String REAL_NAME_AUTHENTICATION_REPEAT = "MSG_CONFIG_372"; +public static final String REAL_NAME_AUTHENTICATION_REPEAT = "会员实名认证重复"; /** * 小区考核不能为空 -- 小区考核止不能为空 */ - public static final String COMMUNITY_CHECK_END_NOT_NULL = "MSG_CONFIG_373"; +public static final String COMMUNITY_CHECK_END_NOT_NULL = "小区考核止不能为空"; /** * 会员已存在 -- 会员已存在 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java index 0a300a20..95f743ea 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java @@ -12,79 +12,79 @@ public class DocumentMsgConstants { /** * 查询是否存在签呈 -- 签呈处理失败：订单修改记录不存在! */ - public static final String DOCUMENT_NOT_EXISTS = "MSG_DOCUMENT_001"; +public static final String DOCUMENT_NOT_EXISTS = "签呈处理失败：订单修改记录不存在!"; /** * 查询签呈状态，是否是待审批 -- 签呈处理失败：订单已处理! */ - public static final String DOCUMENT_HAS_HANDLE = "MSG_DOCUMENT_002"; +public static final String DOCUMENT_HAS_HANDLE = "签呈处理失败：订单已处理!"; /** * 查询签呈需要处理的订单是否存在 -- 签呈处理失败：订单不存在! */ - public static final String DOCUMENT_ORDER_NOT_EXISTS = "MSG_DOCUMENT_003"; +public static final String DOCUMENT_ORDER_NOT_EXISTS = "签呈处理失败：订单不存在!"; /** * 签呈通过扣减手续费失败 -- 签呈处理失败：业务扣款处理失败! */ - public static final String DOCUMENT_ORDER_CHARGE_ERROR = "MSG_DOCUMENT_004"; +public static final String DOCUMENT_ORDER_CHARGE_ERROR = "签呈处理失败：业务扣款处理失败!"; /** * 签呈更新业务数据失败 -- 签呈处理失败：更新数据失败 */ - public static final String DOCUMENT_ORDER_ERROR = "MSG_DOCUMENT_005"; +public static final String DOCUMENT_ORDER_ERROR = "签呈处理失败：更新数据失败"; /** * 签呈处理业务数据失败 -- 签呈处理失败：订单已结算 */ - public static final String DOCUMENT_ORDER_SETTLED = "MSG_DOCUMENT_006"; +public static final String DOCUMENT_ORDER_SETTLED = "签呈处理失败：订单已结算"; /** * 删除签呈时校验是否已经使用 -- 业务类型存在审批中数据，不能进行删除 */ - public static final String DOCUMENT_FLOW_NOT_DELETE = "MSG_DOCUMENT_008"; +public static final String DOCUMENT_FLOW_NOT_DELETE = "业务类型存在审批中数据，不能进行删除"; /** * 业务类型操作未配置签呈 -- %s 未配置签呈 */ - public static final String SIGN_NOT_CONFIG = "MSG_DOCUMENT_009"; +public static final String SIGN_NOT_CONFIG = "%s 未配置签呈"; /** * 查询业务签呈是否存在时，传入的业务类型错误 -- 签呈业务类型错误 */ - public static final String SIGN_TYPE_ERROR = "MSG_DOCUMENT_010"; +public static final String SIGN_TYPE_ERROR = "签呈业务类型错误"; /** * 签呈已经不存在 -- 签呈审批已完成 */ - public static final String SIGN_NOT_EXIST = "MSG_DOCUMENT_011"; +public static final String SIGN_NOT_EXIST = "签呈信息不存在"; /** * 签呈审批时，已经被驳回了 -- 签呈审批已完成 */ - public static final String SIGN_APPROVAL_REJECT = "MSG_DOCUMENT_012"; +public static final String SIGN_APPROVAL_REJECT = "签呈审批已经驳回"; /** * 签呈审批时，已经通过了 -- 签呈审批已完成 */ - public static final String SIGN_APPROVAL_AGREE = "MSG_DOCUMENT_013"; +public static final String SIGN_APPROVAL_AGREE = "签呈审批已完成"; /** * 提交签呈时，审批流程为空 -- 审批流程不能为空 */ - public static final String APPROVAL_FLOW_EMPTY = "MSG_DOCUMENT_014"; +public static final String APPROVAL_FLOW_EMPTY = "审批流程不能为空"; /** * 提交签呈时，审批人重复出现 -- 审批流程不能重复 */ - public static final String APPROVAL_FLOW_REPEAT_USER = "MSG_DOCUMENT_015"; +public static final String APPROVAL_FLOW_REPEAT_USER = "审批流程不能重复"; /** * 提交签呈时，签呈已经提交了 -- 正在审批中,不能重复提交 */ - public static final String APPROVAL_FLOW_PROGRESS = "MSG_DOCUMENT_017"; +public static final String APPROVAL_FLOW_PROGRESS = "正在审批中,不能重复提交"; /** * 签呈审批时，签呈状态不正确 -- 签呈当前状态不能审批 */ - public static final String APPROVAL_STATUS_ERROR = "MSG_DOCUMENT_018"; +public static final String APPROVAL_STATUS_ERROR = "签呈当前状态不能审批"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java index c7933f1d..0b62c486 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java @@ -11,138 +11,138 @@ public class FinanceMsgConstants { /** * 支付密码错误！ -- 支付密码不能为空！ */ - public static final String PAYMENT_PASSWORD_NOT_EMPTY = "MSG_FINANCE_001"; +public static final String PAYMENT_PASSWORD_NOT_EMPTY = "支付密码不能为空！"; /** * 支付密码错误！ -- 支付密码错误！ */ - public static final String PAYMENT_PASSWORD_ERROR = "MSG_FINANCE_002"; +public static final String PAYMENT_PASSWORD_ERROR = "支付密码错误！"; /** * 请输入必要的参数 -- 请输入必要的参数！ */ - public static final String PARAMETER_NOT_EMPTY = "MSG_FINANCE_003"; +public static final String PARAMETER_NOT_EMPTY = "请输入必要的参数！"; /** * 请输入会员编号或会员姓名 -- 请输入会员编号或会员姓名！ */ - public static final String RECHARGE_PARAMETER_NOT_EMPTY = "MSG_FINANCE_004"; +public static final String RECHARGE_PARAMETER_NOT_EMPTY = "请输入会员编号或会员姓名！"; /** * 会员不存在，请核对后再操作! -- 会员不存在，请核对后再操作! */ - public static final String RECHAGER_USER_NOT_EXIST = "MSG_FINANCE_005"; +public static final String RECHAGER_USER_NOT_EXIST = "会员不存在，请核对后再操作!"; /** * 充值金额不能为空 -- 充值金额不能为空！ */ - public static final String RECHAGER_AMOUNT_NOT_EMPTY = "MSG_FINANCE_006"; +public static final String RECHAGER_AMOUNT_NOT_EMPTY = "充值金额不能为空！"; /** * 充值金额必须大于零 -- 充值金额必须大于零！ */ - public static final String RECHARGE_AMOUNT_NOT_NEGATIVE = "MSG_FINANCE_007"; +public static final String RECHARGE_AMOUNT_NOT_NEGATIVE = "充值金额必须大于零！"; /** * 会员编号不能为空 -- 会员编号不能为空！ */ - public static final String MEMBER_NOT_EMPTY = "MSG_FINANCE_010"; +public static final String MEMBER_NOT_EMPTY = "会员编号不能为空！"; /** * 导入会员编号存在为空 -- 导入会员编号存在为空！ */ - public static final String IMPORT_MEMBER_NOT_EMPTY = "MSG_FINANCE_011"; +public static final String IMPORT_MEMBER_NOT_EMPTY = "导入会员编号存在为空！"; /** * 导入会员编号有误 -- 导入会员编号有误！ */ - public static final String IMPORT_MEMBER_ERROR = "MSG_FINANCE_012"; +public static final String IMPORT_MEMBER_ERROR = "导入会员编号有误！"; /** * 会员编号输入有误 -- 会员编号输入有误！ */ - public static final String MEMBER_NOT_ERROR = "MSG_FINANCE_013"; +public static final String MEMBER_NOT_ERROR = "会员编号输入有误！"; /** * 预充值失败 -- 预充值失败！ */ - public static final String RECHAGER_FAIL = "MSG_FINANCE_014"; +public static final String RECHAGER_FAIL = "预充值失败！"; /** * 不允许跨国充值！ -- 不允许跨国充值！ */ - public static final String RECHAGER_NOT_CROSS_COUNTRY = "MSG_FINANCE_015"; +public static final String RECHAGER_NOT_CROSS_COUNTRY = "不允许跨国充值！"; /** * 充值方式不能为空 -- 充值方式不能为空！ */ - public static final String RECHAGER_METHOD_NOT_EMPTY = "MSG_FINANCE_016"; +public static final String RECHAGER_METHOD_NOT_EMPTY = "充值方式不能为空！"; /** * 充值方式不能为空 -- 审批人不能为空！ */ - public static final String APPROVED_BY = "MSG_FINANCE_017"; +public static final String APPROVED_BY = "审批人不能为空！"; /** * 请选择钱包类型 -- 请选择钱包类型！ */ - public static final String SELECT_WALLET_TYPE = "MSG_FINANCE_018"; +public static final String SELECT_WALLET_TYPE = "请选择钱包类型！"; /** * 请选择钱包类型 -- 请选择签呈类型！ */ - public static final String SELECT_SIGN_TYPE = "MSG_FINANCE_019"; +public static final String SELECT_SIGN_TYPE = "请选择签呈类型！"; /** * 请选择钱包类型 -- 请选择交款方式！ */ - public static final String SELECT_PAY_METHODS = "MSG_FINANCE_020"; +public static final String SELECT_PAY_METHODS = "请选择交款方式！"; /** * 会员有提交充值信息 -- 会员已有提交的充值信息！ */ - public static final String SUBMITTED_RECHARGE_INFORMATION = "MSG_FINANCE_021"; +public static final String SUBMITTED_RECHARGE_INFORMATION = "会员已有提交的充值信息！"; /** * 会员编号不能为空 -- 会员编号不能为空 */ - public static final String USER_NUMBER_CANNOT_EMPTY = "MSG_FINANCE_022"; +public static final String USER_NUMBER_CANNOT_EMPTY = "会员编号不能为空"; /** * 请选择查看充值记录 -- 请选择查看充值记录！ */ - public static final String SELECT_VIEW_RECHARGE_RECORD = "MSG_FINANCE_023"; +public static final String SELECT_VIEW_RECHARGE_RECORD = "请选择查看充值记录！"; /** * 营业执照导出 */ - public static final String EXPORT_BUSINESS_LICENSE = "MSG_FINANCE_025"; +public static final String EXPORT_BUSINESS_LICENSE = "营业执照导出"; /** * 充值模板 -- 充值模板 */ - public static final String RECHARGE_TEMPLATE = "MSG_FINANCE_026"; +public static final String RECHARGE_TEMPLATE = "充值模板"; /** * 请选择导入数据 -- 请选择导入数据 */ - public static final String RECHAGER_IMPORT_DATA_ERROR = "MSG_FINANCE_028"; +public static final String RECHAGER_IMPORT_DATA_ERROR = "请选择导入数据"; /** * 编号导入有误，请核对！ -- 编号导入有误，请核对！ */ - public static final String RECHAGER_IMPOR_CODE_ERROR = "MSG_FINANCE_029"; +public static final String RECHAGER_IMPOR_CODE_ERROR = "编号导入有误，请核对！"; /** * 导入的编号未支付，请核对！ -- 导入的编号未支付，请核对！ */ - public static final String RECHAGER_NO_PAY = "MSG_FINANCE_030"; +public static final String RECHAGER_NO_PAY = "导入的编号未支付，请核对！"; /** * 钱包明细导出 -- 钱包明细导出 */ - public static final String WALLET_DETAILS_EXPORT = "MSG_FINANCE_031"; +public static final String WALLET_DETAILS_EXPORT = "钱包明细导出"; /** * 余额汇总详情 -- 余额汇总详情 */ - public static final String BALANCE_SUMMARY_DETAILS_EXPORT = "MSG_FINANCE_032"; +public static final String BALANCE_SUMMARY_DETAILS_EXPORT = "余额汇总详情"; /** * 余额汇总导出 -- 余额汇总导出 */ @@ -150,127 +150,127 @@ public class FinanceMsgConstants { /** * 该会员的账户信息不存在 -- 该会员的账户信息不存在 */ - public static final String ACCOUNT_INFORMATION_NOT_EXIS = "MSG_FINANCE_034"; +public static final String ACCOUNT_INFORMATION_NOT_EXIS = "该会员的账户信息不存在"; /** * 提交的会员与库中的会员不符 -- 提交的会员与库中的会员不符，请核对！ */ - public static final String SUBMITTED_MEMBERS_NOT_MATCH_DATABASE = "MSG_FINANCE_035"; +public static final String SUBMITTED_MEMBERS_NOT_MATCH_DATABASE = "提交的会员与库中的会员不符，请核对！"; /** * 冻结模板 -- 冻结模板 */ - public static final String FREEZE_TEMPLATE = "MSG_FINANCE_036"; +public static final String FREEZE_TEMPLATE = "冻结模板"; /** * 请选择发起签呈记录！ -- 请选择发起签呈记录！ */ - public static final String SELECT_INITIATING_SIGNATURE_RECORD = "MSG_FINANCE_037"; +public static final String SELECT_INITIATING_SIGNATURE_RECORD = "请选择发起签呈记录！"; /** * 选择的记录中有重复发起签呈的记录 -- 选择的记录中有重复发起签呈的记录！ */ - public static final String SELECTED_RECORD_DUPLICATE_SIGNATURE_RECORD = "MSG_FINANCE_038"; +public static final String SELECTED_RECORD_DUPLICATE_SIGNATURE_RECORD = "选择的记录中有重复发起签呈的记录！"; /** * 提现明细导出 -- 提现明细导出 */ - public static final String WITHDRAWAL_DETAILS_EXPORT = "MSG_FINANCE_039"; +public static final String WITHDRAWAL_DETAILS_EXPORT = "提现明细导出"; /** * 请选择查看提现记录 -- 请选择查看提现记录 */ - public static final String SELECT_WITHDRAWAL_RECORD = "MSG_FINANCE_040"; +public static final String SELECT_WITHDRAWAL_RECORD = "请选择查看提现记录"; /** * 请选择要打款的记录 -- 请选择要打款的记录 */ - public static final String SELECT_PAID_RECORD = "MSG_FINANCE_041"; +public static final String SELECT_PAID_RECORD = "请选择要打款的记录"; /** * 提交的数据有末审核的数据 -- 提交的数据有末审核的数据 */ - public static final String DATA_UNAPPROVED_DATA = "MSG_FINANCE_042"; +public static final String DATA_UNAPPROVED_DATA = "提交的数据有末审核的数据"; /** * 请选择要打款充正的记录 -- 请选择要打款充正的记录 */ - public static final String SELECT_CHARGED_RECORD = "MSG_FINANCE_043"; +public static final String SELECT_CHARGED_RECORD = "请选择要打款充正的记录"; /** * 请配置提现信息 -- 请配置提现信息 */ - public static final String CONFIGURE_WITHDRAWAL_INFO = "MSG_FINANCE_044"; +public static final String CONFIGURE_WITHDRAWAL_INFO = "请配置提现信息"; /** * 请绑定银行卡 -- 请绑定银行卡 */ - public static final String BIND_BANK_CARD = "MSG_FINANCE_045"; +public static final String BIND_BANK_CARD = "请绑定银行卡"; /** * 暂时不请允许提现，请先升级 -- 暂时不请允许提现，请先升级 */ - public static final String NOT_WITHDRAWAL_UPGRADE = "MSG_FINANCE_046"; +public static final String NOT_WITHDRAWAL_UPGRADE = "暂时不请允许提现，请先升级"; /** * 请选择提现账户 -- 请选择提现账户 */ - public static final String SELECT_WITHDRAWAL_ACCOUNT = "MSG_FINANCE_047"; +public static final String SELECT_WITHDRAWAL_ACCOUNT = "请选择提现账户"; /** * 不允许提现 -- 不允许提现 */ - public static final String NOT_ALLOWED_WITHDRAWAL = "MSG_FINANCE_048"; +public static final String NOT_ALLOWED_WITHDRAWAL = "不允许提现"; /** * 超过提现次数 -- 超过提现次数 */ - public static final String EXCEEDING_WITHDRAWALS_NUMBER = "MSG_FINANCE_049"; +public static final String EXCEEDING_WITHDRAWALS_NUMBER = "超过提现次数"; /** * 请配置提现金额限制 -- 请配置提现金额限制 */ - public static final String CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT = "MSG_FINANCE_050"; +public static final String CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT = "请配置提现金额限制"; /** * 请输入提现金额 -- 请输入提现金额 */ - public static final String ENTER_WITHDRAWAL_AMOUNT = "MSG_FINANCE_051"; +public static final String ENTER_WITHDRAWAL_AMOUNT = "请输入提现金额"; /** * 请输入整数值 -- 请输入整数值 */ - public static final String ENTER_INTEGER_VALUE = "MSG_FINANCE_052"; +public static final String ENTER_INTEGER_VALUE = "请输入整数值"; /** * 提现金额必须大于最低提现金额 -- 提现金额必须大于最低提现金额 */ - public static final String WITHDRAWAL_AMOUNT_GREATER_MINIMUM_AMOUNT = "MSG_FINANCE_053"; +public static final String WITHDRAWAL_AMOUNT_GREATER_MINIMUM_AMOUNT = "提现金额必须大于最低提现金额"; /** * 提现金额必须小于最高提现金额 -- 提现金额必须小于最高提现金额 */ - public static final String WITHDRAWAL_AMOUNT_LESS_MAXIMUM_AMOUNT = "MSG_FINANCE_054"; +public static final String WITHDRAWAL_AMOUNT_LESS_MAXIMUM_AMOUNT = "提现金额必须小于最高提现金额"; /** * 余额不足 -- 余额不足 */ - public static final String BALANCE_NOT_ENOUGH = "MSG_FINANCE_055"; +public static final String BALANCE_NOT_ENOUGH = "余额不足"; /** * 转出方会员不存在 -- 转出方会员不存在 */ - public static final String TRANSFER_OUT_USER_NOT_EXIST = "MSG_FINANCE_056"; +public static final String TRANSFER_OUT_USER_NOT_EXIST = "转出方会员不存在"; /** * 请选择要转出的账户 -- 请选择要转出的账户 */ - public static final String TRANSFER_OUT_ACCOUNT_NOT_EMPTY = "MSG_FINANCE_057"; +public static final String TRANSFER_OUT_ACCOUNT_NOT_EMPTY = "请选择要转出的账户"; /** * 转账金额有误 -- 转账金额有误 */ - public static final String INCORRECT_TRANSFER_AMOUNT = "MSG_FINANCE_058"; +public static final String INCORRECT_TRANSFER_AMOUNT = "转账金额有误"; /** @@ -282,25 +282,25 @@ public class FinanceMsgConstants { /** * 请配置转账配置 -- 请配置转账配置 */ - public static final String CONFIGURE_TRANSFER_CONFIGURATION = "MSG_FINANCE_059"; +public static final String CONFIGURE_TRANSFER_CONFIGURATION = "请配置转账配置"; /** * 转账金额不能低于最低转账金额 -- 转账金额不能低于最低转账金额 */ - public static final String CANNOT_LOWER_THAN_MINIMUM_TRANSFER_AMOUNT = "MSG_FINANCE_060"; +public static final String CANNOT_LOWER_THAN_MINIMUM_TRANSFER_AMOUNT = "转账金额不能低于最低转账金额"; /** * 转账金额不能大于最高转账金额 -- 转账金额不能大于最高转账金额 */ - public static final String CANNOT_GREATER_MAXIMUM_TRANSFER_AMOUNT = "MSG_FINANCE_061"; +public static final String CANNOT_GREATER_MAXIMUM_TRANSFER_AMOUNT = "转账金额不能大于最高转账金额"; /** * 该账号不允许转账 -- 该账号不允许转账 */ - public static final String NOT_ALLOWED_TRANSFER = "MSG_FINANCE_062"; +public static final String NOT_ALLOWED_TRANSFER = "该账号不允许转账"; /** * 会员账号不允许转账（结算等级为1） -- 会员级别不允许转账 */ - public static final String MEMBER_IN_NOT_ALLOWED_TRANSFER = "MSG_FINANCE_063"; +public static final String MEMBER_IN_NOT_ALLOWED_TRANSFER = "会员级别不允许转账"; /** * 会员账号不允许转账（结算等级为1） -- 会员级别不允许接收转账 @@ -310,64 +310,64 @@ public class FinanceMsgConstants { /** * 请先实名认证 -- 请先实名认证 */ - public static final String REAL_NAME_NOT_EXIST = "MSG_FINANCE_065"; +public static final String REAL_NAME_NOT_EXIST = "请先实名认证"; /** * 实名认证的真实姓名与营业执照的法人姓名是不一致 -- 法人姓名与实名认证的真实姓名不一致 */ - public static final String REAL_NAME_LICENSE_NOT_SAME = "MSG_FINANCE_067"; +public static final String REAL_NAME_LICENSE_NOT_SAME = "法人姓名与实名认证的真实姓名不一致"; /** * 转入方会员不存在 -- 转入方会员不存在 */ - public static final String TRANSFER_IN_USER_NOT_EXIST = "MSG_FINANCE_068"; +public static final String TRANSFER_IN_USER_NOT_EXIST = "转入方会员不存在"; /** * 不能给自己转账 -- 不能给自己转账 */ - public static final String NOT_TRANSFER_MONEY_TO_YOURSELF = "MSG_FINANCE_069"; +public static final String NOT_TRANSFER_MONEY_TO_YOURSELF = "不能给自己转账"; /** * 不能跨国转账 -- 不能跨国转账 */ - public static final String NOT_ALLOWED_CROSS_BORDER_TRANSFER = "MSG_FINANCE_070"; +public static final String NOT_ALLOWED_CROSS_BORDER_TRANSFER = "不能跨国转账"; /** * 接收方编号不在血缘线中 -- 接收方编号不在血缘线中 */ - public static final String RECEIVER_NUMBER_NOT_IN_BLOOD_LINE = "MSG_FINANCE_071"; +public static final String RECEIVER_NUMBER_NOT_IN_BLOOD_LINE = "接收方编号不在血缘线中"; /** * 转账明细导出 -- 转账明细导出 */ - public static final String TRANSFER_DETAILS_EXPORT = "MSG_FINANCE_073"; +public static final String TRANSFER_DETAILS_EXPORT = "转账明细导出"; /** * 消费明细导出 -- 消费明细导出 */ - public static final String CONSUMPTION_DETAILS_EXPORT = "MSG_FINANCE_074"; +public static final String CONSUMPTION_DETAILS_EXPORT = "消费明细导出"; /** * 充值明细导出 -- 充值明细导出 */ - public static final String RECHARGE_DETAILS_EXPORT = "MSG_FINANCE_075"; +public static final String RECHARGE_DETAILS_EXPORT = "充值明细导出"; /** * 银行卡号不能为空 -- 银行卡号不能为空！ */ - public static final String BANK_CARD_CANNOT_EMPTY = "MSG_FINANCE_076"; +public static final String BANK_CARD_CANNOT_EMPTY = "银行卡号不能为空！"; /** * 开户名不能为空 -- 开户名不能为空！ */ - public static final String ACCOUNT_NAME_CANNOT_EMPTY = "MSG_FINANCE_077"; +public static final String ACCOUNT_NAME_CANNOT_EMPTY = "开户名不能为空！"; /** * 验证码不能为空 -- 验证码不能为空！ */ - public static final String VERIFICATION_CODE_CANNOT_EMPTY = "MSG_FINANCE_078"; +public static final String VERIFICATION_CODE_CANNOT_EMPTY = "验证码不能为空！"; /** * 开户支行不能为空 -- 开户支行不能为空！ */ - public static final String OPENING_BRANCH_CANNOT_EMPTY = "MSG_FINANCE_079"; +public static final String OPENING_BRANCH_CANNOT_EMPTY = "开户支行不能为空！"; /** * 开户支行不能为空 -- 真实姓名不能为空！ @@ -377,90 +377,90 @@ public class FinanceMsgConstants { /** * 证件正面 -- 证件正面不能为空！ */ - public static final String ID_FRONT_CANNOT_EMPTY = "MSG_FINANCE_084"; +public static final String ID_FRONT_CANNOT_EMPTY = "证件正面不能为空！"; /** * 证件反面 -- 证件反面不能为空！ */ - public static final String ID_BACK_CANNOT_EMPTY = "MSG_FINANCE_085"; +public static final String ID_BACK_CANNOT_EMPTY = "证件反面不能为空！"; /** * 证件正面 -- 新会员姓名不能为空！ */ - public static final String MEMBER_NAME_CANNOT_EMPTY = "MSG_FINANCE_086"; +public static final String MEMBER_NAME_CANNOT_EMPTY = "新会员姓名不能为空！"; /** * 证件反面 -- 新联系方式不能为空！ */ - public static final String MEMBER_PHONE_CANNOT_EMPTY = "MSG_FINANCE_087"; +public static final String MEMBER_PHONE_CANNOT_EMPTY = "新联系方式不能为空！"; /** * 请选择日期 -- 请选择日期 */ - public static final String SELECT_DATE_NOT_NULL = "MSG_FINANCE_088"; +public static final String SELECT_DATE_NOT_NULL = "请选择日期"; /** * 营业执照名称 -- 营业执照名称不能为空！ */ - public static final String MEMBER_BUSINESS_LICENSE_NAME = "MSG_FINANCE_089"; +public static final String MEMBER_BUSINESS_LICENSE_NAME = "营业执照名称不能为空！"; /** * 统一社会信用代码 -- 统一社会信用代码不能为空！ */ - public static final String MEMBER_BUSINESS_CREDIT_CODE = "MSG_FINANCE_090"; +public static final String MEMBER_BUSINESS_CREDIT_CODE = "统一社会信用代码不能为空！"; /** * 法人姓名不能为空 -- 法人姓名不能为空！ */ - public static final String MEMBER_BUSINESS_LEGAL_NAME = "MSG_FINANCE_091"; +public static final String MEMBER_BUSINESS_LEGAL_NAME = "法人姓名不能为空！"; /** * 营业执照上传 -- 营业执照必须上传！ */ - public static final String MEMBER_BUSINESS_LICENSE_IMAGE = "MSG_FINANCE_092"; +public static final String MEMBER_BUSINESS_LICENSE_IMAGE = "营业执照必须上传！"; /** * 查询营业执照记录不存在 -- 查询营业执照记录不存在！ */ - public static final String BUSINESS_LICENSE_NOT_EXIST = "MSG_FINANCE_093"; +public static final String BUSINESS_LICENSE_NOT_EXIST = "查询营业执照记录不存在！"; /** * 当前审批状态不允许驳回 -- 当前审批状态不允许驳回！ */ - public static final String BUSINESS_LICENSE_NOT_REJECT = "MSG_FINANCE_094"; +public static final String BUSINESS_LICENSE_NOT_REJECT = "当前审批状态不允许驳回！"; /** * 营业执照正在审核中，请稍后操作 -- 营业执照正在审核中，请稍后操作！ */ - public static final String BUSINESS_LICENSE_IN_APPROVAL = "MSG_FINANCE_095"; +public static final String BUSINESS_LICENSE_IN_APPROVAL = "营业执照正在审核中，请稍后操作！"; /** * 此状态不允许撤消 */ - public static final String WITHDRAWAL_NOT_CANCEL = "MSG_FINANCE_098"; +public static final String WITHDRAWAL_NOT_CANCEL = "此状态不允许撤消"; /** * 转账 */ - public static final String TRANSFER_ACCOUNTS = "MSG_FINANCE_099"; +public static final String TRANSFER_ACCOUNTS = "转账"; /** * 金额 */ - public static final String AMOUNT_MONEY = "MSG_FINANCE_100"; +public static final String AMOUNT_MONEY = "金额"; /** * 接受转账 */ - public static final String ACCEPT_TRANSFER = "MSG_FINANCE_101"; +public static final String ACCEPT_TRANSFER = "接受转账"; /** * 请填写驳回信息 -- 请填写驳回信息！ */ - public static final String REJECT_MSG_NOT_NULL = "MSG_FINANCE_102"; +public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; /** * 营业执照审核未通过，请勿操作重置 -- 营业执照审核未通过，请勿操作重置 */ - public static final String BUSINESS_LICENSE_REFUSE_RESET = "MSG_FINANCE_103"; +public static final String BUSINESS_LICENSE_REFUSE_RESET = "营业执照审核未通过，请勿操作重置"; /** * 提现正在审批中，请稍后再试 -- 提现正在审批中，请稍后再试 @@ -500,7 +500,7 @@ public class FinanceMsgConstants { /** * 账号异常无法接受转账 -- 账号异常无法接受转账 */ - public static final String TRANSFER_IN_USER_NOT_ALLOWED = "MSG_FINANCE_108"; +public static final String TRANSFER_IN_USER_NOT_ALLOWED = "账号异常无法接受转账"; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index 24cf8114..28b406d2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -12,235 +12,234 @@ public class MemberMsgConstants { /** * 重复提交，或者没有token生成，不是正规流程进入的保存 提交token失效 -- 请求已经失效，请刷新重试！ */ - public static final String TOKEN_REPEAT_SUBMIT = "MSG_MEMBER_001"; + public static final String TOKEN_REPEAT_SUBMIT = "请求已经失效，请刷新重试！"; /** * 手机号码长度验证 -- 联系方式长度超长 * 2024.06.21 兼容新需求，特殊账号联系方式长度不能超过30位 */ public static final String PHONE_LENGTH = "联系方式长度超长"; -// public static final String PHONE_LENGTH = "MSG_MEMBER_003"; /** * 必输项不能为空 -- 必输项不能为空！ */ - public static final String REQUIRED_NOT_EMPTY = "MSG_MEMBER_004"; + public static final String REQUIRED_NOT_EMPTY = "必输项不能为空！"; /** * 验证推荐人是否又推荐某等级权限 -- 推荐人没有推荐该等级权限！ */ - public static final String PARENT_NO_JURISDICTION = "MSG_MEMBER_007"; + public static final String PARENT_NO_JURISDICTION = "推荐人没有推荐该等级权限！"; /** * 验证手机号是否被注册 -- 会员信息已存在！ */ - public static final String SYSTEM_REGISTER_COUNT = "MSG_MEMBER_010"; + public static final String SYSTEM_REGISTER_COUNT = "会员信息已存在！"; /** * 验证手机号是否被用户使用 -- 会员信息已注册，若有异议请及时联系在线客服！ */ - public static final String PHONE_ALREADY_REGISTER = "MSG_MEMBER_011"; + public static final String PHONE_ALREADY_REGISTER = "会员信息已注册，若有异议请及时联系在线客服！"; /** * 验证手机号是否在同一个团队 -- 注册信息已存在,请重新输入注册信息！ */ - public static final String REGISTER_EXIST_OTHER_TEAM = "MSG_MEMBER_012"; + public static final String REGISTER_EXIST_OTHER_TEAM = "注册信息已存在,请重新输入注册信息！"; /** * 验证报单中心是否还存在系统中 -- 报单中心权限已关闭，请及时联系客服！ */ - public static final String CENTER_NOT_EXISTS = "MSG_MEMBER_013"; + public static final String CENTER_NOT_EXISTS = "报单中心权限已关闭，请及时联系客服！"; /** * 验证支付密码是否为空 -- 支付密码不能为空！ */ - public static final String MEMBER_PASSWORD_EMPTY = "MSG_MEMBER_014"; + public static final String MEMBER_PASSWORD_EMPTY = "支付密码不能为空！"; /** * 验证支付密码是否整取 -- 支付密码输入错误，请重新输入！ */ - public static final String MEMBER_PASSWORD_NOT_MATCH = "MSG_MEMBER_015"; + public static final String MEMBER_PASSWORD_NOT_MATCH = "支付密码输入错误，请重新输入！"; /** * 验证账户状态，是否锁定 -- 会员账户存在异常，请及时联系客服！ */ - public static final String MEMBER_ACCOUNT_STATUS_LOCK = "MSG_MEMBER_016"; + public static final String MEMBER_ACCOUNT_STATUS_LOCK = "会员账户存在异常，请及时联系客服！"; /** * 安置人编号是否输入 -- 安置编号输入错误，请重新输入！ */ - public static final String PLACE_PARENT_NOT_EMPTY = "MSG_MEMBER_017"; + public static final String PLACE_PARENT_NOT_EMPTY = "安置编号输入错误，请重新输入！"; /** * 安置人编号是否存在 -- 安置编号不存在，请重新输入！ */ - public static final String PLACE_PARENT_NOT_EXISTS = "MSG_MEMBER_018"; + public static final String PLACE_PARENT_NOT_EXISTS = "安置编号不存在，请重新输入！"; /** * 安置人是否在推荐人伞下 -- 安置人不在推荐人伞下，请重新输入！ */ - public static final String PLACE_NOT_TEAM = "MSG_MEMBER_019"; + public static final String PLACE_NOT_TEAM = "安置人不在推荐人伞下，请重新输入！"; /** * 安置点位是否重复安置 -- 安置位置已有安置，请重新安置！ */ - public static final String PLACE_PARENT_DEPT_EXIST = "MSG_MEMBER_020"; + public static final String PLACE_PARENT_DEPT_EXIST = "安置位置已有安置，请重新安置！"; /** * 安置第二部门，判断是否推荐过首单 -- 安置人没有推荐首单，不能直接安置右部门！ */ - public static final String PLACE_PARENT_NOT_REFERENCE = "MSG_MEMBER_021"; + public static final String PLACE_PARENT_NOT_REFERENCE = "安置人没有推荐首单，不能直接安置右部门！"; /** * 安置第二部门，判断是否安置过第一部门 -- 安置人没有安置左部门，不能直接安置右部门！ */ - public static final String PLACE_PARENT_NOT_EXIST = "MSG_MEMBER_022"; + public static final String PLACE_PARENT_NOT_EXIST = "安置人没有安置左部门，不能直接安置右部门！"; /** * 验证是否推荐过首单 -- 推荐人未推荐过首单，只能安置在推荐人极左极下！ */ - public static final String PLACE_IS_LAST_LEFT = "MSG_MEMBER_023"; + public static final String PLACE_IS_LAST_LEFT = "推荐人未推荐过首单，只能安置在推荐人极左极下！"; /** * 推荐人编号是否输入 -- 推荐编号不能位空，请输入推荐编号！ */ - public static final String PARENT_NOT_EMPTY = "MSG_MEMBER_024"; + public static final String PARENT_NOT_EMPTY = "推荐编号不能位空，请输入推荐编号！"; /** * 推荐人编号是否存在 -- 推荐编号不存在，请重新输入！ */ - public static final String PARENT_NOT_EXISTS = "MSG_MEMBER_025"; + public static final String PARENT_NOT_EXISTS = "推荐编号不存在，请重新输入！"; /** * 推荐人是否已经支付 -- 推荐人未支付，不能作为有效推荐人！ */ - public static final String PARENT_NOT_PAY = "MSG_MEMBER_026"; + public static final String PARENT_NOT_PAY = "推荐人未支付，不能作为有效推荐人！"; /** * 推荐人在报单中心伞下 -- 推荐人不在报单中心伞下，不能作为推荐人！ */ - public static final String PARENT_NOT_TEAM = "MSG_MEMBER_027"; + public static final String PARENT_NOT_TEAM = "推荐人不在报单中心伞下，不能作为推荐人！"; /** * 验证报单权限 是否有报单权限 -- 没有注册权限，不能注册新会员！ */ - public static final String REGISTER_AUTHORITY = "MSG_MEMBER_029"; + public static final String REGISTER_AUTHORITY = "没有注册权限，不能注册新会员！"; /** * 账户余额不足 -- 账户余额不足！ */ - public static final String MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH = "MSG_MEMBER_030"; + public static final String MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH = "账户余额不足！"; /** * 同时操作 -- 有其他用户在操作该数据，请重新刷新界面！ */ - public static final String MEMBER_IS_OPERATION = "MSG_MEMBER_031"; + public static final String MEMBER_IS_OPERATION = "有其他用户在操作该数据，请重新刷新界面！"; /** * 升级-是否满足升级条件 -- 不满足升级条件！ */ - public static final String LEVEL_NOT_ENOUGH = "MSG_MEMBER_032"; + public static final String LEVEL_NOT_ENOUGH = " 不满足升级条件！"; /** * 注册-是否满足升级条件 -- 不满足升级条件！ */ - public static final String REGISTER_LEVEL_NOT_ENOUGH = "MSG_MEMBER_033"; + public static final String REGISTER_LEVEL_NOT_ENOUGH = "不满足升级条件"; /** * 判断会员账号是否满足支付 -- 余额不足，请及时充值！ */ - public static final String MEMBER_BALANCE_NOT_PAY = "MSG_MEMBER_034"; + public static final String MEMBER_BALANCE_NOT_PAY = "余额不足，请及时充值！"; /** * 会员不存在 -- 会员编号不存在！ */ - public static final String MEMBER_DOES_NOT_EXITS = "MSG_MEMBER_035"; + public static final String MEMBER_DOES_NOT_EXITS = "会员编号不存在"; /** * 会员不存在 -- 会员编号不存在，请重新输入！ */ - public static final String MEMBER_NOT_EXITS = "MSG_MEMBER_036"; + public static final String MEMBER_NOT_EXITS = "会员编号不存在，请重新输入！"; /** * 已申请自提 -- 订单已申请自提，不能再次申请！ */ - public static final String SELF_PICKUP_ORDER_REPEAT = "MSG_MEMBER_037"; + public static final String SELF_PICKUP_ORDER_REPEAT = "订单已申请自提，不能再次申请！"; /** * 撤单时验证会员是否存在 -- 报单会员不存在，不能撤单！ */ - public static final String CREATE_MEMBER_NOT_EXITS = "MSG_MEMBER_038"; + public static final String CREATE_MEMBER_NOT_EXITS = "报单会员不存在，不能撤单！"; /** * 体系编号已存在 -- 体系编号已存在！ */ - public static final String MEMBER_CODE_EXITS = "MSG_MEMBER_039"; + public static final String MEMBER_CODE_EXITS = "体系编号已存在！"; /** * 体系名称已存在 -- 体系名称已存在！ */ - public static final String VERTEX_NAME_EXITS = "MSG_MEMBER_040"; + public static final String VERTEX_NAME_EXITS = "体系名称已存在！"; /** * 体系已被团队使用 -- 体系已被团队使用,无法删除！ */ - public static final String VERTEX_MEMBER_TEAM_REGISTER = "MSG_MEMBER_041"; + public static final String VERTEX_MEMBER_TEAM_REGISTER = "体系已被团队使用,无法删除！"; /** * 撤单时，验证会员结算国跟订单结算国是否一致 -- 会员已转结算国，不能撤单！ */ - public static final String MEMBER_CHANGE_SETTLE_COUNTRY = "MSG_MEMBER_042"; + public static final String MEMBER_CHANGE_SETTLE_COUNTRY = "会员已转结算国，不能撤单！"; /** * 撤注册订单时，验证会员账户金额是否为0 -- 编号存在余额，不能撤单！ */ - public static final String MEMBER_ACCOUNT_NOT_ZERO = "MSG_MEMBER_043"; + public static final String MEMBER_ACCOUNT_NOT_ZERO = "编号存在余额，不能撤单！"; /** * 合并撤单订单时，验证会员伞下账户金额是否为0 -- 安置子节点会员编号存在余额，不能撤单！ */ - public static final String UNDER_UMBRELLA_ACCOUNT_NOT_ZERO = "MSG_MEMBER_044"; + public static final String UNDER_UMBRELLA_ACCOUNT_NOT_ZERO = "安置子节点会员编号存在余额，不能撤单！"; /** * 合并撤单订单时，验证会员伞下会员是否存在订单 -- 安置存在子节点，不能撤单！ */ - public static final String UNDER_UMBRELLA_MEMBER_EXIST_ORDER = "MSG_MEMBER_045"; + public static final String UNDER_UMBRELLA_MEMBER_EXIST_ORDER = "安置存在子节点，不能撤单！"; /** * 撤注册订单时，验证会员是否存在未完成的签呈 -- 会员存在未完成的签呈，不能撤单！ */ - public static final String MEMBER_EXIST_NO_FISH_DOCUMENT = "MSG_MEMBER_046"; + public static final String MEMBER_EXIST_NO_FISH_DOCUMENT = "会员存在未完成的签呈，不能撤单！"; /** * 会员修改密码，提示旧密码错误 -- 旧密码错误，请输入正确密码！ */ - public static final String PASSWORD_ERROR = "MSG_MEMBER_047"; + public static final String PASSWORD_ERROR = "旧密码错误，请输入正确密码！"; /** * 空单注册，导入的数据字段有为空的 -- 导入数据存在为空 */ - public static final String EMPTY_IMPORT_EMPTY = "MSG_MEMBER_049"; + public static final String EMPTY_IMPORT_EMPTY = "导入数据存在为空"; /** * 空单注册，导入的数据安置部门值不合法，不是第一或者第二部门 -- 导入安置部门数据有误 */ - public static final String EMPTY_IMPORT_PLACE_ERROR = "MSG_MEMBER_050"; + public static final String EMPTY_IMPORT_PLACE_ERROR = "导入安置部门数据有误"; /** * 空单注册，导入的数据校验之后存在点位异常状态 -- %s条数据存在异常，请检查 */ - public static final String EMPTY_POINT_ERROR = "MSG_MEMBER_051"; + public static final String EMPTY_POINT_ERROR = "%s条数据存在异常，请检查"; /** * 空单注册，提交签呈时没有会员点位数据 -- 该批次下没有报单数据 */ - public static final String EMPTY_DATA_DETAIL_EMPTY = "MSG_MEMBER_052"; + public static final String EMPTY_DATA_DETAIL_EMPTY = "该批次下没有报单数据"; /** * 空单注册，免签保存会员并且上树失败 -- 空单注册数据保存失败 */ - public static final String EMPTY_SAVE_ERROR = "MSG_MEMBER_053"; + public static final String EMPTY_SAVE_ERROR = "空单注册数据保存失败"; /** * 空单注册，导入的会员编号中存在重复 -- 会员编号存在重复 */ - public static final String EMPTY_MEMBER_REPEAT = "MSG_MEMBER_054"; + public static final String EMPTY_MEMBER_REPEAT = "会员编号存在重复"; /** * 空单注册，导入的会员编号中存在重复 -- 推荐编号不存在 */ - public static final String EMPTY_PARENT_NOT = "MSG_MEMBER_055"; + public static final String EMPTY_PARENT_NOT = "推荐编号不存在"; /** * 空单注册，导入的会员联系方式中存在重复 -- 联系方式存在重复 */ @@ -248,21 +247,21 @@ public class MemberMsgConstants { /** * 空单注册，会员编号与推荐编号相同 -- 会员编号与推荐编号相同 */ - public static final String EMPTY_MEMBER_EQ_PARENT = "MSG_MEMBER_061"; + public static final String EMPTY_MEMBER_EQ_PARENT = "会员编号与推荐编号相同"; /** * 空单注册，会员编号与安置编号相同 -- 会员编号与安置编号相同 */ - public static final String EMPTY_MEMBER_EQ_PLACE = "MSG_MEMBER_062"; + public static final String EMPTY_MEMBER_EQ_PLACE = "会员编号与安置编号相同"; /** * 订单撤单时，会员账户不存在 -- 会员账户不存在 */ - public static final String NOT_EXIST_MEMBER_ACCOUNT = "MSG_MEMBER_064"; + public static final String NOT_EXIST_MEMBER_ACCOUNT = "会员账户不存在"; /** * 订单取消时，如果是注册单，校验伞下是否推荐或者安置过人 -- 订单所属会员下存在用户不能取消 */ - public static final String EXIST_MEMBER_NOT_CANCEL = "MSG_MEMBER_065"; + public static final String EXIST_MEMBER_NOT_CANCEL = "订单所属会员下存在用户不能取消"; /** * 已超最大门票销售数量，不能购买！ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java index fcf50db3..34d17f5a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java @@ -14,31 +14,31 @@ public class NoticeMsgConstants { /** * 等级、奖衔至少选择一项 -- 等级、奖衔至少选择一项！ */ - public static final String LEAST_ONE_LEVEL_AWARD = "MSG_NOTICE_001"; +public static final String LEAST_ONE_LEVEL_AWARD = "等级、奖衔至少选择一项！"; /** * 发布位置不能为空 -- 发布位置不能为空！ */ - public static final String PUBLISH_LOCATION_NOT_EMPTY = "MSG_NOTICE_002"; +public static final String PUBLISH_LOCATION_NOT_EMPTY = "发布位置不能为空！"; /** * 角色不能为空 -- 角色不能为空！ */ - public static final String ROLE_NOT_EMPTY = "MSG_NOTICE_003"; +public static final String ROLE_NOT_EMPTY = "角色不能为空！"; /** * 标题不能为空 -- 标题不能为空！ */ - public static final String TITLE_NOT_EMPTY = "MSG_NOTICE_004"; +public static final String TITLE_NOT_EMPTY = "标题不能为空！"; /** * 强制弹窗不能为空 -- 强制弹窗不能为空！ */ - public static final String POPUP_WINDOW_NOT_EMPTY = "MSG_NOTICE_005"; +public static final String POPUP_WINDOW_NOT_EMPTY = "强制弹窗不能为空！"; /** * 已审核不允许删除 -- 已审核不允许删除！ */ - public static final String NOT_DELETE = "MSG_NOTICE_006"; +public static final String NOT_DELETE = "已审核不允许删除！"; } 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 9142737a..1003e3e7 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 @@ -12,146 +12,146 @@ public class ProductMsgConstants { /** * 商品提交没有选择专区 -- 所属专区必选 */ - public static final String SPECIAL_AREA_REQUIRED = "MSG_PRODUCT_001"; +public static final String SPECIAL_AREA_REQUIRED = "所属专区必选"; /** * 商品没有选择专区分类提示 -- 分类名称必填 */ - public static final String SPECIAL_AREA_CLASSIFY_REQUIRED = "MSG_PRODUCT_002"; +public static final String SPECIAL_AREA_CLASSIFY_REQUIRED = "分类名称必填"; /** * 排序重复 -- 排序重复 */ - public static final String SORT_REPEAT = "MSG_PRODUCT_003"; +public static final String SORT_REPEAT = "排序重复"; /** * 规格分类已被占用 -- 规格分类已被占用 */ - public static final String SPECS_TYPE_IS_USE = "MSG_PRODUCT_006"; +public static final String SPECS_TYPE_IS_USE = "规格分类已被占用"; /** * 分类名称重复 -- 分类名称重复 */ - public static final String CLASSIFY_NAME_REPEAT = "MSG_PRODUCT_007"; +public static final String CLASSIFY_NAME_REPEAT = "分类名称重复"; /** * 排序值超出限制 -- 排序值超出限制 */ - public static final String SORT_VALUES_OVERLIMIT = "MSG_PRODUCT_008"; +public static final String SORT_VALUES_OVERLIMIT = "排序值超出限制"; /** * 新增产品编号已存在 -- 产品编号已存在 */ - public static final String PRODUCT_NUMBER_ALREADY_EXISTS = "MSG_PRODUCT_009"; +public static final String PRODUCT_NUMBER_ALREADY_EXISTS = "产品编号已存在"; /** * 产品已被占用 -- 产品已被占用 */ - public static final String PRODUCT_OCCUPIED = "MSG_PRODUCT_010"; +public static final String PRODUCT_OCCUPIED = "产品已被占用"; /** * 产品名称必填 -- 产品名称必填 */ - public static final String PRODUCT_NAME_REQUIRED = "MSG_PRODUCT_011"; +public static final String PRODUCT_NAME_REQUIRED = "产品名称必填"; /** * 产品划线价 -- 产品划线价必填 */ - public static final String PRODUCT_PRICE_REQUIRED = "MSG_PRODUCT_012"; +public static final String PRODUCT_PRICE_REQUIRED = "产品划线价必填"; /** * 产品不存在 -- 产品不存在 */ - public static final String PRODUCT_NOT_REQUIRED = "MSG_PRODUCT_013"; +public static final String PRODUCT_NOT_REQUIRED = "产品不存在"; /** * 发货渠道/发货类型 -- 产品发货渠道必填 */ - public static final String PRODUCT_SHIPPING_CHANNEL_REQUIRED = "MSG_PRODUCT_014"; +public static final String PRODUCT_SHIPPING_CHANNEL_REQUIRED = "产品发货渠道必填"; /** * 产品保质期 -- 产品保质期必填 */ - public static final String PRODUCT_SHELFLIFE_REQUIRED = "MSG_PRODUCT_015"; +public static final String PRODUCT_SHELFLIFE_REQUIRED = "产品保质期必填"; /** * 产品单位 -- 产品单位必填 */ - public static final String PRODUCT_UNIT_REQUIRED = "MSG_PRODUCT_016"; +public static final String PRODUCT_UNIT_REQUIRED = "产品单位必填"; /** * 产品重量 -- 产品重量必填 */ - public static final String PRODUCT_WEIGHT_REQUIRED = "MSG_PRODUCT_017"; +public static final String PRODUCT_WEIGHT_REQUIRED = "产品重量必填"; /** * 邮费重量 -- 邮费重量必填 */ - public static final String PRODUCT_POSTAGE_WEIGHT_REQUIRED = "MSG_PRODUCT_018"; +public static final String PRODUCT_POSTAGE_WEIGHT_REQUIRED = "邮费重量必填"; /** * 产品属性 -- 产品属性必选 */ - public static final String PRODUCT_ATTR_REQUIRED = "MSG_PRODUCT_019"; +public static final String PRODUCT_ATTR_REQUIRED = "产品属性必选"; /** * 产品分类 -- 产品分类必选 */ - public static final String PRODUCT_CLASSIFY_REQUIRED = "MSG_PRODUCT_020"; +public static final String PRODUCT_CLASSIFY_REQUIRED = "产品分类必选"; /** * 排序序号 -- 产品排序序号必填 */ - public static final String PRODUCT_SORT_REQUIRED = "MSG_PRODUCT_021"; +public static final String PRODUCT_SORT_REQUIRED = "产品排序序号必填"; /** * 产品长 -- 产品长度必填 */ - public static final String PRODUCT_LENGTH_REQUIRED = "MSG_PRODUCT_022"; +public static final String PRODUCT_LENGTH_REQUIRED = "产品长度必填"; /** * 产品宽 -- 产品宽度必填 */ - public static final String PRODUCT_WIDTH_REQUIRED = "MSG_PRODUCT_023"; +public static final String PRODUCT_WIDTH_REQUIRED = "产品宽度必填"; /** * 产品高 -- 产品高度必填 */ - public static final String PRODUCT_HEIGHT_REQUIRED = "MSG_PRODUCT_024"; +public static final String PRODUCT_HEIGHT_REQUIRED = "产品高度必填"; /** * 产品主图 -- 请上传产品主图 */ - public static final String PRODUCT_COVER_REQUIRED = "MSG_PRODUCT_025"; +public static final String PRODUCT_COVER_REQUIRED = "请上传产品主图"; /** * 请选择商品 -- 请选择商品 */ - public static final String PLEASE_SELECT_PRODUCT = "MSG_PRODUCT_028"; +public static final String PLEASE_SELECT_PRODUCT = "请选择商品"; /** * 请选择产品规格 -- 请选择产品规格 */ - public static final String PRODUCT_SPECSTYPE_REQUIRED = "MSG_PRODUCT_029"; +public static final String PRODUCT_SPECSTYPE_REQUIRED = "请选择产品规格"; /** * 规格类型名称 -- 规格类型名称必填 */ - public static final String PRODUCT_SPECS_TYPE_NAME_REQUIRED = "MSG_PRODUCT_030"; +public static final String PRODUCT_SPECS_TYPE_NAME_REQUIRED = "规格类型名称必填"; /** * 规格类型分类 -- 规格类型分类必选 */ - public static final String PRODUCT_SPECS_TYPE_PKCLASSIFY_REQUIRED = "MSG_PRODUCT_031"; +public static final String PRODUCT_SPECS_TYPE_PKCLASSIFY_REQUIRED = "规格类型分类必选"; /** * 规格值必填 -- 请填写规格值 */ - public static final String PRODUCT_SPECS_TYPE_SPECS_REQUIRED = "MSG_PRODUCT_032"; +public static final String PRODUCT_SPECS_TYPE_SPECS_REQUIRED = "请填写规格值"; /** * 商品分类展示图片必穿 -- 请上传商品分类展示图片 */ - public static final String WARES_AREA_CLASSIFY_IMG_REQUIRED = "MSG_PRODUCT_033"; +public static final String WARES_AREA_CLASSIFY_IMG_REQUIRED = "请上传商品分类展示图片"; /** * 上级商品分类必传 -- 请选择上级分类 */ - public static final String WARES_PARENT_AREA_CLASSIFY_REQUIRED = "MSG_PRODUCT_034"; +public static final String WARES_PARENT_AREA_CLASSIFY_REQUIRED = "请选择上级分类"; /** * 商品分类存在子级 -- 当前商品分类下存在子级类目,无法删除,请先删除子级 */ - public static final String THIS_CLASSIFY_EXIST_BELOW = "MSG_PRODUCT_035"; +public static final String THIS_CLASSIFY_EXIST_BELOW = "当前商品分类下存在子级类目,无法删除,请先删除子级"; /** * 该产品每个国家只能存在一款 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java index f48b7e5c..8764894d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java @@ -8,161 +8,161 @@ public class SaOrderMsgConstants { /** * 支付页面长时间不确认，需要重新下单 -- 该订单长时间没有支付，已经失效，请重新下单！ */ - public static final String ORDER_MEMBER_CACHE = "MSG_ORDER_002"; +public static final String ORDER_MEMBER_CACHE = "该订单长时间没有支付，已经失效，请重新下单！"; /** * 订单类型是否传输 -- 订单类型不能为空，请刷新重试！ */ - public static final String ORDER_TYPE_EMPTY = "MSG_ORDER_003"; +public static final String ORDER_TYPE_EMPTY = "订单类型不能为空，请刷新重试！"; /** * 订单编号不能为空 -- 订单编号不能为空，请刷新重试！ */ - public static final String ORDER_CODE_EMPTY = "MSG_ORDER_004"; +public static final String ORDER_CODE_EMPTY = "订单编号不能为空，请刷新重试！"; /** * 验证推荐人是否又推荐某等级权限 -- 分享订单生成失败，请重新下单 */ - public static final String SHARE_ORDER_FAIL = "MSG_ORDER_005"; +public static final String SHARE_ORDER_FAIL = "分享订单生成失败，请重新下单"; /** * 根据订单编号查询订单 -- 没有找寻到该订单编号，请刷新重试！ */ - public static final String ORDER_EMPTY = "MSG_ORDER_006"; +public static final String ORDER_EMPTY = "没有找寻到该订单编号，请刷新重试！"; /** * 根据订单编号查询订单 -- 自助服务，只能处理当天的订单，请重新选择！ */ - public static final String ORDER_CURRENT_DATE = "MSG_ORDER_007"; +public static final String ORDER_CURRENT_DATE = "自助服务，只能处理当天的订单，请重新选择！"; /** * 根据订单编号查询订单 -- 自提订单只能同意/驳回发起的自提订单，请重新选择！ */ - public static final String SELF_ORDER_APPROVE = "MSG_ORDER_008"; +public static final String SELF_ORDER_APPROVE = "自提订单只能同意/驳回发起的自提订单，请重新选择！"; /** * 所属专区不能为空 -- 所属专区不能为空！ */ - public static final String SPECIAL_AREA_NOT_EMPTY = "MSG_ORDER_010"; +public static final String SPECIAL_AREA_NOT_EMPTY = "所属专区不能为空！"; /** * 没有选择商品 -- 没有选择商品！ */ - public static final String SHOPPING_CAR = "MSG_ORDER_011"; +public static final String SHOPPING_CAR = "没有选择商品！"; /** * 只能撤销7天内支付的订单 -- 只能撤销7天内支付的订单！ */ - public static final String CANCEL_SEVEN_PAY_ORDER = "MSG_ORDER_016"; +public static final String CANCEL_SEVEN_PAY_ORDER = "只能撤销7天内支付的订单！"; /** * 只能撤销7天内支付的订单 -- 周结只能撤销当前周期内支付的订单！ */ - public static final String WEEK_CANCEL_SEVEN_PAY_ORDER = "MSG_ORDER_017"; +public static final String WEEK_CANCEL_SEVEN_PAY_ORDER = "周结只能撤销当前周期内支付的订单！"; /** * 注册订单下面存在撤销的报单中心，不能撤单 -- 存在含有报单中心的订单，不能撤单！ */ - public static final String EXIST_CENTER_ORDER = "MSG_ORDER_018"; +public static final String EXIST_CENTER_ORDER = "存在含有报单中心的订单，不能撤单！"; /** * 注册订单下面存在撤销的报单中心，不能撤单 -- 只有注册订单支持单点撤单或者合并撤单！ */ - public static final String REGISTER_ORDER_CANCEL = "MSG_ORDER_019"; +public static final String REGISTER_ORDER_CANCEL = "只有注册订单支持单点撤单或者合并撤单！"; /** * 除了注册订单，是否存在其他未撤销的订单 -- 会员存在其他未撤销的订单，不能撤销注册订单！ */ - public static final String MEMBER_OTHER_ORDER = "MSG_ORDER_020"; +public static final String MEMBER_OTHER_ORDER = "会员存在其他未撤销的订单，不能撤销注册订单！"; /** * 撤销升级订单，只能从最新的升级订单开始撤销 -- 撤销升级订单，只能从最新的订单开始撤销，最新的升级订单编号：%s！ */ - public static final String MEMBER_CANCEL_UPGRADE_ORDER = "MSG_ORDER_021"; +public static final String MEMBER_CANCEL_UPGRADE_ORDER = "撤销升级订单，只能从最新的订单开始撤销，最新的升级订单编号：%s！"; /** * 撤销订单，验证该订单是否存在其他的签呈 -- 订单存在进行中审批，不能再次发起！ */ - public static final String ORDER_EXIST_OTHER_APPROVE = "MSG_ORDER_022"; +public static final String ORDER_EXIST_OTHER_APPROVE = "订单存在进行中审批，不能再次发起！"; /** * 需要查询或者处理的订单已经不存在了 -- 订单已不存在 */ - public static final String ORDER_NOT_EXIST = "MSG_ORDER_023"; +public static final String ORDER_NOT_EXIST = "订单已不存在"; /** * 退单进，未支付的订单不能进行操作 -- 未支付订单，不能进行退单 */ - public static final String ORDER_UNPAID_NOT_RETURN = "MSG_ORDER_024"; +public static final String ORDER_UNPAID_NOT_RETURN = "未支付订单，不能进行退单"; /** * 物流清单已经发货，不能进行自提 -- 已经发货，不能自提 */ - public static final String DELIVER_NOT_SELF = "MSG_ORDER_025"; +public static final String DELIVER_NOT_SELF = "已经发货，不能自提"; /** * 物流清单自提发起签呈，如果订单状态发生变化，不能进行自提 -- 订单发生变化，请刷新后重试 */ - public static final String DELIVER_SELF_CHECK_CHARGE = "MSG_ORDER_026"; +public static final String DELIVER_SELF_CHECK_CHARGE = "订单发生变化，请刷新后重试"; /** * 物流清单自提发起签呈，如果申请自提人不是需要人，不能进行自提 -- 订单支付人不相同，不能同时自提 */ - public static final String DELIVER_SELF_CHECK_CREATE = "MSG_ORDER_027"; +public static final String DELIVER_SELF_CHECK_CREATE = "订单支付人不相同，不能同时自提"; /** * 物流清单追溯码添加存在重复 -- 追溯码存在重复 */ - public static final String DELIVER_CHECK_BARCODE_REPEAT = "MSG_ORDER_028"; +public static final String DELIVER_CHECK_BARCODE_REPEAT = "追溯码存在重复"; /** * 物流清单绑定追溯码不存在 -- 追溯码不存在 */ - public static final String DELIVER_CHECK_BARCODE_NOT_EXIST = "MSG_ORDER_029"; +public static final String DELIVER_CHECK_BARCODE_NOT_EXIST = "追溯码不存在"; /** * 物流清单追溯码已使用 -- 追溯码已使用 */ - public static final String DELIVER_CHECK_BARCODE_USED = "MSG_ORDER_030"; +public static final String DELIVER_CHECK_BARCODE_USED = "追溯码已使用"; /** * 物流清单追溯码与产品不对应 -- 追溯码与产品不对应 */ - public static final String DELIVER_CHECK_BARCODE_NOT = "MSG_ORDER_031"; +public static final String DELIVER_CHECK_BARCODE_NOT = "追溯码与产品不对应"; /** * 删除发货单校验明细是否存在 -- 发货单不存在 */ - public static final String DELIVER_NOT_EXIST = "MSG_ORDER_032"; +public static final String DELIVER_NOT_EXIST = "发货单不存在"; /** * 删除发货单校验是否已经发货 -- 发货单已发货 */ - public static final String DELIVER_SHIPPED = "MSG_ORDER_033"; +public static final String DELIVER_SHIPPED = "发货单已发货"; /** * 发货单重置条码失败 -- 重置条码失败 */ - public static final String DELIVER_CLEAR_CODE = "MSG_ORDER_034"; +public static final String DELIVER_CLEAR_CODE = "重置条码失败"; /** * 扣费业务处理余额不足，是否继续 -- 余额不足，是否继续 */ - public static final String BALANCE_ENOUGH_CONTINUE = "MSG_ORDER_036"; +public static final String BALANCE_ENOUGH_CONTINUE = "余额不足，是否继续"; /** * 前台订单操作，判断状态 -- 订单状态不正确 */ - public static final String ORDER_STATUS_NOT = "MSG_ORDER_038"; +public static final String ORDER_STATUS_NOT = "订单状态不正确"; /** * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买 */ - public static final String ORDER_ITEM_OFF = "MSG_ORDER_039"; +public static final String ORDER_ITEM_OFF = "订单下商品已下架，不能购买"; /** * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单已经绑定条形码，建议解绑后在撤单！ */ - public static final String ORDER_BIND_BAR_CODE = "MSG_ORDER_040"; +public static final String ORDER_BIND_BAR_CODE = "订单已经绑定条形码，建议解绑后在撤单！"; /** * 请填写驳回信息 -- 请填写驳回信息 */ - public static final String REJECT_MSG_NOT_NULL = "MSG_ORDER_041"; +public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; /** * 该订单不是最新订单无法撤单 -- 该订单不是最新订单无法撤单 */ - public static final String CHECK_MEMBER_LAST_ORDER = "MSG_ORDER_042"; +public static final String CHECK_MEMBER_LAST_ORDER = "该订单不是最新订单无法撤单"; /** * 该会员安置或推荐存在会员不能撤单 -- 该会员安置或推荐存在会员不能撤单 */ @@ -171,6 +171,6 @@ public class SaOrderMsgConstants { /** * 商品预售数量不足 */ - public static final String WARES_PRE_SALE_QUANTITY_LACK = "MSG_ORDER_044"; +public static final String WARES_PRE_SALE_QUANTITY_LACK = "商品预售数量不足"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java index b745be00..3105ab67 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java @@ -12,40 +12,40 @@ public class SystemMsgConstants { /** * 登录时，用户/密码必须填写 -- 用户/密码必须填写 */ - public static final String USER_REQUIRED = "MSG_SYSTEM_001"; +public static final String USER_REQUIRED = "用户/密码必须填写"; /** * 登录用户不存在 -- 登录会员: %s 不存在 */ - public static final String USER_NOT_EXIST = "MSG_SYSTEM_002"; +public static final String USER_NOT_EXIST = "登录会员: %s 不存在"; /** * 账号被删除 -- 对不起，会员: %s 已被删除 */ - public static final String ACCCOUNT_DELETE = "MSG_SYSTEM_003"; +public static final String ACCCOUNT_DELETE = "对不起，会员: %s 已被删除"; /** * 账号被删除 -- 对不起，会员: %s 不能进行登录 */ - public static final String ACCCOUNT_NOT_LOGIN = "MSG_SYSTEM_004"; +public static final String ACCCOUNT_NOT_LOGIN = "对不起，会员: %s 不能进行登录"; /** * 账号被停用 -- 温馨提示：输入信息有误！请稍后再试！ */ - public static final String ACCCOUNT_STOP = "MSG_SYSTEM_005"; +public static final String ACCCOUNT_STOP = "温馨提示：输入信息有误！请稍后再试！"; /** * 登录时，用户不存在/密码错误 -- 用户不存在/密码错误 */ - public static final String USER_ERROR = "MSG_SYSTEM_006"; +public static final String USER_ERROR = "用户不存在/密码错误"; /** * 验证码错误 -- 验证码错误 */ - public static final String CODE_ERROR = "MSG_SYSTEM_007"; +public static final String CODE_ERROR = "验证码错误"; /** * 验证码已失效 -- 验证码已失效 */ - public static final String CODE_EXPIRE = "MSG_SYSTEM_008"; +public static final String CODE_EXPIRE = "验证码已失效"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java index 878a1ac4..71b1fd9d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java @@ -12,37 +12,37 @@ public class WaresMsgConstants { /** * 新增商品编号不存在 -- 商品编号不存在 */ - public static final String WARES_NUMBER_DOES_NOT_EXIST = "MSG_WARES_001"; +public static final String WARES_NUMBER_DOES_NOT_EXIST = "商品编号不存在"; /** * 分类重复 -- 分类重复 */ - public static final String CLASSIFICATION_DUPLICATION = "MSG_WARES_005"; +public static final String CLASSIFICATION_DUPLICATION = "分类重复"; /** * 规格分类 -- 规格分类已被占用,无法删除 */ - public static final String WARES_CLASSIFY_IS_USE = "MSG_WARES_006"; +public static final String WARES_CLASSIFY_IS_USE = "规格分类已被占用,无法删除"; /** * 排序重复 -- 排序重复 */ - public static final String SORT_DUPLICATES = "MSG_WARES_015"; +public static final String SORT_DUPLICATES = "排序重复"; /** * 名称重复 -- 名称重复 */ - public static final String NAME_DUPLICATES = "MSG_WARES_016"; +public static final String NAME_DUPLICATES = "名称重复"; /** * 产品单位已被使用 无法删除 -- 产品单位已被使用,无法删除 */ - public static final String UNIT_HAS_BEEN_USED = "MSG_WARES_017"; +public static final String UNIT_HAS_BEEN_USED = "产品单位已被使用,无法删除"; /** * 排序不能为空 -- 排序不能为空 */ - public static final String SORT_IS_NOT_NULL = "MSG_WARES_018"; +public static final String SORT_IS_NOT_NULL = "排序不能为空"; /** * 商品编号不能为空 -- 商品编号不能为空 */ - public static final String WARES_CODE_NOT_NULL = "MSG_WARES_022"; +public static final String WARES_CODE_NOT_NULL = "商品编号不能为空"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java index a13ca940..705b5edc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 货币种类 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java index 6aef44cd..8fb8c680 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java @@ -21,54 +21,46 @@ public enum EAwards { * 0=无 */ MEMBER(1, 0, "无", 0, EnumsPrefixConstants.AWARDS + 0), - /** - * V1 + * 黄宝 */ HEADER(2, 5, "一级", 0, EnumsPrefixConstants.AWARDS + 5), - /** - * V2 + * 绿宝 */ MANAGER(3, 10, "二级", 0, EnumsPrefixConstants.AWARDS + 10), - /** - * V3 + * 蓝宝 */ HIGH_MANAGER(4, 15, "三级", 0, EnumsPrefixConstants.AWARDS + 15), - /** - * V4 + * 钻石 */ SENIOR_MANAGER(5, 20, "四级", 0, EnumsPrefixConstants.AWARDS + 20), - /** - * V5 + * 黄钻 */ CHIEF(6, 25, "五级", 0, EnumsPrefixConstants.AWARDS + 25), - /** - * V6 + * 绿钻 */ HIGH_CHIEF(7, 30, "六级", 0, EnumsPrefixConstants.AWARDS + 30), - /** - * 董事 + * 星耀蓝钻 */ SENIOR_CHIEF(8, 35, "七级", 0, EnumsPrefixConstants.AWARDS + 35), - /** - * 合伙人 + * 王者红钻 */ CHAIRMAN(9, 40, "八级", 0, EnumsPrefixConstants.AWARDS + 40), - - /** - * 荣誉董事 + * 传奇紫钻 */ HONOR_CHAIRMAN(10, 45, "九级", 0, EnumsPrefixConstants.AWARDS + 45), + + /** - * 全球董事 + * 10 */ GLOBAL_CHAIRMAN(11, 50, "十级", 0, EnumsPrefixConstants.AWARDS + 50), /** 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 b44e5280..2f29ee18 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 @@ -14,41 +14,35 @@ public enum EBonusItems { /** * 嗨粉直推 禁用 */ - HI_PINK(1, "嗨粉直推", 1, EnumsPrefixConstants.BONUS_ITEMS + 1), - + HI_PINK(1, "旧嗨粉直推", 1, EnumsPrefixConstants.BONUS_ITEMS + 1), /** * 启动卡直推 */ - BOOT_CARD(2, "启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2), - - /** - * 直推收益 - */ - DIRECT_INCOME(3, "直推收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 3), + BOOT_CARD(2, "旧启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2), /** * 拓展收益 */ - EXPANSION_INCOME(4, "拓展收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 4), + EXPANSION_INCOME(4, "旧拓展收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 4), /** * 辅导收益 */ - COACHING_INCOME(5, "辅导收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 5), + COACHING_INCOME(5, "旧辅导收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 5), /** * 分红收益 */ - DIVIDEND_INCOME(6, "分红收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 6), + DIVIDEND_INCOME(6, "旧分红收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 6), /** * 服务补贴 */ - SERVICE_SUBSIDIES(7, "服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), + SERVICE_SUBSIDIES(7, "旧服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), /** * 复购极差收益 */ - REPURCHASE_RANGE_INCOME(8, "复购极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), + REPURCHASE_RANGE_INCOME(8, "旧复购极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), /** * 消费拓展收益 */ - CONSUMPTION_EXPANSION_INCOME(9, "消费拓展收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 9), + CONSUMPTION_EXPANSION_INCOME(9, "旧消费拓展收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 9), /** * 商城重销 */ @@ -56,50 +50,75 @@ public enum EBonusItems { /** * 平台服务费 */ - PLATFORM_SERVICE_FEE(11, "平台服务费", 0, EnumsPrefixConstants.BONUS_ITEMS + 11), + PLATFORM_SERVICE_FEE(11, "旧平台服务费", 0, EnumsPrefixConstants.BONUS_ITEMS + 11), /** * 复购券 */ - REPURCHASE_COUPONS(12, "复购券", 0, EnumsPrefixConstants.BONUS_ITEMS + 12), + REPURCHASE_COUPONS(12, "旧复购券", 0, EnumsPrefixConstants.BONUS_ITEMS + 12), /** * 复购券均分收益 */ - REPURCHASE_COUPONS_SHARE(13, "复购券均分", 0, EnumsPrefixConstants.BONUS_ITEMS + 13), + REPURCHASE_COUPONS_SHARE(13, "旧复购券均分", 0, EnumsPrefixConstants.BONUS_ITEMS + 13), /** * 云代直推收益 修改为幸运收益 */ - CLOUD_AGENT_DIRECT_PUSH(14, "幸运收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 14), + CLOUD_AGENT_DIRECT_PUSH(14, "旧幸运收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 14), /** * 云代首购收益 修改为极差收益 */ - CLOUD_AGENT_FIRST_PURCHASE(15, "极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 15), + CLOUD_AGENT_FIRST_PURCHASE(15, "旧极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 15), /** * 云代复购收益 修改为平级收益 */ - CLOUD_AGENT_REPURCHASE(16, "平级收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 16), - + CLOUD_AGENT_REPURCHASE(16, "旧平级收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 16), /** * 店铺收益 */ - STORE_INCOME(23, "店铺收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 23), - + STORE_INCOME(23, "旧店铺收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 23), /** * 复购直推收益 修改为互助收益 */ - HELP_EACH_INCOME(24, "互助收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 24), + HELP_EACH_INCOME(24, "旧互助收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 24), + ////////////////////////////////////////////////// 新奖项 ////////////////////////////////////////////////// - RETAIL_RANGE_INCOME(25, "新零售极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 25), + /** + * 直推收益 -- 秒结，日奖 + */ + DIRECT_INCOME(3, "直推收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 3), + /** + * 平级收益（新零售平级收益） -- 秒结，日奖 + */ + RETAIL_SAME_LEVEL_INCOME(26, "平级收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 26), + /** + * 区域分红（新零售区域收益） -- 秒结，日奖 + */ + RETAIL_AREA_INCOME(27, "区域分红", 0, EnumsPrefixConstants.BONUS_ITEMS + 27), + /** + * 月度级差收益（新零售极差收益） -- 月结，月奖 + */ + RETAIL_RANGE_INCOME(25, "月度级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 25), + /** + * 复购级差收益（新） -- 月结，月奖 + */ + RETAIL_MONTH_REPURCHASE_INCOME(31, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31), + /** + * 月度分红 - 平均收益（新零售福利平均收益） -- 月结，月奖 + */ + RETAIL_BENEFIT_AVG_INCOME(28, "月度分红平均收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 28), + /** + * 月度分红 - 加权收益（新零售福利加权收益） -- 月结，月奖 + */ + RETAIL_BENEFIT_INCOME(29, "月度分红加权收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 29), + /** + * 培育津贴（新） -- 月结，月奖 + */ + RETAIL_COACHING_INCOME(32, "培育津贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 32), - RETAIL_SAME_LEVEL_INCOME(26, "新零售平级收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 26), - - RETAIL_AREA_INCOME(27, "新零售区域收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 27), - - RETAIL_BENEFIT_AVG_INCOME(28, "新零售福利平均收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 28), - - RETAIL_BENEFIT_INCOME(29, "新零售福利加权收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 29), - - RETAIL_BENEFIT_RANGE_INCOME(30, "新零售福利极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), + /** + * 旧新零售福利极差收益（新零售福利极差收益） + */ + RETAIL_BENEFIT_RANGE_INCOME(30, "旧新零售福利极差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java deleted file mode 100644 index 50ff29a0..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 意见反馈状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/6 11:27 - * @Classname: EFeedbackStatus - * @Package_name: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EFeedbackStatus { - - /** - * 已反馈 - */ - FEEDBACK_PROVIDED(1, "已反馈", 0, EnumsPrefixConstants.FEEDBACK_STATUS + 1), - - /** - * 未反馈 - */ - NO_FEEDBACK(2, "未反馈", 0, EnumsPrefixConstants.FEEDBACK_STATUS + 2); - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java deleted file mode 100644 index 55dd001e..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 意见反馈类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EFeedbackType { - - /** - * 业务咨询 - */ - BUSINESS(1, "业务咨询", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "1"), - - /** - * 平台BUG - */ - PLATFORM_BUG(2, "平台BUG", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "2"), - - /** - * 客服问题 - */ - CUSTOMER_QUESTION(3, "客服问题", 0,EnumsPrefixConstants.FEEDBACK_TYPE + "3"), - - /** - * 商品问题 - */ - COMMODITY_QUESTION(4, "商品问题", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "4"); - - /** - * 实际值 - */ - private final int value; - /** - * 显示标签 - */ - private final String label; - /** - * 是否启用（0=是,1=否） -- 来源EYesNo - */ - private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 94423f58..df85c634 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -26,32 +26,32 @@ public enum EGrade { LOGGED_OUT(-2, 0, "已注销", 1, EnumsPrefixConstants.ENU_CAT + 2, MemberFrameworkConstants.LOG_OFF), /** - * + * 顾客 */ START_UP(1, 20, "V0", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP), /** - * + * VIP */ HAI_FAN(2, 30, "V1", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink), /** - * 消费商 + * SVIP */ YOU_KE(3, 40, "V2", 0, EnumsPrefixConstants.GRADE + "40", MemberFrameworkConstants.YOU_KE), /** - * 卓越经销商 + * 卓越 */ MAKER(4, 50, "V3", 0, EnumsPrefixConstants.GRADE + "50", MemberFrameworkConstants.MAKER), /** - * 首席经销商 + * 首席 */ VIP(5, 60, "V4", 0, EnumsPrefixConstants.GRADE + "60", MemberFrameworkConstants.VIP), /** - * + * 合伙人 */ S_VIP(6, 70, "V5", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.S_VIP), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 51daa5fb..d5e19fc5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -203,8 +203,6 @@ public enum EOperationBusiness { MESSAGE_MANAGE("站内信"), - MEMBER_FEEDBACK("意见反馈"), - MESSAGE_CONFIG("站内信配置"), //////////////////// 财务管理 //////////////////// diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index af830287..50af7683 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -138,8 +138,6 @@ public enum EOperationModule { NOTICE_MANAGE("后台公告"), - MEMBER_FEEDBACK("意见反馈"), - NOTICE_RELEASE("发布公告"), MESSAGE_CONFIG("站内信配置"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java index 3c1f7b6a..5d96e02c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java @@ -1,23 +1,9 @@ -package com.hzs.common.core.enums;/** - * @Description: - * @Author: yuhui - * @Time: 2024/3/29 10:54 - * @Classname: ESaleModel - * @PackageName: com.hzs.common.core.enums - */ +package com.hzs.common.core.enums; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.core.enums - *@Author: yh - *@CreateTime: 2024-03-29 10:54 - *@Description: TODO - *@Version: 1.0 - */ @AllArgsConstructor @Getter public enum ESaleModel { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index b315a706..f45c9e4e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -57,13 +57,13 @@ public enum ESpecialArea { HAI_FUN_UPGRADE_ORDER(27, "海粉升级", 0, EnumsPrefixConstants.ORDER_TYPE + 27, 20, EMenuDetail.UPGRADE_HAI_FUN.getValue()), /** - * 新零售会员专区（注册+升级） + * 新零售会员专区（注册） */ - RETAIL_REGISTER(41, "新零售会员专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), + RETAIL_REGISTER(41, "新零售注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), /** - * 新零售会员专区（升级） -- 接口使用，前端不显示 + * 新零售会员专区（升级） */ - RETAIL_UPGRADE(42, "新零售升级专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 42, 42, -1), + RETAIL_UPGRADE(42, "新零售升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 42, 42, -1), /** * 新零售复购专区 */ @@ -75,8 +75,6 @@ public enum ESpecialArea { RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1), - RETAIL_SHOP_ORDER(47, "店铺专供", 0, EnumsPrefixConstants.SPECIAL_AREA + 47, 47, -1), - ; /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java index d8766596..eed91917 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 商品单位类型 - * @Author: yuhui - * @Time: 2022/9/2 14:03 - * @Classname: EUnit - * @PackageName: com.hzs.common.core.enums + * 商品单位类型 */ @AllArgsConstructor @Getter @@ -58,7 +54,7 @@ public enum EUnit { return BOX; } else if (ALONE.getValue() == value) { return ALONE; - }else if (PIECE.getValue() == value) { + } else if (PIECE.getValue() == value) { return PIECE; } return BOX; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java index d44df40d..39e4f7ff 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java @@ -7,25 +7,16 @@ import lombok.Getter; import java.math.BigDecimal; /** - * @Description: 新零售商品等级价格枚举 - * @Author: jiang chao - * @Time: 2024/12/12 13:49 - * @Classname: ERetailWaresPrice - * @PackageName: com.hzs.common.core.enums.retail + * 新零售商品等级价格枚举 */ @AllArgsConstructor @Getter public enum ERetailWaresPrice { - /** - * 2024.12.30 添加需求，第一盒固定209元 - */ -// FIRST(1, new BigDecimal("209")), - /** * V0（20） */ - V0(EGrade.START_UP.getValue(), new BigDecimal("499")), + V0(EGrade.START_UP.getValue(), new BigDecimal("399")), /** * V1（30） */ @@ -33,19 +24,19 @@ public enum ERetailWaresPrice { /** * V2（40） */ - V2(EGrade.YOU_KE.getValue(), new BigDecimal("359")), + V2(EGrade.YOU_KE.getValue(), new BigDecimal("399")), /** * V3（50） */ - V3(EGrade.MAKER.getValue(), new BigDecimal("309")), + V3(EGrade.MAKER.getValue(), new BigDecimal("399")), /** * V4（60） */ - V4(EGrade.VIP.getValue(), new BigDecimal("259")), + V4(EGrade.VIP.getValue(), new BigDecimal("399")), /** * V5（70） */ - V5(EGrade.S_VIP.getValue(), new BigDecimal("209")), + V5(EGrade.S_VIP.getValue(), new BigDecimal("399")), ; 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 bb49622c..7c1d4e58 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 @@ -1,6 +1,5 @@ package com.hzs.common.core.utils; -import com.hzs.common.core.constant.MyProductConstants; import com.hzs.common.core.constant.RetailProductConstants; import com.hzs.common.core.enums.ESystemType; @@ -19,13 +18,13 @@ public class BoxProductUtil { List productList = new ArrayList<>(0); if (null == systemType || ESystemType.ALL.getValue() == systemType) { - productList.addAll(RetailProductConstants.BOX_WARES_LIST); - productList.addAll(MyProductConstants.BOX_WARES_LIST); + productList.addAll(RetailProductConstants.BOX_PRODUCT_LIST); return productList; + } if (ESystemType.DEFAULT.getValue() == systemType) { // 新零售 - productList = RetailProductConstants.BOX_WARES_LIST; + productList = RetailProductConstants.BOX_PRODUCT_LIST; } return productList; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java index ef4c755c..ff8bf2e9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java @@ -1,11 +1,7 @@ package com.hzs.common.core.utils; /** - * @Description: 生成指定规则的编号 - * @Author: yuhui - * @Time: 2022/10/27 17:19 - * @Classname: CreateNormsCodeUtils - * @PackageName: com.hzs.common.core.utils + * 生成指定规则的编号 */ public class CreateNormsCodeUtils { @@ -13,47 +9,37 @@ public class CreateNormsCodeUtils { * 产品前缀 */ private static final String CP = "CP"; + /** + * 商品前缀 + */ private static final String SP = "SP"; /** * 生成产品规则的编号 + * * @return */ - public static String createProductCode(String lastProductCode){ - if (StringUtils.isNotBlank(lastProductCode)){ -// String code = lastProductCode.substring(2); -// int numberCode = Integer.parseInt(code) + 1; -// return String.format(CP + "%05d", numberCode); - return SP+System.currentTimeMillis(); - }else { - String code = "00001"; - return CP+code; + public static String createProductCode(String lastProductCode) { + if (StringUtils.isNotBlank(lastProductCode)) { + return SP + System.currentTimeMillis(); + } else { + String code = "000001"; + return CP + code; } } /** * 生成商品规则的编号 + * * @return */ - public static String createWaresCode(String lastWaresCode){ - if (StringUtils.isNotBlank(lastWaresCode)){ - // String code = lastWaresCode.replace(SP, ""); - // String code = DateUtils.parseDateToFormat(DateUtils.YAMMERERS, DateUtils.currentDate()); - // int numberCode = Integer.parseInt(code) ; - // return String.format(SP + "%05d", numberCode); - return SP+System.currentTimeMillis(); - }else { - String code = "00001"; - return SP+code; + public static String createWaresCode(String lastWaresCode) { + if (StringUtils.isNotBlank(lastWaresCode)) { + return SP + System.currentTimeMillis(); + } else { + String code = "000001"; + return SP + code; } } - public static void main(String[] args) { - int serialNumber = 1; // 假设序号从1开始 - String formattedString = String.format("%05d", serialNumber); - System.out.println(formattedString); // 输出: 00001 - String str = "TG00032"; - int number = Integer.parseInt(str.replaceAll("[^\\d]", "")); - System.out.println(number); // 输出 31 - } } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java index d6ec0b9e..8cef6955 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java @@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * @description: 新零售极差实体 - * @author: sui q - * @time: 2024/12/9 13:54 - * @classname: CuMemberRetailRangeExt - * @package_name: com.hzs.common.domain.member.achieve.ext - * version 1.0.0 + * 新零售极差实体 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java index 1158f7fc..033eb08e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 秒接日志记录表 - *

- * - * @author hzs - * @since 2024-12-27 */ @Data @EqualsAndHashCode(callSuper = true) @@ -62,5 +57,4 @@ public class CuMemberRetailLog extends BaseEntity { @TableField("RETRY_NUM") private Integer retryNum; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java index 35279ee1..722db93a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java @@ -2,23 +2,20 @@ package com.hzs.common.domain.member.detail; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import com.hzs.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.Accessors; - /** - *

* 会员信息-等级升级记录 - *

- * - * @author hzs - * @since 2022-10-11 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java index 88b770ae..a331f646 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java @@ -1,19 +1,11 @@ package com.hzs.common.domain.sale.ext; -import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.domain.sale.wares.BdWaresDetail; import lombok.*; import java.math.BigDecimal; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/16 16:41 - * @Classname: BdWaresDetailsExt - * @PackageName: com.hzs.common.domain.sale.ext - */ @EqualsAndHashCode(callSuper = true) @Data @Builder @@ -102,12 +94,12 @@ public class BdWaresDetailExt extends BdWaresDetail { private Integer waresQuantity; /** - * 是否创客礼包 + * 是否创客礼包 */ private Integer isMakerGift; /** - * 消费配置主键 + * 消费配置主键 */ private Integer pkSpecialCurrency; @@ -141,7 +133,6 @@ public class BdWaresDetailExt extends BdWaresDetail { */ private Integer pkProductBas; - /** * 单位 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java index cb3d9e85..adb7205b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java @@ -11,11 +11,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 商品扩展表 - * @Author: sui q - * @Time: 2022/9/16 11:11 - * @Classname: BdWaresExt - * @PackageName: com.hzs.common.domain.sale.ext + * 商品扩展表 */ @EqualsAndHashCode(callSuper = true) @Data @@ -52,7 +48,7 @@ public class BdWaresExt extends BdWares { private Integer isOceanTrans; /** - * 是否创客礼包 + * 是否创客礼包 */ private Integer isMakerGift; @@ -174,11 +170,6 @@ public class BdWaresExt extends BdWares { */ private BigDecimal retailPrice; - /** - * 发起人收益（目前复购使用）保存为美金 - */ - private BigDecimal makerIncome; - /** * 消费配置主键 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java index f25e74ab..5e7569a9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java @@ -9,12 +9,7 @@ import org.apache.ibatis.type.JdbcType; import java.math.BigDecimal; /** - *

* 销售订单-明细表 - *

- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java index 6ca6a17d..62d91e0b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProduct.java @@ -170,4 +170,10 @@ public class BdProduct extends BaseEntity { @TableField("SYSTEM_TYPE") private Integer systemType; + /** + * 仓储产品编号 + */ + @TableField("WMS_CODE") + private String wmsCode; + } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java index c5e9f022..3fd6f49d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java @@ -13,12 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 产品基本设置 - *

- * - * @author hzs - * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = true) @@ -60,7 +55,6 @@ public class BdProductBas extends BaseEntity { private Integer unit; - /** * 长 以厘米作为单位 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index 65cf0b46..c7882dd9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java @@ -14,9 +14,6 @@ import lombok.experimental.Accessors; /** * 商品发布 - * - * @author hzs - * @since 2022-09-08 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java index f3b75db8..a64c55a1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 商品特殊邮费配置 - *

- * - * @author hzs - * @since 2023-10-27 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java index 6f6f56aa..1abc620c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 规格sku表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java deleted file mode 100644 index 7064c15c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.domain.system.base; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 意见反馈 - *

- * - * @author hzs - * @since 2023-02-05 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_FEEDBACK") -@KeySequence("BD_FEEDBACK_SEQ") -public class BdFeedback extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 会员主键 - */ - @TableField("PK_MEMBER") - private Long pkMember; - - /** - * 类型：1：业务 2：平台BUG 3：客服问题 4：商品问题 - */ - @TableField("TYPE") - private Integer type; - - /** - * 意见 - */ - @TableField("IDEA") - private String idea; - - - /** - * 状态（1：已反馈 2：未反馈"） - */ - @TableField("STATUS") - private Integer status; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java deleted file mode 100644 index f32dd0b3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.common.domain.system.base; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 意见反馈回复 - *

- * - * @author hzs - * @since 2023-04-25 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_FEEDBACK_REPLY") -@KeySequence("BD_FEEDBACK_REPLY_SEQ") -public class BdFeedbackReply extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 主表ID - */ - @TableField("PK_FEEDBACK_ID") - private Long pkFeedbackId; - - /** - * 回复内容 - */ - @TableField("REPLY_CONTENT") - private String replyContent; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java index 7051895f..471a531b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 新零售极差等级配置表 - *

- * - * @author hzs - * @since 2025-02-13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java deleted file mode 100644 index e0613f01..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.hzs.common.domain.system.base.BdFeedback; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 意见反馈 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/5 14:55 - * @Classname: BdFeedbackExt - * @Package_name: com.hzs.common.domain.system.ext - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class BdFeedbackExt extends BdFeedback { - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 会员昵称 - */ - private String nickName; - - - /** - * 会员头像 - */ - private String headPath; - /** - * 体系名称 - */ - private String vertexName; - /** - * 团队名称 - */ - private String teamName; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/sms/TSmsRecord.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/sms/TSmsRecord.java index e051075e..fbbfbe59 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/sms/TSmsRecord.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/sms/TSmsRecord.java @@ -15,9 +15,6 @@ import java.util.Date; /** * 短信发送记录 - * - * @author hzs - * @since 2023-03-08 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java index fcccfae2..62297b45 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java @@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit; /** * token验证处理 - * - * @author hzs */ @Slf4j @Component diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 82004846..f7855c12 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -135,11 +135,11 @@ dg-java-sdk - - - com.alipay.sdk - alipay-sdk-java - + + + + + diff --git a/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java b/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java index a7710266..b52a49f5 100644 --- a/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/BonusSettleJob.java @@ -6,19 +6,13 @@ import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.time.temporal.ChronoUnit; import java.util.Date; /** - * @description: 每日奖金计算定时任务 - * @author: sui q - * @time: 2023/4/10 14:19 - * @classname: BonusSettleJob - * @package_name: com.hzs.third.job - * version 1.0.0 + * 每日奖金计算定时任务 */ @Component @Slf4j @@ -26,173 +20,124 @@ import java.util.Date; public class BonusSettleJob { @DubboReference - private IMemberSettleBonusApi memberBonusSettleApi; + IMemberSettleBonusApi iMemberSettleBonusApi; /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("backSettleBonus") -// @Scheduled(cron = "10 8 10 * * ?") public void backupsSettleBonusEveryday() { log.info("开始进行奖金结算"); - memberBonusSettleApi.backupsSettleBonusEveryday(); + iMemberSettleBonusApi.backupsSettleBonusEveryday(); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus") -// @Scheduled(cron = "10 8 10 * * ?") public void autoSettleBonusEveryday() { Date startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus1") public void autoSettleBonusEveryday1() { Date startDate = DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus2") public void autoSettleBonusEveryday2() { Date startDate = DateUtils.beforeDate(5, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus3") public void autoSettleBonusEveryday3() { Date startDate = DateUtils.beforeDate(4, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus4") -// @Scheduled(cron = "10 6 11 * * ?") public void autoSettleBonusEveryday4() { Date startDate = DateUtils.beforeDate(3, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus5") public void autoSettleBonusEveryday5() { Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /** * 奖金每天自动结算,计算前一天奖金 - * - * @return: void - * @Author: sui q - * @Date: 2023/3/4 13:48 */ @XxlJob("autoSettleBonus6") public void autoSettleBonusEveryday6() { Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); log.info("开始进行奖金结算"); - memberBonusSettleApi.autoCalculateBonus(startDate); + iMemberSettleBonusApi.autoCalculateBonus(startDate); } /* - * @description: 自动公布奖金 - * @author: sui q - * @date: 2023/4/24 14:26 - * @param: null null + * 自动公布奖金 **/ @XxlJob("autoPublishBonus") public void autoPublishBonusEveryday() { log.info("开始进行奖金公布"); - memberBonusSettleApi.autoPublishBonus(); + iMemberSettleBonusApi.autoPublishBonus(); log.info("奖金公布完成"); } /* - * @description: 自动发放奖金 - * @author: sui q - * @date: 2023/4/24 14:26 - * @param: null null + * 自动发放奖金 **/ @XxlJob("autoGrantBonus") -// @Scheduled(cron = "10 42 13 * * ?") public void autoGrantBonusEveryday() { log.info("开始进行奖金发放"); - memberBonusSettleApi.autoGrantBonus(); + iMemberSettleBonusApi.autoGrantBonus(); log.info("奖金发放完成"); } /* - * @description: 自动结算每日业绩，每月业绩，用于统计分析 - * @author: sui q - * @date: 2023/9/1 9:53 - * @param: null null + * 自动结算每日业绩，每月业绩，用于统计分析 **/ @XxlJob("autoSettleMember") -// @Scheduled(cron = "50 55 15 * * ?") public void autoSettleMemberAchieveEveryday() { log.info("开始进行会员业绩计算"); - memberBonusSettleApi.insertCuMemberAchieveByEveryDay(); + iMemberSettleBonusApi.insertCuMemberAchieveByEveryDay(); } /* - * @description: 自动结算每日业绩，每月业绩，用于统计分析 - * @author: sui q - * @date: 2023/9/1 9:53 - * @param: null null + * 自动结算每日业绩，每月业绩，用于统计分析 **/ @XxlJob("autoSecondBonus") public void autoSettleMemberBonusBySecond() { log.info("开始进行会员业绩计算"); - memberBonusSettleApi.calculateCuMemberRetailRangeBonusBySaOrder(); + iMemberSettleBonusApi.calculateCuMemberRetailRangeBonusBySaOrder(); } } diff --git a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java index 5fa4b8c1..bcac0ee7 100644 --- a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java @@ -9,12 +9,6 @@ import org.springframework.stereotype.Component; /** * 会员模块定时任务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/11 19:11 - * @Classname: CuMemberJob - * @Package_name: com.hzs.member.job */ @ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") @Component @@ -22,23 +16,22 @@ import org.springframework.stereotype.Component; public class CuMemberJob { @DubboReference - IMemberJobServiceApi memberJobServiceApi; + IMemberJobServiceApi iMemberJobServiceApi; /** * 定时插入账户详情数据 */ @XxlJob("insertAccountDetail") public void insertAccountDetail() { - memberJobServiceApi.insertAccountDetail(); + iMemberJobServiceApi.insertAccountDetail(); } - /** * 自动提现 */ @XxlJob("automaticWithdrawal") public void automaticWithdrawal() { - memberJobServiceApi.automaticWithdrawal(); + iMemberJobServiceApi.automaticWithdrawal(); } } diff --git a/bd-third/src/main/java/com/hzs/third/job/MemberJob.java b/bd-third/src/main/java/com/hzs/third/job/MemberJob.java index db7e9dc7..ec526c21 100644 --- a/bd-third/src/main/java/com/hzs/third/job/MemberJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/MemberJob.java @@ -10,7 +10,6 @@ import com.hzs.member.statis.ICuBonusStatisServiceApi; import com.hzs.member.statis.ICuBonusVertexStatisServiceApi; import com.hzs.report.stat.IMemberReportServiceApi; import com.hzs.retail.member.IMemberRetailApi; -import com.hzs.system.config.IBdBarCodeServiceApi; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -20,32 +19,22 @@ import org.springframework.stereotype.Component; import java.time.temporal.ChronoUnit; import java.util.Date; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.third.job - * @Author: yh - * @CreateTime: 2023-04-27 09:31 - * @Description: - * @Version: 1.0 - */ @ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") @Component @Slf4j public class MemberJob { @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; + @DubboReference + IMemberRetailApi iMemberRetailApi; @DubboReference ICuBonusStatisServiceApi iCuBonusStatisServiceApi; @DubboReference ICuBonusVertexStatisServiceApi iCuBonusVertexStatisServiceApi; @DubboReference - IBdBarCodeServiceApi iBdBarCodeServiceApi; - @DubboReference ICuMemberRetailRegionServiceApi iCuMemberRetailRegionServiceApi; @DubboReference - IMemberRetailApi iMemberRetailApi; - @DubboReference IAcRetailPickLogServiceApi iAcRetailPickLogServiceApi; @DubboReference IMemberReportServiceApi iMemberReportServiceApi; @@ -83,11 +72,7 @@ public class MemberJob { } /** - * @description: 重算7天内奖金拨比 - * @author: zhang jing - * @date: 2023/12/11 10:45 - * @param: [] - * @return: void + * 重算7天内奖金拨比 **/ @XxlJob("rerun-bonus-statis") public void rerunCuBonusStatis() { @@ -109,11 +94,7 @@ public class MemberJob { } /** - * @description: 7天重算顶点奖金拨比统计 - * @author: zhang jing - * @date: 2024/8/15 10:29 - * @param: [] - * @return: void + * 7天重算顶点奖金拨比统计 **/ @XxlJob("rerun-bonus-vertex-statis") public void rerunCuBonusVertexStatis() { @@ -134,43 +115,26 @@ public class MemberJob { } } - /** * 定时清除未使用的会员编号 */ @XxlJob("clear-member-empty-code") public void clearMemberEmptyCode() { log.info("clear-member-empty-code 开始执行!"); - Integer dataCount = memberServiceApi.clearMemberEmptyCode().getData(); + Integer dataCount = iMemberServiceApi.clearMemberEmptyCode().getData(); log.info("clear-member-empty-code 开始结束! 共处理：{}", dataCount); } /** - * 定时初始化条形码配置 - */ - @XxlJob("updatWarehouseLogJob") - public void updatWarehouseLogJob() { - /** - * 查询初始化条形码配置,将当前尾号初始化为初始尾号 - */ - iBdBarCodeServiceApi.updatWarehouseLog(); - } - - - /** - * @description: 定时修改到期的零售区域 - * @author: zhang jing - * @date: 2024/12/30 14:25 - * @param: [] - * @return: void + * 定时修改到期的零售区域 **/ @XxlJob("retail-region") public void retailRegion() { - Date date=new Date(); - Date startDate= DateUtils.beforeDate(2, ChronoUnit.DAYS, date); + Date date = new Date(); + Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); Date endDate = DateUtils.afterDate(1, ChronoUnit.DAYS, date); //批量修改已到期的会员收益区域 - iCuRegionAssessApi.validateHandAreaAssess(startDate,endDate); + iCuRegionAssessApi.validateHandAreaAssess(startDate, endDate); } /** @@ -191,11 +155,7 @@ public class MemberJob { } /** - * @description: 每月10号处理上个月提货赠送活动满足活动规则的数据 - * @author: zhang jing - * @date: 2025/2/6 10:59 - * @param: [] - * @return: void + * 每月10号处理上个月提货赠送活动满足活动规则的数据 **/ @XxlJob("deliveryLog") public void deliveryLog() { @@ -203,11 +163,7 @@ public class MemberJob { } /** - * @description: 统计直推会员金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 16:09 - * @param: [] - * @return: void + * 统计直推会员金额业绩盒数 **/ @XxlJob("sta-smount-box") public void pushAmountBoxmethod() { @@ -215,11 +171,7 @@ public class MemberJob { } /** - * @description: 重算7天统计直推会员金额业绩盒数 - * @author: zhang jing - * @date: 2023/12/11 10:45 - * @param: [] - * @return: void + * 重算7天统计直推会员金额业绩盒数 **/ @XxlJob("repeat-sta-smount-box") public void repeatPushAmountBoxmethod() { @@ -231,9 +183,7 @@ public class MemberJob { String startDateStr = (DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate)); //重算前6天的数据 iMemberReportServiceApi.repeatPushAmountBoxmethod(startDateStr, endDateStr); - } - } diff --git a/bd-third/src/main/java/com/hzs/third/job/OrderJob.java b/bd-third/src/main/java/com/hzs/third/job/OrderJob.java index 637be926..7cda2af6 100644 --- a/bd-third/src/main/java/com/hzs/third/job/OrderJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/OrderJob.java @@ -1,8 +1,6 @@ package com.hzs.third.job; -import com.hzs.member.account.IMemberJobServiceApi; import com.hzs.sale.order.ISaOrderServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -15,14 +13,14 @@ import org.springframework.stereotype.Component; public class OrderJob { @DubboReference - ISaOrderServiceApi orderServiceApi; + ISaOrderServiceApi iSaOrderServiceApi; /** * 定时关单 订单三十分钟未支付自动关闭 */ @XxlJob("autoCloseOrder") public void timingCloseOrder() { - orderServiceApi.closeOrder(); + iSaOrderServiceApi.closeOrder(); } } diff --git a/bd-third/src/main/java/com/hzs/third/job/ScmJob.java b/bd-third/src/main/java/com/hzs/third/job/ScmJob.java index 973601bb..13d0e365 100644 --- a/bd-third/src/main/java/com/hzs/third/job/ScmJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/ScmJob.java @@ -8,12 +8,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; /** - * @description: 供应链定时任务 - * @author: sui q - * @time: 2024/2/21 15:45 - * @classname: ScmJob - * @package_name: com.hzs.third.job - * version 1.0.0 + * 供应链定时任务 */ @Slf4j @ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") @@ -21,14 +16,13 @@ import org.springframework.stereotype.Component; public class ScmJob { @DubboReference - private IScmBillServiceApi scmBillServiceApi; + IScmBillServiceApi iScmBillServiceApi; /** * 更新单据号初始化值 */ -// @Scheduled(cron = "0 54 15 * * ?") @XxlJob("updateBillNo") public void updateBillNo() { - scmBillServiceApi.updateScmBillNoNextValue(); + iScmBillServiceApi.updateScmBillNoNextValue(); } } diff --git a/bd-third/src/main/java/com/hzs/third/job/SmsJob.java b/bd-third/src/main/java/com/hzs/third/job/SmsJob.java deleted file mode 100644 index a2f85063..00000000 --- a/bd-third/src/main/java/com/hzs/third/job/SmsJob.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.hzs.third.job; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.ESmsSendResult; -import com.hzs.common.core.enums.ESmsSendStatus; -import com.hzs.common.core.enums.ESmsSendType; -import com.hzs.common.domain.third.sms.TSmsRecord; -import com.hzs.third.sms.service.ITSmsRecordService; -import com.hzs.third.sms.util.SmsUtil; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 短信定时任务 - * @Author: jiang chao - * @Time: 2023/3/11 16:22 - * @Classname: SmsJob - * @PackageName: com.hzs.third.job - */ -@Slf4j -@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") -@Component -public class SmsJob { - - @Autowired - private ITSmsRecordService itSmsRecordService; - - /** - * 定时发送短信 - */ -// @Scheduled(cron = "0 * * * * ?") - @XxlJob("sendSms") - public void sendSms() { - log.info("定时发送短信任务开始!"); - - Date date = new Date(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("SEND_TYPE", ESmsSendType.SCHEDULED.getValue()); - queryWrapper.eq("SEND_STATUS", ESmsSendStatus.NOT_SEND.getValue()); - queryWrapper.le("SEND_TIME", date); - queryWrapper.orderByAsc(SystemFieldConstants.CREATION_TIME); - List list = itSmsRecordService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - log.info("本次共需要发送短信{}条", list.size()); - - for (TSmsRecord tSmsRecord : list) { - String str = SmsUtil.sendSms(tSmsRecord.getPhone(), tSmsRecord.getContent()); - if (null == str) { - // 发送成功 - tSmsRecord.setSendResult(ESmsSendResult.SUCCESS.getValue()); - } else { - tSmsRecord.setSendResult(ESmsSendResult.FAIL.getValue()); - } - tSmsRecord.setSendStatus(ESmsSendStatus.SEND.getValue()); - tSmsRecord.setPkModified(MagicNumberConstants.PK_ADMIN); - tSmsRecord.setModifiedTime(date); - itSmsRecordService.updateById(tSmsRecord); - } - } else { - log.info("本次没有需要发送的短信"); - } - - log.info("定时发送短信任务结束!"); - } - -} diff --git a/bd-third/src/main/java/com/hzs/third/job/WaresJob.java b/bd-third/src/main/java/com/hzs/third/job/WaresJob.java index 12b2cf81..7445f2e2 100644 --- a/bd-third/src/main/java/com/hzs/third/job/WaresJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/WaresJob.java @@ -4,27 +4,18 @@ import com.hzs.sale.wares.IWaresServiceApi; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import java.util.Date; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.third.job - * @Author: yh - * @CreateTime: 2023-06-01 10:44 - * @Description: TODO - * @Version: 1.0 - */ @Slf4j @ConditionalOnProperty(name = "xxl-job.start", havingValue = "true") @Component public class WaresJob { @DubboReference - private IWaresServiceApi waresServiceApi; + IWaresServiceApi iWaresServiceApi; /** * 商品自动上下架 @@ -32,14 +23,12 @@ public class WaresJob { @XxlJob("waresAutoLoadingJob") public void waresAutoLoadingJob() { // 修改符合 时间条件商品上架 - /** - * 获取当前时间 - */ + // 获取当前时间 Date currentTime = new Date(); // 自动上架 - waresServiceApi.updateByAutoStartAndAutoStart(currentTime); + iWaresServiceApi.updateByAutoStartAndAutoStart(currentTime); // 定时自动下架 - waresServiceApi.updateByAutoStartAndAutoEnd(currentTime); + iWaresServiceApi.updateByAutoStartAndAutoEnd(currentTime); } /** @@ -48,6 +37,6 @@ public class WaresJob { @XxlJob("waresPreSaleJob") public void waresPreSaleJob() { // 修改商品预售状态 - waresServiceApi.waresPreSale(); + iWaresServiceApi.waresPreSale(); } } diff --git a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java index 276081ae..a29c4357 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java +++ b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java @@ -1,11 +1,7 @@ package com.hzs.third.pay.constants; /** - * @Description: 支付配置常量 - * @Author: jiang chao - * @Time: 2022/11/17 9:59 - * @Classname: PayConfigConstants - * @PackageName: com.hzs.common.constant + * 支付配置常量 */ public class PayConfigConstants { diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java index 993b2664..9a9e4860 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java +++ b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java @@ -29,11 +29,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 统一支付控制器 - * @Author: jiang chao - * @Time: 2022/12/27 17:35 - * @Classname: PayController - * @PackageName: com.hzs.third.pay.controller + * 统一支付控制器 */ @Slf4j @RestController diff --git a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java index 38591d47..43e5821c 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java +++ b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java @@ -12,13 +12,9 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; /** - * @Description: 汇付新支付的启动配置 - * @Author: jiang chao - * @Time: 2024/12/5 11:09 - * @Classname: HuiFuLoadListener - * @PackageName: com.hzs.third.pay.listener + * 汇付新支付的启动配置 */ -@Component +//@Component @Slf4j public class HuiFuLoadListener implements ServletContextListener { diff --git a/bd-third/src/main/java/com/hzs/third/sms/controller/manage/SmsRecordController.java b/bd-third/src/main/java/com/hzs/third/sms/controller/manage/SmsRecordController.java index 5ec147a0..b6cf08dc 100644 --- a/bd-third/src/main/java/com/hzs/third/sms/controller/manage/SmsRecordController.java +++ b/bd-third/src/main/java/com/hzs/third/sms/controller/manage/SmsRecordController.java @@ -20,11 +20,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; /** - * @Description: 短信发送记录 - * @Author: jiang chao - * @Time: 2023/3/9 16:10 - * @Classname: SmsRecordController - * @PackageName: com.hzs.third.sms.controller + * 短信发送记录 */ @RestController @RequestMapping("/manage/sms-record/") @@ -39,7 +35,7 @@ public class SmsRecordController extends BaseController { * @param param * @return */ - @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_RECORD ,method = EOperationMethod.SELECT) + @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_RECORD, method = EOperationMethod.SELECT) @GetMapping("/list") public TableDataInfo list(SmsRecordQueryParam param) { startPage(); @@ -58,7 +54,7 @@ public class SmsRecordController extends BaseController { * @param response * @param param */ - @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_RECORD ,method = EOperationMethod.EXPORT) + @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_RECORD, method = EOperationMethod.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, SmsRecordQueryParam param) { List list = itSmsRecordService.queryList(param, SecurityUtils.getPkCountry()); @@ -78,7 +74,7 @@ public class SmsRecordController extends BaseController { * @param param * @return */ - @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_CREATE ,method = EOperationMethod.INSERT) + @Log(module = EOperationModule.SMS_CONFIG, business = EOperationBusiness.SMS_CREATE, method = EOperationMethod.INSERT) @PostMapping("/create") public AjaxResult create(@RequestBody SmsCreateParam param) { if (null == param.getTemplateId() || null == param.getSendScope() || null == param.getSendType()) { diff --git a/bd-third/src/main/java/com/hzs/third/sms/mapper/TSmsRecordMapper.java b/bd-third/src/main/java/com/hzs/third/sms/mapper/TSmsRecordMapper.java index 557a62c9..c4efc5da 100644 --- a/bd-third/src/main/java/com/hzs/third/sms/mapper/TSmsRecordMapper.java +++ b/bd-third/src/main/java/com/hzs/third/sms/mapper/TSmsRecordMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 短信发送记录 Mapper 接口 - * - * @author hzs - * @since 2023-03-08 */ public interface TSmsRecordMapper extends BaseMapper { diff --git a/bd-third/src/main/java/com/hzs/third/sms/service/ITSmsRecordService.java b/bd-third/src/main/java/com/hzs/third/sms/service/ITSmsRecordService.java index 6033782d..e2876f05 100644 --- a/bd-third/src/main/java/com/hzs/third/sms/service/ITSmsRecordService.java +++ b/bd-third/src/main/java/com/hzs/third/sms/service/ITSmsRecordService.java @@ -10,9 +10,6 @@ import java.util.List; /** * 短信发送记录 服务类 - * - * @author hzs - * @since 2023-03-08 */ public interface ITSmsRecordService extends IService { diff --git a/bd-third/src/main/java/com/hzs/third/sms/service/impl/TSmsRecordServiceImpl.java b/bd-third/src/main/java/com/hzs/third/sms/service/impl/TSmsRecordServiceImpl.java index 021b326d..352a7f02 100644 --- a/bd-third/src/main/java/com/hzs/third/sms/service/impl/TSmsRecordServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/sms/service/impl/TSmsRecordServiceImpl.java @@ -26,9 +26,6 @@ import java.util.*; /** * 短信发送记录 服务实现类 - * - * @author hzs - * @since 2023-03-08 */ @Service public class TSmsRecordServiceImpl extends ServiceImpl implements ITSmsRecordService { @@ -37,9 +34,9 @@ public class TSmsRecordServiceImpl extends ServiceImpl queryList(SmsRecordQueryParam param, Integer pkCountry) { diff --git a/bd-third/src/main/resources/application-online.properties b/bd-third/src/main/resources/application-online.properties new file mode 100644 index 00000000..736bcf26 --- /dev/null +++ b/bd-third/src/main/resources/application-online.properties @@ -0,0 +1,21 @@ + +### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； +xxl.job.admin.addresses=http://172.26.201.190:8181/xxl-admin + +# log config +logging.config=classpath:logback.xml + +### 执行器通讯TOKEN [选填]：非空时启用； +xxl.job.accessToken=retail_token_online +### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 +xxl.job.executor.appname=xxl-job-retail +### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 +xxl.job.executor.address= +### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； +xxl.job.executor.ip= +### 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； +xxl.job.executor.port=8985 +### 执行器运行日志文件存储磁盘路径 [选填] ：需要对该路径拥有读写权限；为空则使用默认路径； +xxl.job.executor.logpath=/home/logs/xxl-job/jobhandler +### 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能； +xxl.job.executor.logretentiondays=30 diff --git a/bd-third/src/main/resources/application-test.properties b/bd-third/src/main/resources/application-test.properties new file mode 100644 index 00000000..3477335d --- /dev/null +++ b/bd-third/src/main/resources/application-test.properties @@ -0,0 +1,23 @@ + +### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； +xxl.job.admin.addresses=http://172.26.201.166:8181/xxl-job-admin +## 本地 +##xxl.job.admin.addresses=http://192.168.31.139:8880/xxl-job-admin + +# log config +logging.config=classpath:logback.xml + +### 执行器通讯TOKEN [选填]：非空时启用； +xxl.job.accessToken=base_token +### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 +xxl.job.executor.appname=xxl-job-retail +### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 +xxl.job.executor.address= +### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； +xxl.job.executor.ip= +### 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； +xxl.job.executor.port=8985 +### 执行器运行日志文件存储磁盘路径 [选填] ：需要对该路径拥有读写权限；为空则使用默认路径； +xxl.job.executor.logpath=/home/logs/xxl-job/jobhandler +### 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能； +xxl.job.executor.logretentiondays=30 diff --git a/bd-third/src/main/resources/application.properties b/bd-third/src/main/resources/application.properties index 1fd9dce9..c735f2c9 100644 --- a/bd-third/src/main/resources/application.properties +++ b/bd-third/src/main/resources/application.properties @@ -1,6 +1,6 @@ ### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； -xxl.job.admin.addresses=http://101.200.218.207:9999/xxl-job-admin +xxl.job.admin.addresses=http://101.200.72.71:8181/xxl-job-admin ## 本地 ##xxl.job.admin.addresses=http://192.168.31.139:8880/xxl-job-admin @@ -10,7 +10,7 @@ logging.config=classpath:logback.xml ### 执行器通讯TOKEN [选填]：非空时启用； xxl.job.accessToken= ### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 -xxl.job.executor.appname=xxl-job-cloud-dev +xxl.job.executor.appname=xxl-job-retail ### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 xxl.job.executor.address= ### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； diff --git a/bin/clean.bat b/bin/clean.bat deleted file mode 100644 index 24c09741..00000000 --- a/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [Ϣ] target· -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat deleted file mode 100644 index c693ec06..00000000 --- a/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [Ϣ] Weḅwar/jarļ -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/bin/run-auth.bat b/bin/run-auth.bat deleted file mode 100644 index 0d0952af..00000000 --- a/bin/run-auth.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarAuth̡ -echo. - -cd %~dp0 -cd ../ruoyi-auth/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat deleted file mode 100644 index e43d60bc..00000000 --- a/bin/run-gateway.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarGateway̡ -echo. - -cd %~dp0 -cd ../ruoyi-gateway/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat deleted file mode 100644 index 6d89c905..00000000 --- a/bin/run-modules-file.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarModules-File̡ -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat deleted file mode 100644 index 0a4c3905..00000000 --- a/bin/run-modules-gen.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarModules-Gen̡ -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat deleted file mode 100644 index 443e59d0..00000000 --- a/bin/run-modules-job.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarModules-Job̡ -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat deleted file mode 100644 index 26db55e4..00000000 --- a/bin/run-modules-system.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarModules-System̡ -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat deleted file mode 100644 index 3e8e322b..00000000 --- a/bin/run-monitor.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] ʹJarMonitor̡ -echo. - -cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar - -cd bin -pause \ No newline at end of file diff --git a/pom.xml b/pom.xml index 119993dc..c33de852 100644 --- a/pom.xml +++ b/pom.xml @@ -314,12 +314,12 @@ ${huifu-new.version} - - - com.alipay.sdk - alipay-sdk-java - ${alipay.version} - + + + + + + @@ -446,7 +446,7 @@ 172.26.201.166:8848 - + 487f6929-777e-44b7-a9f9-479c6d8050e4 DEFAULT_GROUP diff --git a/文档/mybatis说明.txt b/文档/mybatis说明.txt index d8df68fd..8f76d9dc 100644 --- a/文档/mybatis说明.txt +++ b/文档/mybatis说明.txt @@ -2,3 +2,4 @@ mybatis 配置的 configuration 属性下添加: default-fetch-size: 100 说明： 修改mybatis默认提取数据大小（默认为10），修改后每次查询数据提取一次100条，大批量查询数数据时，减少与oracle数据库交互提高加载数据速度，但是数据库每次查询使用内存増大，需要谨慎使用，防止OOM +