From a7a51a1ba92d5a3528f754da608d7a8e41b7bcde Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 09:14:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?##=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/application-online.properties | 21 +++++++++++++++++ .../resources/application-test.properties | 23 +++++++++++++++++++ .../src/main/resources/application.properties | 4 ++-- pom.xml | 2 +- 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 bd-third/src/main/resources/application-online.properties create mode 100644 bd-third/src/main/resources/application-test.properties 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/pom.xml b/pom.xml index 119993dc..ffa78b77 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ 172.26.201.166:8848 - + a91fa65c-7ddd-43d6-9c5b-8253a32fd24a DEFAULT_GROUP From 52660426630963a1184670355dbdc71b8b96fb25 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 09:20:08 +0800 Subject: [PATCH 2/8] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4nacos=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffa78b77..c4d34d7a 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ 172.26.201.166:8848 - a91fa65c-7ddd-43d6-9c5b-8253a32fd24a + 487f6929-777e-44b7-a9f9-479c6d8050e4 DEFAULT_GROUP From 691766da645c22dd7b3bf40edba7bd4806b2183a Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 09:20:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=B3=A8=E9=87=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/MemberSettleBonusProvider.java | 47 ++++------ .../common/domain/third/sms/TSmsRecord.java | 3 - .../com/hzs/third/job/BonusSettleJob.java | 91 ++++--------------- .../java/com/hzs/third/job/CuMemberJob.java | 13 +-- .../java/com/hzs/third/job/MemberJob.java | 76 +++------------- .../main/java/com/hzs/third/job/OrderJob.java | 6 +- .../main/java/com/hzs/third/job/ScmJob.java | 12 +-- .../main/java/com/hzs/third/job/SmsJob.java | 76 ---------------- .../main/java/com/hzs/third/job/WaresJob.java | 21 +---- .../manage/SmsRecordController.java | 12 +-- .../third/sms/mapper/TSmsRecordMapper.java | 3 - .../third/sms/service/ITSmsRecordService.java | 3 - .../service/impl/TSmsRecordServiceImpl.java | 7 +- pom.xml | 2 +- 14 files changed, 71 insertions(+), 301 deletions(-) delete mode 100644 bd-third/src/main/java/com/hzs/third/job/SmsJob.java 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-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-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/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/pom.xml b/pom.xml index ffa78b77..c4d34d7a 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ 172.26.201.166:8848 - a91fa65c-7ddd-43d6-9c5b-8253a32fd24a + 487f6929-777e-44b7-a9f9-479c6d8050e4 DEFAULT_GROUP From 309d12a97c3e3191ee1a7a945b724af8f369bad8 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 10:37:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/stat/IMemberReportServiceApi.java | 31 +++++-------------- .../provider/MemberReportServiceProvider.java | 31 ++++--------------- 2 files changed, 13 insertions(+), 49 deletions(-) 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-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(); } From 45a4599ccc31fafacc9bb799d98d3bd7b7be2b18 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 10:37:44 +0800 Subject: [PATCH 5/8] =?UTF-8?q?##=20=E5=9B=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=EF=BC=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E8=83=BD=E4=BD=BF=E7=94=A8=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=99=BB=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RetailMemberLoginServiceImpl.java | 62 +++++++++---------- .../security/service/MemberTokenService.java | 2 - 2 files changed, 29 insertions(+), 35 deletions(-) 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-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 From 8adde9fc1d44ec2355b8ca7841142198f2244370 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 10:46:08 +0800 Subject: [PATCH 6/8] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4get-info=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E5=88=A4=E6=96=AD=E9=80=89=E6=8B=A9=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E8=A1=80=E7=BC=98?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E4=B8=9A=E7=BB=A930=E4=B8=87=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/api/RetailMemberController.java | 6 ++---- .../java/com/hzs/common/core/constant/SysConstants.java | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) 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-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 397ca9f5..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 @@ -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"); } From b9e01e1890670625f61917dc01a491a53009b4e0 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 9 Jun 2025 10:58:08 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat(msg):=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/msg/ActivityMsgConstants.java | 16 +- .../core/constant/msg/AreaMsgConstants.java | 4 +- .../core/constant/msg/BonusMsgConstants.java | 10 +- .../core/constant/msg/CommonMsgConstants.java | 14 +- .../core/constant/msg/ConfigMsgConstants.java | 552 +++++++++--------- .../constant/msg/DocumentMsgConstants.java | 32 +- .../constant/msg/FinanceMsgConstants.java | 180 +++--- .../core/constant/msg/MemberMsgConstants.java | 104 ++-- .../core/constant/msg/NoticeMsgConstants.java | 12 +- .../constant/msg/ProductMsgConstants.java | 62 +- .../constant/msg/SaOrderMsgConstants.java | 70 +-- .../core/constant/msg/SystemMsgConstants.java | 16 +- .../core/constant/msg/WaresMsgConstants.java | 16 +- 13 files changed, 544 insertions(+), 544 deletions(-) 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..b6cfc183 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,235 @@ 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 PHONE_LENGTH = "手机号码只能在6-20位之间！"; /** * 必输项不能为空 -- 必输项不能为空！ */ - 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 +248,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 = "商品编号不能为空"; } From bb335d88a3391376fafb46c1858477a27640957c Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 9 Jun 2025 11:13:54 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(msg):=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/common/core/constant/msg/MemberMsgConstants.java | 1 - 1 file changed, 1 deletion(-) 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 b6cfc183..b7755495 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 @@ -19,7 +19,6 @@ public static final String TOKEN_REPEAT_SUBMIT = "请求已经失效，请刷新 * 2024.06.21 兼容新需求，特殊账号联系方式长度不能超过30位 */ public static final String PHONE_LENGTH = "联系方式长度超长"; -public static final String PHONE_LENGTH = "手机号码只能在6-20位之间！"; /** * 必输项不能为空 -- 必输项不能为空！