From 18e072c3f242077d6b1df42227662e46551ff3a9 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 10 Jul 2025 09:45:32 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=B7=BB=E5=8A=A0=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E5=A5=96=E9=A1=B9=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/IMemberTeamServiceApi.java | 17 +-- .../provider/MemberTeamServiceProvider.java | 29 +--- .../manage/BdSubsidyController.java | 143 ------------------ .../manage/BdVertexBonusController.java | 68 +++++++++ .../controller/manage/BdVertexController.java | 56 +++---- .../system/config/mapper/BdSubsidyMapper.java | 17 --- .../config/mapper/BdVertexBonusMapper.java | 21 +++ .../system/config/mapper/BdVertexMapper.java | 13 +- .../config/service/IBdSubsidyService.java | 17 --- .../config/service/IBdVertexBonusService.java | 21 +++ .../config/service/IBdVertexService.java | 8 +- .../service/impl/BdSubsidyServiceImpl.java | 20 --- .../impl/BdVertexBonusServiceImpl.java | 23 +++ .../service/impl/BdVertexServiceImpl.java | 9 -- .../system/config/vo/BdDeliveryCentreVO.java | 15 +- .../enums/controller/EnumsController.java | 104 ++----------- .../mapper/system/config/BdSubsidyMapper.xml | 29 ---- .../system/config/BdVertexBonusMapper.xml | 14 ++ .../common/core/enums/EOperationBusiness.java | 6 +- .../common/core/enums/EOperationModule.java | 2 - .../hzs/common/core/enums/EVertexBonus.java | 29 ++++ .../common/domain/bonus/BdBonusService.java | 6 - .../common/domain/system/config/BdAgent.java | 5 - .../system/config/BdBonusDifference.java | 5 - .../system/config/BdDeliveryCentre.java | 7 - .../domain/system/config/BdHistroyAwards.java | 3 - .../domain/system/config/BdLoopDetails.java | 6 - .../common/domain/system/config/BdShare.java | 5 - .../domain/system/config/BdShareDetail.java | 5 - .../common/domain/system/config/BdShop.java | 15 +- .../system/config/BdSpecialCurrency.java | 3 - .../domain/system/config/BdSubsidy.java | 50 ------ .../system/config/CuMemberTransferWhite.java | 7 +- .../domain/vertex/ext/BdVertexBonusExt.java | 16 ++ 34 files changed, 249 insertions(+), 545 deletions(-) delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdSubsidyController.java create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexBonusController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdSubsidyMapper.java create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexBonusMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdSubsidyService.java create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexBonusService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdSubsidyServiceImpl.java create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexBonusServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/config/BdSubsidyMapper.xml create mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/config/BdVertexBonusMapper.xml create mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EVertexBonus.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSubsidy.java create mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/ext/BdVertexBonusExt.java diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java index 6ecb1ffb..af4365c3 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java @@ -8,20 +8,12 @@ import java.util.List; import java.util.Map; /** - * @description: 根据国家查询隶属团队配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询隶属团队配置列表api **/ public interface IMemberTeamServiceApi { /** - * @description: 根据国家查询隶属团队配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询隶属团队配置列表 **/ R> queryCuMemberTeam(Integer pkCountry); @@ -34,10 +26,7 @@ public interface IMemberTeamServiceApi { R checkVertex(Integer pkVertex); /* - * @description: 根据主键获得所属团队 - * @author: sui q - * @date: 2023/4/25 9:17 - * @param: null null + * 根据主键获得所属团队 **/ R getCuMemberTeamById(Long pkMember); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java index 2a3874a9..fdce542f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java @@ -16,44 +16,27 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: 隶属团队配置 - * @author: zhang jing - * @date: 2022/11/10 17:02 - * @param: - * @return: + * 隶属团队配置 **/ @DubboService public class MemberTeamServiceProvider implements IMemberTeamServiceApi { @Autowired - private ICuMemberTeamService memberTeamService; + private ICuMemberTeamService iCuMemberTeamService; - /** - * @description: 根据国家查询隶属团队配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryCuMemberTeam(Integer pkCountry) { - return R.ok(memberTeamService.queryCuMemberTeam(pkCountry)); + return R.ok(iCuMemberTeamService.queryCuMemberTeam(pkCountry)); } - /** - * 根据体系id 查询是否有团队占用该体系 - * - * @param pkVertex - * @return - */ @Override public R checkVertex(Integer pkVertex) { - return R.ok(memberTeamService.checkVertex(pkVertex)); + return R.ok(iCuMemberTeamService.checkVertex(pkVertex)); } @Override public R getCuMemberTeamById(Long pkMember) { - return R.ok(memberTeamService.getCuMemberTeamById(pkMember)); + return R.ok(iCuMemberTeamService.getCuMemberTeamById(pkMember)); } @Override @@ -63,7 +46,7 @@ public class MemberTeamServiceProvider implements IMemberTeamServiceApi { queryWrapper.in(CuMemberTeam::getPkBdVertex, pkVertexList); } queryWrapper.orderByAsc(CuMemberTeam::getPkBdVertex); - List list = memberTeamService.list(queryWrapper); + List list = iCuMemberTeamService.list(queryWrapper); Map resultMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(list)) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdSubsidyController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdSubsidyController.java deleted file mode 100644 index d28a39f8..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdSubsidyController.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.hzs.system.config.controller.manage; - - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.config.BdSubsidy; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.config.service.IBdSubsidyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; - -/** - *

- * 补贴比例表 前端控制器 - *

- * - * @author zhangjing - * @since 2023-02-28 - */ -@RestController -@RequestMapping("/manage/bd-subsidy") -public class BdSubsidyController extends BaseController { - - @Autowired - private IBdSubsidyService subsidyService; - - /** - * @description: 查询补贴比例配置列表 - * @author: zhang jing - * @date: 2023/2/27 17:59 - * @param: [bdsubsidy] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.BDSUBSIDY, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(BdSubsidy bdsubsidy) { - List listVO = subsidyService.list(); - return getDataTable(listVO); - } - - /** - * @description: 新增补贴比例配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [shop] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDSUBSIDY, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody BdSubsidy subsidy) { - Integer pkCountry = SecurityUtils.getPkCountry(); - if (StringUtils.isNull(subsidy.getSubsidyProportion())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SUBSIDY_PROPORTION_NOT_NULL)); - } - subsidy.setPkCountry(pkCountry); - subsidy.setPkCreator(SecurityUtils.getUserId()); - subsidy.setCreationTime(new Date()); - return toAjax(subsidyService.save(subsidy)); - } - - /** - * @description: 修改补贴比例配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [shop] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDSUBSIDY, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody BdSubsidy subsidy) { - Integer pkCountry = SecurityUtils.getPkCountry(); - if (StringUtils.isNull(subsidy.getPkId())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - if (subsidy.getUsageStatus().intValue() != EYesNo.YES.getIntValue()) { - if (StringUtils.isNull(subsidy.getSubsidyProportion())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SUBSIDY_PROPORTION_NOT_NULL)); - } - } - subsidy.setPkCountry(pkCountry); - subsidy.setPkModified(SecurityUtils.getUserId()); - subsidy.setModifiedTime(new Date()); - return toAjax(subsidyService.updateById(subsidy)); - } - - /** - * @description: 查询单条补贴比例配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDSUBSIDY, method = EOperationMethod.SELECT) - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - if (StringUtils.isNull(pkId)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - BdSubsidy subsidy = subsidyService.getById(pkId); - return AjaxResult.success(subsidy); - } - - /** - * @description: 删除补贴比例配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDSUBSIDY, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - if (StringUtils.isNull(pkId)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - BdSubsidy subsidy = subsidyService.getById(pkId); - if (StringUtils.isNotNull(subsidy)) { - if (subsidy.getUsageStatus().intValue() == EYesNo.YES.getIntValue()) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE)); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - subsidyService.update(updateWrapper); - } - return toAjax(true); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexBonusController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexBonusController.java new file mode 100644 index 00000000..0b666ef4 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexBonusController.java @@ -0,0 +1,68 @@ +package com.hzs.system.config.controller.manage; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.domain.AjaxResult; +import com.hzs.common.core.web.page.TableDataInfo; +import com.hzs.common.domain.vertex.BdVertexBonus; +import com.hzs.common.domain.vertex.ext.BdVertexBonusExt; +import com.hzs.system.config.service.IBdVertexBonusService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 体系奖项配置 + */ +@Slf4j +@RestController +@RequestMapping("/manage/vertex-bonus") +public class BdVertexBonusController extends BaseController { + + @Autowired + private IBdVertexBonusService iBdVertexBonusService; + + /** + * 查询列表 + * + * @return + */ + @GetMapping("/list") + public TableDataInfo list() { + startPage(); + List list = iBdVertexBonusService.listVertexBonus(); + return getDataTable(list); + } + + /** + * 新增体系配置 + * + * @param bdVertexBonus + * @return + */ + @PostMapping("/save") + public AjaxResult save(@RequestBody BdVertexBonus bdVertexBonus) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BdVertexBonus::getPkVertex, bdVertexBonus.getPkVertex()); + wrapper.eq(BdVertexBonus::getBonusItems, bdVertexBonus.getBonusItems()); + if (iBdVertexBonusService.count(wrapper) > 0) { + return AjaxResult.error("数据已存在"); + } + iBdVertexBonusService.save(bdVertexBonus); + return AjaxResult.success(); + } + + /** + * 删除 + * + * @param pkId + * @return + */ + @DeleteMapping("/{pkId}") + public AjaxResult delete(@PathVariable Integer pkId) { + return AjaxResult.success(iBdVertexBonusService.removeById(pkId)); + } + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java index d8824331..57cb02e9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java @@ -33,11 +33,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 体系配置 - * @Author: yuhui - * @Time: 2022/11/1 11:11 - * @Classname: BdVertexController - * @PackageName: com.hzs.sale.vertex.controller.manage + * 体系配置 */ @Slf4j @RestController @@ -45,12 +41,12 @@ import java.util.List; public class BdVertexController extends BaseController { @Autowired - private IBdVertexService vertexService; + private IBdVertexService iBdVertexService; @DubboReference - IMemberTeamServiceApi memberTeamServiceApi; + IMemberTeamServiceApi iMemberTeamServiceApi; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; /** * 查询列表 @@ -63,7 +59,7 @@ public class BdVertexController extends BaseController { startPage(); vertex.setPkCountry(SecurityUtils.getPkCountry()); vertex.setSystemType(SecurityUtils.getSystemType()); - List list = vertexService.selectByList(vertex); + List list = iBdVertexService.selectByList(vertex); return getDataTable(list); } @@ -81,19 +77,19 @@ public class BdVertexController extends BaseController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BdVertex::getVertexName, vertexParam.getVertexName()); wrapper.eq(BdVertex::getSystemType, systemType); - if (vertexService.count(wrapper) > 0) { + if (iBdVertexService.count(wrapper) > 0) { // 体系名称已存在 return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.VERTEX_NAME_EXITS)); } // 会员编号检验是否存在 - R member = memberServiceApi.getMember(vertexParam.getMemberCode()); + R member = iMemberServiceApi.getMember(vertexParam.getMemberCode()); CuMember mb = member.getData(); if (mb == null) { return AjaxResult.error("用户编号不存在"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdVertex::getPkMember, mb.getPkId()); - if (vertexService.count(queryWrapper) > 0) { + if (iBdVertexService.count(queryWrapper) > 0) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_CODE_EXITS)); } @@ -104,7 +100,7 @@ public class BdVertexController extends BaseController { bdVertex.setPkMember(mb.getPkId()); bdVertex.setSystemType(systemType); bdVertex.setRegionVertexPkId(vertexParam.getRegionVertexPkId()); - vertexService.save(bdVertex); + iBdVertexService.save(bdVertex); return AjaxResult.success(); } @@ -122,12 +118,12 @@ public class BdVertexController extends BaseController { wrapper.eq(BdVertex::getVertexName, vertexParam.getVertexName()); wrapper.eq(BdVertex::getSystemType, systemType); wrapper.notIn(BdVertex::getPkId, vertexParam.getPkId()); - if (vertexService.count(wrapper) > 0) { + if (iBdVertexService.count(wrapper) > 0) { // 体系名称已存在 return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.VERTEX_NAME_EXITS)); } // 会员编号检验是否存在 - R member = memberServiceApi.getMember(vertexParam.getMemberCode()); + R member = iMemberServiceApi.getMember(vertexParam.getMemberCode()); CuMember mb = member.getData(); if (mb == null) { return AjaxResult.error("用户编号不存在"); @@ -135,7 +131,7 @@ public class BdVertexController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdVertex::getPkMember, mb.getPkId()); queryWrapper.notIn(BdVertex::getPkId, vertexParam.getPkId()); - if (vertexService.count(queryWrapper) > 0) { + if (iBdVertexService.count(queryWrapper) > 0) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_CODE_EXITS)); } BdVertex bdVertex = BeanUtil.copyProperties(vertexParam, BdVertex.class); @@ -146,7 +142,7 @@ public class BdVertexController extends BaseController { if (null == bdVertex.getPkParent()) { bdVertex.setPkParent(0); } - return toAjax(vertexService.updateById(bdVertex)); + return toAjax(iBdVertexService.updateById(bdVertex)); } /** @@ -157,9 +153,9 @@ public class BdVertexController extends BaseController { */ @GetMapping("/detail") public AjaxResult detail(Integer pkId) { - BdVertex vertex = vertexService.getById(pkId); + BdVertex vertex = iBdVertexService.getById(pkId); VertexVo vertexVo = BeanUtil.copyProperties(vertex, VertexVo.class); - R member = memberServiceApi.getMember(vertex.getPkMember()); + R member = iMemberServiceApi.getMember(vertex.getPkMember()); vertexVo.setMemberCode(member.getData().getMemberCode()); return AjaxResult.success(vertexVo); } @@ -173,7 +169,7 @@ public class BdVertexController extends BaseController { @Log(module = EOperationModule.SPECS_VERTEX_LIST, business = EOperationBusiness.VERTEX_CONFIG, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") public AjaxResult delete(@PathVariable Integer pkId) { - R mt = memberTeamServiceApi.checkVertex(pkId); + R mt = iMemberTeamServiceApi.checkVertex(pkId); if (mt.getData()) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.VERTEX_MEMBER_TEAM_REGISTER)); } @@ -182,7 +178,7 @@ public class BdVertexController extends BaseController { updateWrapper.set(BdVertex::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapper.set(BdVertex::getModifiedTime, new Date()); updateWrapper.set(BdVertex::getPkModified, SecurityUtils.getUserId()); - return AjaxResult.success(vertexService.update(updateWrapper)); + return AjaxResult.success(iBdVertexService.update(updateWrapper)); } /** @@ -196,7 +192,7 @@ public class BdVertexController extends BaseController { queryWrapper.eq(BdVertex::getPkCountry, SecurityUtils.getPkCountry()); queryWrapper.eq(BdVertex::getSystemType, SecurityUtils.getSystemType()); queryWrapper.orderByAsc(BdVertex::getVertexName); - return AjaxResult.success(vertexService.list(queryWrapper)); + return AjaxResult.success(iBdVertexService.list(queryWrapper)); } /** @@ -206,7 +202,7 @@ public class BdVertexController extends BaseController { */ @GetMapping("/vertex-child") public AjaxResult vertexChild() { - List list = vertexService.queryBdVertexChild(SecurityUtils.getPkCountry(), SecurityUtils.getSystemType()); + List list = iBdVertexService.queryBdVertexChild(SecurityUtils.getPkCountry(), SecurityUtils.getSystemType()); return AjaxResult.success(list); } @@ -222,20 +218,16 @@ public class BdVertexController extends BaseController { queryWrapper.in(BdVertex::getPkCountry, pkCountryList); queryWrapper.eq(BdVertex::getSystemType, SecurityUtils.getSystemType()); queryWrapper.orderByAsc(BdVertex::getVertexName); - return AjaxResult.success(vertexService.list(queryWrapper)); + return AjaxResult.success(iBdVertexService.list(queryWrapper)); } /** - * @description: 更新体系(隶属体系) - * @author: sui q - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 更新体系(隶属体系) **/ @Log(module = EOperationModule.SPECS_VERTEX_LIST, business = EOperationBusiness.VERTEX_CONFIG, method = EOperationMethod.RENEW) @GetMapping("/update-vertex/{pkVertex}") public AjaxResult updateVertex(@PathVariable Integer pkVertex) { - vertexService.updateBdVertexById(pkVertex); + iBdVertexService.updateBdVertexById(pkVertex); return AjaxResult.success(); } @@ -247,7 +239,7 @@ public class BdVertexController extends BaseController { @Log(module = EOperationModule.SPECS_VERTEX_LIST, business = EOperationBusiness.VERTEX_CONFIG, method = EOperationMethod.RENEW) @GetMapping("/flush-all") public AjaxResult flushAll() { - vertexService.flushAllVertex(SecurityUtils.getPkCountry(), SecurityUtils.getSystemType()); + iBdVertexService.flushAllVertex(SecurityUtils.getPkCountry(), SecurityUtils.getSystemType()); return AjaxResult.success(); } @@ -258,7 +250,7 @@ public class BdVertexController extends BaseController { public AjaxResult findVertex() { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(BdVertex::getPkCountry, SecurityUtils.getPkCountry()); - List list = vertexService.list(qw); + List list = iBdVertexService.list(qw); return AjaxResult.success(list); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdSubsidyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdSubsidyMapper.java deleted file mode 100644 index 17bec0be..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdSubsidyMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.config.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.config.BdSubsidy; - -/** - *

- * 补贴比例表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2023-02-28 - */ -public interface BdSubsidyMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexBonusMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexBonusMapper.java new file mode 100644 index 00000000..a401d6bf --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexBonusMapper.java @@ -0,0 +1,21 @@ +package com.hzs.system.config.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.common.domain.vertex.BdVertexBonus; +import com.hzs.common.domain.vertex.ext.BdVertexBonusExt; + +import java.util.List; + +/** + * 体系奖金配置(记录哪个体系走特殊奖金) Mapper 接口 + */ +public interface BdVertexBonusMapper extends BaseMapper { + + /** + * 查询配置列表 + * + * @return + */ + List listVertexBonus(); + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java index 538d4c38..5175809e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 体系配置 Mapper 接口 - * - * @author hzs - * @since 2022-10-31 */ public interface BdVertexMapper extends BaseMapper { @@ -34,10 +31,7 @@ public interface BdVertexMapper extends BaseMapper { List queryListByUserId(@Param("userId") Long userId); /* - * @description: 更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:52 - * @param: null null + * 更新所属体系 **/ void updateBdVertexById(@Param("pkMember") Long pkMember, @Param("pkVertex") Integer pkVertex); @@ -53,10 +47,7 @@ public interface BdVertexMapper extends BaseMapper { @Param("pkCountry") Integer pkCountry); /* - * @description: 更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:52 - * @param: null null + * 更新所属体系 **/ void updateBdVertexNullById(@Param("pkVertex") Integer pkVertex); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdSubsidyService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdSubsidyService.java deleted file mode 100644 index a18a8489..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdSubsidyService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.config.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.config.BdSubsidy; - -/** - *

- * 补贴比例表 服务类 - *

- * - * @author zhangjing - * @since 2023-02-28 - */ -public interface IBdSubsidyService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexBonusService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexBonusService.java new file mode 100644 index 00000000..4add7730 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexBonusService.java @@ -0,0 +1,21 @@ +package com.hzs.system.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.common.domain.vertex.BdVertexBonus; +import com.hzs.common.domain.vertex.ext.BdVertexBonusExt; + +import java.util.List; + +/** + * 体系奖金配置(记录哪个体系走特殊奖金) 服务类 + */ +public interface IBdVertexBonusService extends IService { + + /** + * 查询配置列表 + * + * @return + */ + List listVertexBonus(); + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java index 45bf5fb4..3b0af007 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java @@ -11,9 +11,6 @@ import java.util.Map; /** * 体系配置 服务类 - * - * @author hzs - * @since 2022-10-31 */ public interface IBdVertexService extends IService { @@ -41,10 +38,7 @@ public interface IBdVertexService extends IService { List queryListByUserId(Long userId); /* - * @description: 根据主键更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:47 - * @param: null null + * 根据主键更新所属体系 **/ void updateBdVertexById(Integer pkVertex); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdSubsidyServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdSubsidyServiceImpl.java deleted file mode 100644 index 1a1440b2..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdSubsidyServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.config.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.config.BdSubsidy; -import com.hzs.system.config.mapper.BdSubsidyMapper; -import com.hzs.system.config.service.IBdSubsidyService; -import org.springframework.stereotype.Service; - -/** - *

- * 补贴比例表 服务实现类 - *

- * - * @author zhangjing - * @since 2023-02-28 - */ -@Service -public class BdSubsidyServiceImpl extends ServiceImpl implements IBdSubsidyService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexBonusServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexBonusServiceImpl.java new file mode 100644 index 00000000..8b648819 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexBonusServiceImpl.java @@ -0,0 +1,23 @@ +package com.hzs.system.config.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.domain.vertex.BdVertexBonus; +import com.hzs.common.domain.vertex.ext.BdVertexBonusExt; +import com.hzs.system.config.mapper.BdVertexBonusMapper; +import com.hzs.system.config.service.IBdVertexBonusService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 体系奖金配置(记录哪个体系走特殊奖金) 服务实现类 + */ +@Service +public class BdVertexBonusServiceImpl extends ServiceImpl implements IBdVertexBonusService { + + @Override + public List listVertexBonus() { + return baseMapper.listVertexBonus(); + } + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java index 2568ec1f..144cc1c5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java @@ -18,9 +18,6 @@ import java.util.Map; /** * 体系配置 服务实现类 - * - * @author hzs - * @since 2022-10-31 */ @Service public class BdVertexServiceImpl extends ServiceImpl implements IBdVertexService { @@ -37,12 +34,6 @@ public class BdVertexServiceImpl extends ServiceImpl i return resultMap; } - /** - * 查询体系配置 - * - * @param vertexParam - * @return - */ @Override public List selectByList(VertexParam vertexParam) { return baseMapper.selectByList(vertexParam); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdDeliveryCentreVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdDeliveryCentreVO.java index 21fbe813..6ddfc634 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdDeliveryCentreVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdDeliveryCentreVO.java @@ -6,19 +6,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; /** - *

* 配送中心设置 - *

- * - * @author zhangjing - * @since 2023-02-23 */ @Data -public class BdDeliveryCentreVO{ +public class BdDeliveryCentreVO { private static final long serialVersionUID = 1L; @@ -121,11 +115,6 @@ public class BdDeliveryCentreVO{ */ private Integer pkCountry; - /** - * 补贴比例 - */ - private Long pkSubsidy; - /** * 国家 */ @@ -144,6 +133,4 @@ public class BdDeliveryCentreVO{ private String countyName; - - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index d1d96ef5..ccbb926b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -596,11 +596,6 @@ public class EnumsController extends BaseController { /** * 条码状态 - * - * @author: zhang jing - * @date: 2022/9/30 15:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/barcode-status") public AjaxResult barcodeStatus() { @@ -613,11 +608,6 @@ public class EnumsController extends BaseController { /** * 会员类型 - * - * @author: zhang jing - * @date: 2022/9/30 16:26 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/customerTypeList") public AjaxResult getECustomerTypeList() { @@ -630,11 +620,6 @@ public class EnumsController extends BaseController { /** * 发货方式 - * - * @author: zhang jing - * @date: 2022/9/30 16:28 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/delivery-list") public AjaxResult deliveryList(Integer pkCountry) { @@ -655,11 +640,6 @@ public class EnumsController extends BaseController { /** * 发货状态 - * - * @author: zhang jing - * @date: 2022/9/30 16:30 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/delivery-status") public AjaxResult deliveryStatus() { @@ -672,11 +652,6 @@ public class EnumsController extends BaseController { /** * 首页banner类型枚举类 - * - * @author: zhang jing - * @date: 2022/10/13 11:27 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/getEHomeBannerTypeList") public AjaxResult getEHomeBannerTypeList() { @@ -689,11 +664,6 @@ public class EnumsController extends BaseController { /** * 转账特殊设置枚举 - * - * @author: zhang jing - * @date: 2022/10/21 9:58 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/getETransferSpecialList") public AjaxResult getETransferSpecialList() { @@ -706,11 +676,6 @@ public class EnumsController extends BaseController { /** * 用户状态枚举 - * - * @author: zhang jing - * @date: 2022/10/21 17:39 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/getEUserStatusList") public AjaxResult getEUserStatusList() { @@ -723,11 +688,6 @@ public class EnumsController extends BaseController { /** * 钱包状态枚举 - * - * @author: zhang jing - * @date: 2022/10/21 17:41 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/get-sallet-status") public AjaxResult getEWalletStatusList() { @@ -740,11 +700,6 @@ public class EnumsController extends BaseController { /** * 商品权限类型枚举 - * - * @author: zhang jing - * @date: 2022/10/21 17:44 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/getEWaresPermissionTypeList") public AjaxResult getEWaresPermissionTypeList() { @@ -757,11 +712,6 @@ public class EnumsController extends BaseController { /** * 是否经销商枚举类 - * - * @author: zhang jing - * @date: 2022/10/21 17:46 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/dealer-yes-no") public AjaxResult dealerYesNo() { @@ -774,11 +724,6 @@ public class EnumsController extends BaseController { /** * 系统是否枚举类 - * - * @author: zhang jing - * @date: 2022/10/21 17:46 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/yes-no") public AjaxResult yesNo() { @@ -842,7 +787,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** * 供应方式 * @@ -1143,38 +1087,26 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 订单状态(会员端) - * - * @return - */ - /* 2025年6月10日 删除获取订单状态接口 - @GetMapping("/order-status-api") - public AjaxResult orderStatusApi() { - List enumEntityList = new ArrayList<>(); - for (EOrderStatus value : EOrderStatus.values()) { - if (value.getValue() != EOrderStatus.SHIPPING.getValue() && value.getValue() != EOrderStatus.CANCEL.getValue()) { - // 会员端使用 已合单和已撤单 不显示 - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_STATUS)); - } - } - return AjaxResult.success(enumEntityList); - } - */ - /** * 奖项枚举类 - * - * @author: zhang jing - * @date: 2022/11/9 19:54 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/bonus-items") public AjaxResult bonusItems() { List enumEntityList = new ArrayList<>(); for (EBonusItems value : EBonusItems.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.BONUS_ITEMS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); + } + return AjaxResult.success(enumEntityList); + } + + /** + * 体系奖项枚举类 + **/ + @GetMapping("/vertex-bonus-items") + public AjaxResult vertexBonusItems() { + List enumEntityList = new ArrayList<>(); + for (EVertexBonus value : EVertexBonus.values()) { + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } @@ -1199,11 +1131,6 @@ public class EnumsController extends BaseController { /** * 公布日期、发布日期、可提现日期 枚举 - * - * @author: zhang jing - * @date: 2022/11/9 19:55 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/publish-date") public AjaxResult publishDate() { @@ -1216,11 +1143,6 @@ public class EnumsController extends BaseController { /** * 奖结算周期枚举 - * - * @author: zhang jing - * @date: 2022/11/9 19:56 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/settlement-cycle") public AjaxResult settlementCycle() { diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdSubsidyMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdSubsidyMapper.xml deleted file mode 100644 index 1e8b9dd2..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdSubsidyMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - DEL_FLAG, - PK_ID, SUBSIDY_PROPORTION, USAGE_STATUS - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdVertexBonusMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdVertexBonusMapper.xml new file mode 100644 index 00000000..20d2cad4 --- /dev/null +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdVertexBonusMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 700c264c..f3bb3c13 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -277,7 +277,6 @@ public enum EOperationBusiness { REGISTER_CONFIG("注册页面配置"), - TRADE_WHITE_CONFIG("交易白名单配置"), AGREEMENT_RENEWAL_WHITE("协议续约白名单"), @@ -285,6 +284,7 @@ public enum EOperationBusiness { TRANSFER_ACCOUNT_WHITE("转账账户白名单"), CU_MEMBER_RETAIL_REGION("会员收益区域配置"), + NOT_USED_REGION_AREA("未使用收益区域"), //////////////////// 营销管理 //////////////////// @@ -328,10 +328,6 @@ public enum EOperationBusiness { AREA_CONFIG("行政区划"), - INTERCONTINENTAL_CONFIG("洲际配置"), - - REGION_CONFIG("区域配置"), - ADMIN_CONFIG("系统管理员"), MENU_AUTHORITY_FRONT("前台菜单权限"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index 9fb9ebea..382c46c4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -324,8 +324,6 @@ public enum EOperationModule { DELIVERYCENTRE("配送中心配置"), - BDSUBSIDY("补贴比例配置"), - MEMBER_AUTHORITY("会员礼包收货地址"), POSTAGE_DELETE("商品邮费删除"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EVertexBonus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EVertexBonus.java new file mode 100644 index 00000000..ff217933 --- /dev/null +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EVertexBonus.java @@ -0,0 +1,29 @@ +package com.hzs.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 奖项配置枚举 + */ +@AllArgsConstructor +@Getter +public enum EVertexBonus { + + /** + * 复购级差收益 -- 秒结,日奖 + */ + REPURCHASE_RANGE_INCOME(8, "复购级差收益"), + + ; + + /** + * 实际值 + */ + private final int value; + /** + * 显示标签 + */ + private final String label; + +} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/BdBonusService.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/BdBonusService.java index 4f1a1572..a7e15944 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/BdBonusService.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/BdBonusService.java @@ -14,12 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 服务补贴 - *

- * - * @author hzs - * @since 2022-11-01 */ @Data @EqualsAndHashCode(callSuper = true) @@ -61,5 +56,4 @@ public class BdBonusService extends BaseEntity { private String assessmentTypeVal; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgent.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgent.java index fcece8ae..6e40e2dd 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgent.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgent.java @@ -12,12 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 区代设置 - *

- * - * @author zhangjing - * @since 2022-09-13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDifference.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDifference.java index 0441cb05..5293940d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDifference.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDifference.java @@ -14,12 +14,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 一次性补差升级配置 - *

- * - * @author zhangjing - * @since 2022-11-02 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDeliveryCentre.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDeliveryCentre.java index f18d1604..a6a8ba89 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDeliveryCentre.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDeliveryCentre.java @@ -9,15 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.math.BigDecimal; - /** - *

* 配送中心设置 - *

- * - * @author zhangjing - * @since 2023-02-23 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdHistroyAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdHistroyAwards.java index 9b3a3583..c5faef6b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdHistroyAwards.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdHistroyAwards.java @@ -17,9 +17,6 @@ import lombok.experimental.Accessors; /** * 奖衔配置表 - * - * @author hzs - * @since 2024-09-10 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdLoopDetails.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdLoopDetails.java index 6bc7be26..4cd2b7c3 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdLoopDetails.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdLoopDetails.java @@ -10,13 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 直推循环配置详情 - - *

- * - * @author zhangjing - * @since 2022-11-03 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShare.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShare.java index 2a94fdaf..6d1a9d0d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShare.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShare.java @@ -12,12 +12,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 分红配置 - *

- * - * @author zhangjing - * @since 2022-09-22 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShareDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShareDetail.java index 2f226190..9dcaf282 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShareDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShareDetail.java @@ -11,12 +11,7 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - *

* 分红配置明细表 - *

- * - * @author zhangjing - * @since 2022-09-26 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShop.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShop.java index 6d105da6..48c30ead 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShop.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShop.java @@ -17,12 +17,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 店铺配置 - *

- * - * @author zhangjing - * @since 2022-09-15 */ @Data @EqualsAndHashCode(callSuper = true) @@ -42,7 +37,7 @@ public class BdShop extends BaseEntity { /** * 配送等级 */ - @Excel(name = "配送等级",sort=1) + @Excel(name = "配送等级", sort = 1) @TableField("SHOP_NAME") private String shopName; @@ -68,14 +63,14 @@ public class BdShop extends BaseEntity { /** * 结算业绩 */ - @Excel(name = "结算金额/业绩",sort=5) + @Excel(name = "结算金额/业绩", sort = 5) @TableField("SETTLE_VALUE") private BigDecimal settleValue; /** * 配送费 */ - @Excel(name = "配送费%",sort=6) + @Excel(name = "配送费%", sort = 6) @TableField("DELIVERY_FEE") private BigDecimal deliveryFee; @@ -88,13 +83,13 @@ public class BdShop extends BaseEntity { /** * 注册金额 */ - @Excel(name = "注册金额$",sort=2) + @Excel(name = "注册金额$", sort = 2) @TableField("REGISTER_VALUE") private BigDecimal registerValue; /** * 生效日期 */ - @Excel(name = "生效时间",sort=7,dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "生效时间", sort = 7, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("EFFECTIVE_DATE") private Date effectiveDate; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSpecialCurrency.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSpecialCurrency.java index 55bdd36c..247fd554 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSpecialCurrency.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSpecialCurrency.java @@ -10,9 +10,6 @@ import lombok.experimental.Accessors; /** * 特殊消费配置 - * - * @author hzs - * @since 2023-07-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSubsidy.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSubsidy.java deleted file mode 100644 index e5c353e2..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSubsidy.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.common.domain.system.config; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * 补贴比例表 - *

- * - * @author zhangjing - * @since 2023-02-28 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_SUBSIDY") -@KeySequence("BD_SUBSIDY_SEQ") -public class BdSubsidy extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 补贴比例 - */ - @TableField("SUBSIDY_PROPORTION") - private BigDecimal subsidyProportion; - - /** - * 启用状态 0启用 1 未启用 - */ - @TableField("USAGE_STATUS") - private Integer usageStatus; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/CuMemberTransferWhite.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/CuMemberTransferWhite.java index 6c1ed6e6..75ccd143 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/CuMemberTransferWhite.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/CuMemberTransferWhite.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

- * 会员转账币种白名单 - *

- * - * @author hzs - * @since 2024-07-03 + * 会员转账币种白名单 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/ext/BdVertexBonusExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/ext/BdVertexBonusExt.java new file mode 100644 index 00000000..89228169 --- /dev/null +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/ext/BdVertexBonusExt.java @@ -0,0 +1,16 @@ +package com.hzs.common.domain.vertex.ext; + +import com.hzs.common.domain.vertex.BdVertexBonus; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class BdVertexBonusExt extends BdVertexBonus { + + /** + * 体系名称 + */ + private String vertexName; + +}