angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-07-10 09:45:42 +08:00
parent 3e686a7798 340c542657
commit 1937ced88e
34 changed files with 249 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberTeamServiceApi.java
View File

@ -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<java.util.List < com.hzs.common.domain.system.config.BdAwards>>
* 根据国家查询隶属团队配置列表
**/
R<List<CuMemberTeamExt>> queryCuMemberTeam(Integer pkCountry);
@ -34,10 +26,7 @@ public interface IMemberTeamServiceApi {
R<Boolean> checkVertex(Integer pkVertex);
/*
* @description: 根据主键获得所属团队
* @author: sui q
* @date: 2023/4/25 9:17
* @param: null null
* 根据主键获得所属团队
**/
R<CuMemberTeamExt> getCuMemberTeamById(Long pkMember);

29
bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberTeamServiceProvider.java
View File

@ -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<java.util.List < com.hzs.common.domain.system.config.BdAwards>>
**/
@Override
public R<List<CuMemberTeamExt>> queryCuMemberTeam(Integer pkCountry) {
return R.ok(memberTeamService.queryCuMemberTeam(pkCountry));
return R.ok(iCuMemberTeamService.queryCuMemberTeam(pkCountry));
}
/**
* 根据体系id 查询是否有团队占用该体系
*
* @param pkVertex
* @return
*/
@Override
public R<Boolean> checkVertex(Integer pkVertex) {
return R.ok(memberTeamService.checkVertex(pkVertex));
return R.ok(iCuMemberTeamService.checkVertex(pkVertex));
}
@Override
public R<CuMemberTeamExt> 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<CuMemberTeam> list = memberTeamService.list(queryWrapper);
List<CuMemberTeam> list = iCuMemberTeamService.list(queryWrapper);
Map<Long, CuMemberTeam> resultMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(list)) {

143
bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdSubsidyController.java
View File

@ -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;
/**
* <p>
* 补贴比例表 前端控制器
* </p>
*
* @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<BdSubsidy> 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<BdSubsidy> 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);
}
}

68
bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexBonusController.java Normal file
View File

@ -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<BdVertexBonusExt> list = iBdVertexBonusService.listVertexBonus();
return getDataTable(list);
}
/**
* 新增体系配置
*
* @param bdVertexBonus
* @return
*/
@PostMapping("/save")
public AjaxResult save(@RequestBody BdVertexBonus bdVertexBonus) {
LambdaQueryWrapper<BdVertexBonus> 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));
}
}

56
bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdVertexController.java
View File

@ -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<VertexVo> list = vertexService.selectByList(vertex);
List<VertexVo> list = iBdVertexService.selectByList(vertex);
return getDataTable(list);
}
@ -81,19 +77,19 @@ public class BdVertexController extends BaseController {
LambdaQueryWrapper<BdVertex> 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<CuMember> member = memberServiceApi.getMember(vertexParam.getMemberCode());
R<CuMember> member = iMemberServiceApi.getMember(vertexParam.getMemberCode());
CuMember mb = member.getData();
if (mb == null) {
return AjaxResult.error("用户编号不存在");
}
LambdaQueryWrapper<BdVertex> 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<CuMember> member = memberServiceApi.getMember(vertexParam.getMemberCode());
R<CuMember> 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<BdVertex> 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<CuMember> member = memberServiceApi.getMember(vertex.getPkMember());
R<CuMember> 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<Boolean> mt = memberTeamServiceApi.checkVertex(pkId);
R<Boolean> 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<BdVertexExt> list = vertexService.queryBdVertexChild(SecurityUtils.getPkCountry(), SecurityUtils.getSystemType());
List<BdVertexExt> 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<BdVertex> qw = new LambdaQueryWrapper<>();
qw.eq(BdVertex::getPkCountry, SecurityUtils.getPkCountry());
List<BdVertex> list = vertexService.list(qw);
List<BdVertex> list = iBdVertexService.list(qw);
return AjaxResult.success(list);
}
}

17
bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdSubsidyMapper.java
View File

@ -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;
/**
* <p>
* 补贴比例表 Mapper 接口
* </p>
*
* @author zhangjing
* @since 2023-02-28
*/
public interface BdSubsidyMapper extends BaseMapper<BdSubsidy> {
}

21
bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexBonusMapper.java Normal file
View File

@ -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<BdVertexBonus> {
/**
* 查询配置列表
*
* @return
*/
List<BdVertexBonusExt> listVertexBonus();
}

13
bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java
View File

@ -11,9 +11,6 @@ import java.util.List;
/**
* 体系配置 Mapper 接口
*
* @author hzs
* @since 2022-10-31
*/
public interface BdVertexMapper extends BaseMapper<BdVertex> {
@ -34,10 +31,7 @@ public interface BdVertexMapper extends BaseMapper<BdVertex> {
List<BdVertex> 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<BdVertex> {
@Param("pkCountry") Integer pkCountry);
/*
* @description: 更新所属体系
* @author: sui q
* @date: 2023/4/25 10:52
* @param: null null
* 更新所属体系
**/
void updateBdVertexNullById(@Param("pkVertex") Integer pkVertex);

17
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdSubsidyService.java
View File

@ -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;
/**
* <p>
* 补贴比例表 服务类
* </p>
*
* @author zhangjing
* @since 2023-02-28
*/
public interface IBdSubsidyService extends IService<BdSubsidy> {
}

21
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexBonusService.java Normal file
View File

@ -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<BdVertexBonus> {
/**
* 查询配置列表
*
* @return
*/
List<BdVertexBonusExt> listVertexBonus();
}

8
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java
View File

@ -11,9 +11,6 @@ import java.util.Map;
/**
* 体系配置 服务类
*
* @author hzs
* @since 2022-10-31
*/
public interface IBdVertexService extends IService<BdVertex> {
@ -41,10 +38,7 @@ public interface IBdVertexService extends IService<BdVertex> {
List<BdVertex> queryListByUserId(Long userId);
/*
* @description: 根据主键更新所属体系
* @author: sui q
* @date: 2023/4/25 10:47
* @param: null null
* 根据主键更新所属体系
**/
void updateBdVertexById(Integer pkVertex);

20
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdSubsidyServiceImpl.java
View File

@ -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;
/**
* <p>
* 补贴比例表 服务实现类
* </p>
*
* @author zhangjing
* @since 2023-02-28
*/
@Service
public class BdSubsidyServiceImpl extends ServiceImpl<BdSubsidyMapper, BdSubsidy> implements IBdSubsidyService {
}

23
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexBonusServiceImpl.java Normal file
View File

@ -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<BdVertexBonusMapper, BdVertexBonus> implements IBdVertexBonusService {
@Override
public List<BdVertexBonusExt> listVertexBonus() {
return baseMapper.listVertexBonus();
}
}

9
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java
View File

@ -18,9 +18,6 @@ import java.util.Map;
/**
* 体系配置 服务实现类
*
* @author hzs
* @since 2022-10-31
*/
@Service
public class BdVertexServiceImpl extends ServiceImpl<BdVertexMapper, BdVertex> implements IBdVertexService {
@ -37,12 +34,6 @@ public class BdVertexServiceImpl extends ServiceImpl<BdVertexMapper, BdVertex> i
return resultMap;
}
/**
* 查询体系配置
*
* @param vertexParam
* @return
*/
@Override
public List<VertexVo> selectByList(VertexParam vertexParam) {
return baseMapper.selectByList(vertexParam);

15
bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdDeliveryCentreVO.java
View File

@ -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;
/**
* <p>
* 配送中心设置
* </p>
*
* @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;
}

104
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java
View File

@ -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<EnumEntity> 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<EnumEntity> 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<EnumEntity> 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() {

29
bd-business/bd-business-system/src/main/resources/mapper/system/config/BdSubsidyMapper.xml
View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.system.config.mapper.BdSubsidyMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdSubsidy">
<id column="PK_ID" property="pkId" />
<result column="PK_COUNTRY" property="pkCountry" />
<result column="CREATION_TIME" property="creationTime" />
<result column="MODIFIED_TIME" property="modifiedTime" />
<result column="PK_CREATOR" property="pkCreator" />
<result column="PK_MODIFIED" property="pkModified" />
<result column="DEL_FLAG" property="delFlag" />
<result column="SUBSIDY_PROPORTION" property="subsidyProportion" />
<result column="USAGE_STATUS" property="usageStatus" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
PK_COUNTRY,
CREATION_TIME,
MODIFIED_TIME,
PK_CREATOR,
PK_MODIFIED,
DEL_FLAG,
PK_ID, SUBSIDY_PROPORTION, USAGE_STATUS
</sql>
</mapper>

14
bd-business/bd-business-system/src/main/resources/mapper/system/config/BdVertexBonusMapper.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.system.config.mapper.BdVertexBonusMapper">
<!-- 查询配置列表 -->
<select id="listVertexBonus" resultType="com.hzs.common.domain.vertex.ext.BdVertexBonusExt">
select bvb.*, bv.vertex_name
from BD_VERTEX_BONUS bvb
left join bd_vertex bv
on bv.pk_id = bvb.pk_vertex
order by bvb.pk_vertex
</select>
</mapper>

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
View File

@ -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("前台菜单权限"),

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
View File

@ -324,8 +324,6 @@ public enum EOperationModule {
DELIVERYCENTRE("配送中心配置"),
BDSUBSIDY("补贴比例配置"),
MEMBER_AUTHORITY("会员礼包收货地址"),
POSTAGE_DELETE("商品邮费删除"),

29
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EVertexBonus.java Normal file
View File

@ -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;
}

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/BdBonusService.java
View File

@ -14,12 +14,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 服务补贴
* </p>
*
* @author hzs
* @since 2022-11-01
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -61,5 +56,4 @@ public class BdBonusService extends BaseEntity {
private String assessmentTypeVal;
}

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAgent.java
View File

@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* <p>
* 区代设置
* </p>
*
* @author zhangjing
* @since 2022-09-13
*/
@Data
@EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDifference.java
View File

@ -14,12 +14,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* <p>
* 一次性补差升级配置
* </p>
*
* @author zhangjing
* @since 2022-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDeliveryCentre.java
View File

@ -9,15 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* <p>
* 配送中心设置
* </p>
*
* @author zhangjing
* @since 2023-02-23
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdHistroyAwards.java
View File

@ -17,9 +17,6 @@ import lombok.experimental.Accessors;
/**
* 奖衔配置表
*
* @author hzs
* @since 2024-09-10
*/
@Data
@EqualsAndHashCode(callSuper = false)

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdLoopDetails.java
View File

@ -10,13 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 直推循环配置详情
* </p>
*
* @author zhangjing
* @since 2022-11-03
*/
@Data
@EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShare.java
View File

@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* <p>
* 分红配置
* </p>
*
* @author zhangjing
* @since 2022-09-22
*/
@Data
@EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShareDetail.java
View File

@ -11,12 +11,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* <p>
* 分红配置明细表
* </p>
*
* @author zhangjing
* @since 2022-09-26
*/
@Data
@EqualsAndHashCode(callSuper = true)

15
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdShop.java
View File

@ -17,12 +17,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 店铺配置
* </p>
*
* @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;

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSpecialCurrency.java
View File

@ -10,9 +10,6 @@ import lombok.experimental.Accessors;
/**
* 特殊消费配置
*
* @author hzs
* @since 2023-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

50
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdSubsidy.java
View File

@ -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;
/**
* <p>
* 补贴比例表
* </p>
*
* @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;
}

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/CuMemberTransferWhite.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 会员转账币种白名单
* </p>
*
* @author hzs
* @since 2024-07-03
* 会员转账币种白名单
*/
@Data
@EqualsAndHashCode(callSuper = true)

16
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/vertex/ext/BdVertexBonusExt.java Normal file
View File

@ -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;
}