angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 等级修改、0元注册、删除空点相关接口调整；

This commit is contained in:
cabbage 2025-06-17 15:43:29 +08:00
parent bdc917dce4
commit b371c4e4b3
23 changed files with 202 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java
View File

@ -31,14 +31,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/
CuMember getMember(String memberCode);
/**
* 获取会员缓存
*
* @param pkId 会员的主键
* @return CuMember
*/
CuMember getMember(Long pkId);
/**
* 更新会员奖衔根据临时表
*

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java
View File

@ -33,14 +33,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryLoginMember(memberCode, null);
}
@Override
public CuMember getMember(Long pkId) {
if (pkId == null) {
return null;
}
return baseMapper.queryLoginMember(null, pkId);
}
@Override
public void updateCuMemberByPeriod(List<CuMemberSettleExt> enoughAwardsMember, Integer period) {
baseMapper.updateCuMemberByPeriod(period);

116
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java
View File

@ -1,6 +1,5 @@
package com.hzs.bonus.bonus.controller.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@ -32,30 +31,21 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
* 秒接日志记录表 前端控制器
* </p>
*
* @author hzs
* @since 2025-01-03
* 注水盒数 前端控制器
*/
@RestController
@RequestMapping("/manage/special")
public class CuMemberSpeRetailController extends BaseController {
@Autowired
private ICuMemberService cuMemberService;
private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberSpeRetailService cuMemberSpeRetailService;
private ICuMemberSpeRetailService iCuMemberSpeRetailService;
@Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
/**
* @description: 注水列表
* @author: zhang jing
* @date: 2025/1/3 16:27
* @param: [retailAreaParam]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 注水列表
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.SELECT)
@GetMapping("/list")
@ -63,16 +53,12 @@ public class CuMemberSpeRetailController extends BaseController {
startPage();
retailAreaParam.setSystemType(SecurityUtils.getSystemType());
retailAreaParam.setPkCountry(SecurityUtils.getPkCountry());
List<RetailAreaParam> list = cuMemberSpeRetailService.getCuMemberSpeRetail(retailAreaParam);
List<RetailAreaParam> list = iCuMemberSpeRetailService.getCuMemberSpeRetail(retailAreaParam);
return getDataTable(list);
}
/**
* @description: 新增注水
* @author: zhang jing
* @date: 2025/1/3 15:00
* @param: [retailAreaParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 新增注水
**/
@PostMapping("/save")
@RepeatSubmitSimple
@ -85,19 +71,15 @@ public class CuMemberSpeRetailController extends BaseController {
if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
return AjaxResult.error("团队盒数需大于小区盒数");
}
//校验团队总盒数大于小区盒数
if (retailAreaParam.getSmallAreaPv().compareTo(retailAreaParam.getTotalTeamPv()) > 0) {
return AjaxResult.error("团队业绩需大于小区业绩");
}
//校验结算日期是否为空
if (StringUtils.isNull(retailAreaParam.getSettleDate())) {
return AjaxResult.error("结算日期不能为空");
}
if(cuMemberSpeRetailService.checkCuMemberActivate(retailAreaParam.getMemberCode())==0){
if (iCuMemberSpeRetailService.checkCuMemberActivate(retailAreaParam.getMemberCode()) == 0) {
return AjaxResult.error("会员未激活，不可注水");
}
Integer systemType = SecurityUtils.getSystemType();
CuMemberExt me = cuMemberService.getMemberByCode(retailAreaParam.getMemberCode());
CuMemberExt me = iCuMemberService.getMemberByCode(retailAreaParam.getMemberCode());
if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) {
return AjaxResult.error("会员信息不存在或已撤单");
}
@ -111,16 +93,16 @@ public class CuMemberSpeRetailController extends BaseController {
//查询最新期数
String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, retailAreaParam.getSettleDate());
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
retailAreaParam.setPeriod(period);
//校验是否已经注水
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper();
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper<>();
cmsrQw.eq(CuMemberSpeRetail::getMemberCode, retailAreaParam.getMemberCode());
cmsrQw.eq(CuMemberSpeRetail::getPeriod, period);
cmsrQw.eq(CuMemberSpeRetail::getSystemType, systemType);
int check = cuMemberSpeRetailService.count(cmsrQw);
int check = iCuMemberSpeRetailService.count(cmsrQw);
if (check > 0) {
return AjaxResult.error("会员已注水");
}
@ -130,15 +112,11 @@ public class CuMemberSpeRetailController extends BaseController {
cmsr.setPkCountry(SecurityUtils.getPkCountry());
cmsr.setPeriodDate(DateUtils.getStartTime(retailAreaParam.getSettleDate()));
cmsr.setSystemType(systemType);
return AjaxResult.success(cuMemberSpeRetailService.save(cmsr));
return AjaxResult.success(iCuMemberSpeRetailService.save(cmsr));
}
/**
* @description: 批量添加秒接日志记录表
* @author: zhang jing
* @date: 2025/1/3 13:48
* @param: [file]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 批量添加秒接日志记录表
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.IMPORT)
@PostMapping("/importData")
@ -173,23 +151,17 @@ public class CuMemberSpeRetailController extends BaseController {
errorlist.add(cma);
continue;
}
//校验团队总盒数大于小区盒数
if (cma.getSmallAreaPv().compareTo(cma.getTotalTeamPv()) > 0) {
cma.setMsg("团队业绩需大于小区业绩");
errorlist.add(cma);
continue;
}
if (!DateUtils.isLatestWeek(cma.getSettleDate(), new Date())) {
return AjaxResult.error("只能注水7天以内");
}
if(cuMemberSpeRetailService.checkCuMemberActivate(cma.getMemberCode())==0){
if (iCuMemberSpeRetailService.checkCuMemberActivate(cma.getMemberCode()) == 0) {
cma.setMsg("会员未激活，不可注水");
errorlist.add(cma);
continue;
}
//查询最新期数
String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cma.getSettleDate());
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
cma.setPeriod(period);
cma.setPeriodDate(DateUtils.getStartTime(cma.getSettleDate()));
@ -202,7 +174,7 @@ public class CuMemberSpeRetailController extends BaseController {
errorlist.add(cma);
continue;
}
CuMemberExt me = cuMemberService.getMemberByCode(cma.getMemberCode());
CuMemberExt me = iCuMemberService.getMemberByCode(cma.getMemberCode());
if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) {
cma.setMsg("会员信息不存在或已撤单");
errorlist.add(cma);
@ -214,11 +186,11 @@ public class CuMemberSpeRetailController extends BaseController {
continue;
}
//校验是否已经注水
LambdaUpdateWrapper<CuMemberSpeRetail> cmsr = new LambdaUpdateWrapper();
LambdaUpdateWrapper<CuMemberSpeRetail> cmsr = new LambdaUpdateWrapper<>();
cmsr.eq(CuMemberSpeRetail::getMemberCode, cma.getMemberCode());
cmsr.eq(CuMemberSpeRetail::getPeriod, period);
cmsr.eq(CuMemberSpeRetail::getSystemType, systemType);
int check = cuMemberSpeRetailService.count(cmsr);
int check = iCuMemberSpeRetailService.count(cmsr);
if (check > 0) {
cma.setMsg("会员已注水");
errorlist.add(cma);
@ -228,8 +200,8 @@ public class CuMemberSpeRetailController extends BaseController {
}
}
}
if(CollectionUtil.isNotEmpty(memberList)){
cuMemberSpeRetailService.batchSpeRetail(memberList, pkCountry, pkCreator);
if (CollectionUtil.isNotEmpty(memberList)) {
iCuMemberSpeRetailService.batchSpeRetail(memberList, pkCountry, pkCreator);
}
if (CollectionUtil.isNotEmpty(errorlist)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorlist);
@ -238,11 +210,7 @@ public class CuMemberSpeRetailController extends BaseController {
}
/**
* @description: 下载模板
* @author: zhang jing
* @date: 2023/4/11 17:45
* @param: [response]
* @return: void
* 下载模板
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.EXPORT)
@PostMapping("/download")
@ -253,17 +221,13 @@ public class CuMemberSpeRetailController extends BaseController {
}
/**
* @description: 查询单条新零售注水信息
* @author: zhang jing
* @date: 2025/1/3 15:43
* @param: [pkId]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 查询单条新零售注水信息
**/
@GetMapping("/getOne/{pkId}")
public AjaxResult getOne(@PathVariable Long pkId) {
RetailAreaParam param = new RetailAreaParam();
param.setPkId(pkId);
List<RetailAreaParam> retailAreaParam = cuMemberSpeRetailService.getCuMemberSpeRetail(param);
List<RetailAreaParam> retailAreaParam = iCuMemberSpeRetailService.getCuMemberSpeRetail(param);
if (!DateUtils.isLatestWeek(retailAreaParam.get(0).getSettleDate(), new Date())) {
return AjaxResult.error("只能修改7天以内注水");
}
@ -275,11 +239,7 @@ public class CuMemberSpeRetailController extends BaseController {
}
/**
* @description: 修改注水
* @author: zhang jing
* @date: 2025/1/3 15:59
* @param: [retailAreaParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 修改注水
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.UPDATE)
@PostMapping("/update")
@ -291,10 +251,6 @@ public class CuMemberSpeRetailController extends BaseController {
if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
return AjaxResult.error("团队盒数需大于小区盒数");
}
//校验团队总盒数大于小区盒数
if (retailAreaParam.getSmallAreaPv().compareTo(retailAreaParam.getTotalTeamPv()) > 0) {
return AjaxResult.error("团队业绩需大于小区业绩");
}
//校验结算日期是否为空
if (StringUtils.isNull(retailAreaParam.getSettleDate())) {
return AjaxResult.error("结算日期不能为空");
@ -303,7 +259,7 @@ public class CuMemberSpeRetailController extends BaseController {
if (!DateUtils.isLatestWeek(retailAreaParam.getSettleDate(), new Date())) {
return AjaxResult.error("只能注水7天以内");
}
CuMemberExt me = cuMemberService.getMemberByCode(retailAreaParam.getMemberCode());
CuMemberExt me = iCuMemberService.getMemberByCode(retailAreaParam.getMemberCode());
if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) {
return AjaxResult.error("会员信息不存在或已撤单");
}
@ -312,16 +268,16 @@ public class CuMemberSpeRetailController extends BaseController {
}
//查询最新期数
String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, retailAreaParam.getSettleDate());
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
retailAreaParam.setPeriod(period);
//校验是否已经注水
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper();
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper<>();
cmsrQw.eq(CuMemberSpeRetail::getMemberCode, retailAreaParam.getMemberCode());
cmsrQw.eq(CuMemberSpeRetail::getPeriod, period);
cmsrQw.ne(CuMemberSpeRetail::getPkId, retailAreaParam.getPkId());
int check = cuMemberSpeRetailService.count(cmsrQw);
int check = iCuMemberSpeRetailService.count(cmsrQw);
if (check > 0) {
return AjaxResult.error("会员已注水");
}
@ -329,31 +285,27 @@ public class CuMemberSpeRetailController extends BaseController {
cmsr.setPeriodDate(DateUtils.getStartTime(retailAreaParam.getSettleDate()));
cmsr.setPkModified(SecurityUtils.getUserId());
cmsr.setModifiedTime(new Date());
return AjaxResult.success(cuMemberSpeRetailService.updateById(cmsr));
return AjaxResult.success(iCuMemberSpeRetailService.updateById(cmsr));
}
/**
* @description: 删除注水
* @author: zhang jing
* @date: 2025/1/3 16:03
* @param: [pkId]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 删除注水
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.DELETE)
@DeleteMapping("/{pkId}")
public AjaxResult delete(@PathVariable Long pkId) {
RetailAreaParam param = new RetailAreaParam();
param.setPkId(pkId);
List<RetailAreaParam> retailAreaParam = cuMemberSpeRetailService.getCuMemberSpeRetail(param);
List<RetailAreaParam> retailAreaParam = iCuMemberSpeRetailService.getCuMemberSpeRetail(param);
if (!DateUtils.isLatestWeek(retailAreaParam.get(0).getSettleDate(), new Date())) {
return AjaxResult.error("只能删除7天以内注水");
}
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper();
LambdaUpdateWrapper<CuMemberSpeRetail> cmsrQw = new LambdaUpdateWrapper<>();
cmsrQw.eq(CuMemberSpeRetail::getPkId, pkId);
cmsrQw.set(CuMemberSpeRetail::getDelFlag, EDelFlag.DELETE.getValue());
cmsrQw.set(CuMemberSpeRetail::getPkModified, SecurityUtils.getUserId());
cmsrQw.set(CuMemberSpeRetail::getModifiedTime, new Date());
return AjaxResult.success(cuMemberSpeRetailService.update(cmsrQw));
return AjaxResult.success(iCuMemberSpeRetailService.update(cmsrQw));
}
}

14
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberSpeRetailMapper.java
View File

@ -8,23 +8,15 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 秒接日志记录表 Mapper 接口
* </p>
*
* @author hzs
* @since 2025-01-03
* 注水盒数 Mapper 接口
*/
public interface CuMemberSpeRetailMapper extends BaseMapper<CuMemberSpeRetail> {
/**
* @description: 获取注水列表
* @author: zhang jing
* @date: 2025/1/6 10:34
* @param: [param]
* @return: java.util.List<com.hzs.bonus.bonus.param.RetailAreaParam>
* 获取注水列表
**/
List<RetailAreaParam> getCuMemberSpeRetail(RetailAreaParam param);
int checkCuMemberActivate(@Param("memberCode") String memberCode);
}

33
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java
View File

@ -8,14 +8,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description: 大小区
* @author: sui q
* @time: 2025/1/3 10:17
* @classname: RetailAreaParam
* @package_name: com.hzs.bonus.bonus.param
* version 1.0.0
*/
@Data
public class RetailAreaParam implements Serializable {
@ -23,36 +15,24 @@ public class RetailAreaParam implements Serializable {
/**
* 会员编号
*/
@Excel(name = "会员编号" )
@Excel(name = "会员编号")
private String memberCode;
/**
* 团队总盒数
*/
@Excel(name = "团队总盒数" )
private Integer teamBoxNum=0;
@Excel(name = "团队总盒数")
private Integer teamBoxNum = 0;
/**
* 小区盒数
*/
@Excel(name = "小区盒数" )
private Integer smallBoxNum=0;
/**
* 团队总pv
*/
@Excel(name = "团队总业绩" )
private BigDecimal totalTeamPv=BigDecimal.ZERO;
/**
* 小区pv
*/
@Excel(name = "小区业绩" )
private BigDecimal smallAreaPv=BigDecimal.ZERO;
@Excel(name = "小区盒数")
private Integer smallBoxNum = 0;
/**
* 结算日期
*/
@Excel(name = "结算日期" )
@Excel(name = "结算日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date settleDate;
@ -73,7 +53,6 @@ public class RetailAreaParam implements Serializable {
*/
private Date periodDate;
/**
* 个人消费盒数
*/

30
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberSpeRetailService.java
View File

@ -3,45 +3,21 @@ package com.hzs.bonus.bonus.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.bonus.bonus.param.RetailAreaParam;
import com.hzs.common.domain.member.bonus.CuMemberSpeRetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 秒接日志记录表 服务类
* </p>
*
* @author hzs
* @since 2025-01-03
* 注水盒数 服务类
*/
public interface ICuMemberSpeRetailService extends IService<CuMemberSpeRetail> {
/**
* @description: 批量添加秒接日志记录表
* @author: zhang jing
* @date: 2025/1/3 13:47
* @param: [list, pkCountry, pkCreator]
* @return: void
* 批量添加注水记录表
**/
void batchSpeRetail(List<RetailAreaParam> list, Integer pkCountry, Long pkCreator);
/*
* @description: 查询新零售特殊配置
* @author: sui q
* @date: 2025/1/3 13:35
* @param: null null
**/
List<CuMemberSpeRetail> queryCuMemberSpeRetail(Integer period);
/**
* @description: 获取注水列表
* @author: zhang jing
* @date: 2025/1/6 10:34
* @param: [param]
* @return: java.util.List<com.hzs.bonus.bonus.param.RetailAreaParam>
* 获取注水列表
**/
List<RetailAreaParam> getCuMemberSpeRetail(RetailAreaParam param);

36
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberSpeRetailServiceImpl.java
View File

@ -1,15 +1,12 @@
package com.hzs.bonus.bonus.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.bonus.mapper.CuMemberSpeRetailMapper;
import com.hzs.bonus.bonus.param.RetailAreaParam;
import com.hzs.bonus.bonus.service.ICuMemberSpeRetailService;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.member.bonus.CuMemberSpeRetail;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -17,32 +14,19 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.List;
/**
* <p>
* 秒接日志记录表 服务实现类
* </p>
*
* @author hzs
* @since 2025-01-03
* 注水盒数 服务实现类
*/
@Service
public class CuMemberSpeRetailServiceImpl extends ServiceImpl<CuMemberSpeRetailMapper, CuMemberSpeRetail> implements ICuMemberSpeRetailService {
@Override
public List<CuMemberSpeRetail> queryCuMemberSpeRetail(Integer period) {
QueryWrapper<CuMemberSpeRetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("period", period);
return baseMapper.selectList(queryWrapper);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void batchSpeRetail(List<RetailAreaParam> list,Integer pkCountry,Long pkCreator) {
List<CuMemberSpeRetail> cmsrList=new ArrayList<>();
Date date=new Date();
list.forEach(item ->{
CuMemberSpeRetail cmsr= BeanUtil.copyProperties(item, CuMemberSpeRetail.class);
public void batchSpeRetail(List<RetailAreaParam> list, Integer pkCountry, Long pkCreator) {
List<CuMemberSpeRetail> cmsrList = new ArrayList<>();
Date date = new Date();
list.forEach(item -> {
CuMemberSpeRetail cmsr = BeanUtil.copyProperties(item, CuMemberSpeRetail.class);
cmsr.setPeriodDate(DateUtils.getStartTime(item.getSettleDate()));
cmsr.setPkCountry(pkCountry);
cmsr.setPkCreator(pkCreator);
@ -52,13 +36,6 @@ public class CuMemberSpeRetailServiceImpl extends ServiceImpl<CuMemberSpeRetailM
this.saveBatch(cmsrList);
}
/**
* @description: 获取注水列表
* @author: zhang jing
* @date: 2025/1/6 10:34
* @param: [param]
* @return: java.util.List<com.hzs.bonus.bonus.param.RetailAreaParam>
**/
@Override
public List<RetailAreaParam> getCuMemberSpeRetail(RetailAreaParam param) {
return baseMapper.getCuMemberSpeRetail(param);
@ -69,5 +46,4 @@ public class CuMemberSpeRetailServiceImpl extends ServiceImpl<CuMemberSpeRetailM
return baseMapper.checkCuMemberActivate(memberCode);
}
}

12
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberSpeRetailMapper.xml
View File

@ -12,19 +12,17 @@
cmsr.small_area_pv smallAreaPv,
cmsp.SETTLE_DATE settleDate
FROM CU_MEMBER_SPE_RETAIL cmsr
INNER JOIN CU_MEMBER_SETTLE_PERIOD cmsp ON cmsp.pk_id=cmsr.period
where cmsr.DEL_FLAG=0
INNER JOIN CU_MEMBER_SETTLE_PERIOD cmsp ON cmsp.pk_id = cmsr.period
where cmsr.DEL_FLAG = 0
<if test="pkId!=null">
and cmsr.pk_id=#{pkId}
</if>
<if test="systemType!=null">
and cmsr.SYSTEM_TYPE=#{systemType}
</if>
<if test="pkCountry!=null">
and cmsr.pk_Country=#{pkCountry}
</if>
<if test="memberCode != null and memberCode != '' ">
and cmsr.member_code like #{memberCode} || '%'
</if>
@ -37,12 +35,12 @@
order by cmsr.CREATION_TIME desc
</select>
<!-- 校验会员是否激活-->
<!-- 校验会员是否激活-->
<select id="checkCuMemberActivate" resultType="java.lang.Integer">
SELECT count(1)
FROM CU_MEMBER cm
where cm.DEL_FLAG=0
AND cm.IS_ACTIVATE=0
where cm.DEL_FLAG = 0
AND cm.IS_ACTIVATE = 0
<if test="memberCode != null and memberCode != '' ">
and cm.member_code = #{memberCode}
</if>

15
bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java
View File

@ -18,9 +18,6 @@ import java.util.List;
/**
* 会员账户信息 Mapper 接口
*
* @author hzs
* @since 2022-08-11
*/
public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
@ -28,9 +25,6 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
* 查询会员账户状态，账户信息
*
* @param cuMemberAccount 会员账户条件信息
* @return: List<CuMemberAccountExt>
* @Author: sui q
* @Date: 2022/9/5 11:57
*/
List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
@ -48,9 +42,6 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
* 更新账户余额
*
* @param cuMemberAccount 会员账户表
* @return: Integer
* @Author: sui q
* @Date: 2022/9/21 21:42
*/
Integer updateMemberAccount(CuMemberAccount cuMemberAccount);
@ -214,9 +205,6 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
* 奖金发放，根据期间发放奖金，更新奖金余额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountGrantByPeriod(@Param("pkCountry") Integer pkCountry, @Param("startPeriod") Integer startPeriod,
@Param("endPeriod") Integer endPeriod);
@ -225,9 +213,6 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
* 奖金可提现，根据期间更新可提现金额，减少可消费金额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountWithdrawalByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry);

21
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java
View File

@ -14,9 +14,6 @@ import java.util.List;
/**
* 会员账户信息 服务类
*
* @author hzs
* @since 2022-08-11
*/
public interface ICuMemberAccountService extends IService<CuMemberAccount> {
@ -24,9 +21,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* 查询会员账户状态，账户信息
*
* @param cuMemberAccount 会员账户条件信息
* @return: List<CuMemberAccountExt>
* @Author: sui q
* @Date: 2022/9/5 11:57
*/
List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
@ -62,9 +56,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
*
* @param cuMemberAccount 会员账户表
* @param pkModified 修改人
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/21 21:42
*/
Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified);
@ -80,9 +71,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* 根据会员id 列表查询账户信息
*
* @param pkMemberList 列表
* @return: List<CuMemberAccount>
* @Author: sui q
* @Date: 2023/3/25 16:28
*/
List<CuMemberAccount> queryCuMemberAccountByPkMembers(List<Long> pkMemberList);
@ -264,9 +252,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* 奖金发放，根据期间发放奖金，更新奖金余额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod);
@ -274,9 +259,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* 奖金可提现，根据期间更新可提现金额，减少可消费金额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountWithdrawalByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry);
@ -315,9 +297,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* @param pkMember 会员账户
* @param pkApprove 审核人
* @param currentDateTime 当前时间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void deleteCuMemberAccountByPkMember(Long pkMember, Long pkApprove, Date currentDateTime);

56
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java
View File

@ -53,32 +53,24 @@ import java.util.stream.Collectors;
/**
* 会员账户信息 服务实现类
*
* @author hzs
* @since 2022-08-11
*/
@Service
@Slf4j
public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMapper, CuMemberAccount> implements ICuMemberAccountService {
@Autowired
private ICuMemberBaseService cuMemberBaseService;
private ICuMemberBaseService iCuMemberBaseService;
@Autowired
private ICuMemberService cuMemberService;
private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberAccountLogService cuMemberAccountLogService;
private ICuMemberAccountLogService iCuMemberAccountLogService;
@DubboReference
IApprovalServiceApi approvalServiceApi;
IApprovalServiceApi iApprovalServiceApi;
@DubboReference
ITransactionServiceApi transactionServiceApi;
IAccountServiceApi iAccountServiceApi;
@DubboReference
IAccountServiceApi accountServiceApi;
ITransactionServiceApi iTransactionServiceApi;
@Override
public List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount) {
@ -158,7 +150,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
CuMemberPetitionVO memberPetitionVo = new CuMemberPetitionVO();
SysUser loginUser = memberFrozenParam.getSysUser();
R<Map<Integer, ApprovalInfoDTO>> mapR = approvalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.FROZEN.getValue()), memberFrozenParam.getPkCountry());
R<Map<Integer, ApprovalInfoDTO>> mapR = iApprovalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.FROZEN.getValue()), memberFrozenParam.getPkCountry());
//批次号
String batchNum = CommonUtil.createSerialNumber(EOrderPrefix.FROZEN_CODE.getValue());
memberPetitionVo.setBusinessNo(batchNum);
@ -185,7 +177,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
//用户编号
List<String> memberCodes = memberFrozenParam.getMemberCodes();
List<CuMember> cuMemberList = cuMemberService.findMemberByMembercodesAndPkcountry(memberCodes, memberFrozenParam.getPkCountry());
List<CuMember> cuMemberList = iCuMemberService.findMemberByMembercodesAndPkcountry(memberCodes, memberFrozenParam.getPkCountry());
Map<String, CuMember> memberMap = cuMemberList.stream().collect(Collectors.toMap(CuMember::getMemberCode, o -> o));
for (String memberCode : memberCodes) {
for (CuMemberFrozenDetailParam frozenDetailParam : memberFrozenDetails) {
@ -194,7 +186,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
.lockConsume(frozenDetailParam.getLockConsume())
.lockTransfer(frozenDetailParam.getLockTransfer())
.lockWithdraw(frozenDetailParam.getLockWithdraw())
.pkAccount(cuMemberBaseService.translateAccountValue(frozenDetailParam.getMemberAccount()))
.pkAccount(iCuMemberBaseService.translateAccountValue(frozenDetailParam.getMemberAccount()))
.remarks(frozenDetailParam.getRemarks()).build();
memberFrozenAmountVOList.add(cuMemberFrozenAmountVO);
}
@ -264,7 +256,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
List<CuMemberWalletBalanceVO> memberWalletBalanceVOList = new ArrayList<>();
List<CuMemberRechargeAccountParam> cuMemberRechargeAccountParams = baseMapper.queryWalletBalanceByPkMember(pkMember);
//根据币种值查询币种
List<BdAccount> accounts = accountServiceApi.memberAccountByType(pkCountry).getData();
List<BdAccount> accounts = iAccountServiceApi.memberAccountByType(pkCountry).getData();
Map<Integer, BdAccount> accountMap = accounts.stream().collect(Collectors.toMap(BdAccount::getFieldValue, Function.identity()));
BigDecimal total = BigDecimal.ZERO;
if (CollUtil.isNotEmpty(cuMemberRechargeAccountParams)) {
@ -276,7 +268,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
memberWalletBalanceVO.setUnavailableBalance(memberRechargeAccountParam.getBalance().subtract(memberRechargeAccountParam.getAvailableBalance()));
total = total.add(memberRechargeAccountParam.getBalance());
memberWalletBalanceVO.setPkAccountId(bdAccount.getPkId());
memberWalletBalanceVO.setPkAccount(cuMemberBaseService.translateAccountValue(bdAccount.getPkId()));
memberWalletBalanceVO.setPkAccount(iCuMemberBaseService.translateAccountValue(bdAccount.getPkId()));
memberWalletBalanceVO.setIsRecharge(bdAccount.getIsRecharge());
memberWalletBalanceVO.setIsTransfer(bdAccount.getIsTransfer());
memberWalletBalanceVO.setIsWithdrawal(bdAccount.getIsWithdrawal());
@ -313,7 +305,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
public List<CuMemberAccountShowVO> selectAccountDetail(Long pkMember, Integer pkCountry) {
CuMemberAccountShowVO cuMemberAccountShowVO;
CuMemberAccount cuMemberAccount = this.queryCuMemberAccountByPkMember(pkMember);
List<BdAccount> bdAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry);
List<BdAccount> bdAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry);
List<CuMemberAccountShowVO> memberAccountShowVOList = new ArrayList<>();
for (BdAccount bdAccount : bdAccounts) {
cuMemberAccountShowVO = new CuMemberAccountShowVO();
@ -326,7 +318,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
cuMemberAccountShowVO.setSort(bdAccount.getSort());
memberAccountShowVOList.add(cuMemberAccountShowVO);
//翻译余额账户
String accountName = transactionServiceApi.readTransactionByCache(EnumsPrefixConstants.ACCOUNT + pkAccount, LocaleContextHolder.getLocale().toLanguageTag()).getData();
String accountName = iTransactionServiceApi.readTransactionByCache(EnumsPrefixConstants.ACCOUNT + pkAccount, LocaleContextHolder.getLocale().toLanguageTag()).getData();
cuMemberAccountShowVO.setAccountName(accountName);
}
return memberAccountShowVOList;
@ -341,18 +333,18 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
public List<CuMemberRechargeAccountParam> queryMemberAccountByMemberCode(String memberCode, List<Integer> accountTypes, Integer pkCountry) {
List<Integer> pkAccounts = new ArrayList<>();
for (Integer accountType : accountTypes) {
pkAccounts.add(cuMemberBaseService.getAccountValueById(accountType));
pkAccounts.add(iCuMemberBaseService.getAccountValueById(accountType));
}
List<CuMemberRechargeAccountParam> cuMemberRechargeAccountParams = baseMapper.queryMemberAccountByMemberCode(memberCode, pkAccounts, null);
if (CollUtil.isNotEmpty(cuMemberRechargeAccountParams)) {
List<BdAccount> accountList = cuMemberBaseService.getAccountByCountryId(pkCountry);
List<BdAccount> accountList = iCuMemberBaseService.getAccountByCountryId(pkCountry);
//币种value对应的币种对象
Map<Integer, BdAccount> accountMap = accountList.stream().collect(Collectors.toMap(BdAccount::getFieldValue, o -> o));
for (CuMemberRechargeAccountParam CuMemberRechargeAccountParam : cuMemberRechargeAccountParams) {
Integer accountType = CuMemberRechargeAccountParam.getAccountType();
Integer pkAccount = accountMap.get(accountType).getPkId();
CuMemberRechargeAccountParam.setPkAccount(pkAccount);
CuMemberRechargeAccountParam.setAccountType(cuMemberBaseService.translateAccountValue(pkAccount));
CuMemberRechargeAccountParam.setAccountType(iCuMemberBaseService.translateAccountValue(pkAccount));
}
}
return cuMemberRechargeAccountParams;
@ -365,7 +357,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
for (Integer pkAccount : pkAccounts) {
CuMemberRechargeAccountParam param = new CuMemberRechargeAccountParam();
param.setPkAccount(pkAccount);
param.setAccountType(cuMemberBaseService.translateAccountValue(pkAccount));
param.setAccountType(iCuMemberBaseService.translateAccountValue(pkAccount));
accountParams.add(param);
}
}
@ -418,7 +410,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
CuMemberWalletDetailVO memberWalletDetailVO;
if (CollUtil.isNotEmpty(cuMemberAccountExts)) {
//查询币种值
List<BdAccount> allAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry);
List<BdAccount> allAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry);
Map<Integer, BdAccount> map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getFieldValue, o -> o));
for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExts) {
memberWalletDetailVO = new CuMemberWalletDetailVO();
@ -489,7 +481,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
memberAccount.setPkModified(loginUser.getUserId());
memberAccount.setPkMembers(pkMembers);
CuMemberAccountLog cuMemberAccountLog = packageCuMemberAccountLog(memberFrozenParam, memberAccount);
result = cuMemberAccountLogService.save(cuMemberAccountLog);
result = iCuMemberAccountLogService.save(cuMemberAccountLog);
}
//提交审批
submitApproval(memberFrozenParam);
@ -535,7 +527,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
cuMemberAccount = new CuMemberAccountExt();
for (CuMemberFrozenDetailParam param : memberFrozenDetails) {
Integer memberAccount = param.getMemberAccount();
Integer accountValue = cuMemberBaseService.getAccountValueById(memberAccount);
Integer accountValue = iCuMemberBaseService.getAccountValueById(memberAccount);
BigDecimal lockConsume = param.getLockConsume();
if (null != lockConsume && lockConsume.compareTo(BigDecimal.ZERO) > 0) {
ReflectUtils.invokeSetter(cuMemberAccount, MemberFieldConstants.LOCK_ACCOUNT + accountValue, lockConsume);
@ -574,7 +566,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
.signType(ESignType.getEnumByValue(memberPetitionVo.getSignType())).userIdList(memberPetitionVo.getUserIdList())
.sendIdList(memberPetitionVo.getSendIdList()).remark(memberPetitionVo.getDescription()).pkMemberList(pkMemberIds).build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, cuMemberFrozenParam.getLoginUser());
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, cuMemberFrozenParam.getLoginUser());
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(submit.getMsg());
@ -634,9 +626,9 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
List<Integer> selectedPkAccounts = cuMemberAccountVO.getPkAccounts();
Integer pkCountry = cuMemberAccountVO.getPkCountry();
//汇率
BigDecimal exchangeRate = cuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
BigDecimal exchangeRate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
//配置的币种
List<BdAccount> bdAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry);
List<BdAccount> bdAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry);
List<Integer> allAccountValues = bdAccounts.stream().map(BdAccount::getFieldValue).collect(Collectors.toList());
for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExtList) {
cuMemberAccountExtVO = BeanUtil.copyProperties(cuMemberAccountExt, CuMemberAccountExtVO.class);
@ -657,7 +649,7 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
//已选择的币种值
List<Integer> selectedPkAccounts = cuMemberAccountVO.getPkAccounts();
//汇率
BigDecimal exchangeRate = cuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
BigDecimal exchangeRate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
//配置的币种
for (CuMemberAccountExt cuMemberAccountExt : cuMemberAccountExtList) {
memberAccountExportVO = CuMemberAccountExportVO.builder()

89
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java
View File

@ -36,43 +36,27 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @description: 特殊业务-零元撤单
* @author: zhang jing
* @date: 2022/12/29 11:39
* @param:
* @return:
* 特殊业务-零元撤单
**/
@RequestMapping("/manager/zeroRevoke")
@RestController
public class ZeroElementRevokeController extends BaseController {
@Autowired
private ICuMemberService cuMemberService;
private ICuMemberService iCuMemberService;
@Autowired
public void setCuMemberService(ICuMemberService cuMemberService) {
this.cuMemberService = cuMemberService;
}
private ICuMemberServiceLogService iCuMemberServiceLogService;
@Autowired
private ICuMemberServiceLogService memberServiceLogService;
private ICuMemberTradeService iCuMemberTradeService;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
@Autowired
private ICuMemberBaseService cuMemberBaseService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
private ICuMemberBaseService iCuMemberBaseService;
@DubboReference
IServiceChargeServiceApi serviceChargeServiceApi;
IServiceChargeServiceApi iServiceChargeServiceApi;
/**
* @description: 特殊业务-零元撤单列表
* @author: zhang jing
* @date: 2022/11/17 15:39
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
* 特殊业务-零元撤单列表
**/
@AccessPermissions("ZeroBuy")
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SELECT)
@ -81,7 +65,7 @@ public class ZeroElementRevokeController extends BaseController {
startPage();
Integer pkCountry = SecurityUtils.getPkCountry();
zeroElementRevokeVO.setPkCountry(pkCountry);
List<ZeroElementRevokeVO> list = cuMemberService.zeroList(zeroElementRevokeVO);
List<ZeroElementRevokeVO> list = iCuMemberService.zeroList(zeroElementRevokeVO);
return getDataTable(list);
}
@ -97,27 +81,14 @@ public class ZeroElementRevokeController extends BaseController {
public void export(HttpServletResponse response, ZeroElementRevokeVO zeroElementRevokeVO) {
Integer pkCountry = SecurityUtils.getPkCountry();
zeroElementRevokeVO.setPkCountry(pkCountry);
List<ZeroElementRevokeVO> list = cuMemberService.zeroList(zeroElementRevokeVO);
if (CollectionUtil.isNotEmpty(list)) {
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE,
EnumsPrefixConstants.KEY_AWARD);
list.forEach(itm -> {
//注册等级key
itm.setPkSettleGradeVal(transactionMap1.get(itm.getPkSettleGrade()));
itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards()));
});
}
List<ZeroElementRevokeVO> list = iCuMemberService.zeroList(zeroElementRevokeVO);
ExcelUtil<ZeroElementRevokeVO> util = new ExcelUtil<>(ZeroElementRevokeVO.class);
util.exportExcel(response, list, "导出零元撤单");
}
/**
* @description: 查询选择零元注册的会员
* @author: zhang jing
* @date: 2023/3/27 17:52
* @param: [updateCodeVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 查询选择零元注册的会员
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SELECT)
@GetMapping("/selected")
@ -134,7 +105,7 @@ public class ZeroElementRevokeController extends BaseController {
List<ZeroElementRevokeVO> newlist = new ArrayList<>();
Integer pkCountry = SecurityUtils.getPkCountry();
for (Long lo : list) {
CuMember cm = cuMemberService.getMemberById(lo);
CuMember cm = iCuMemberService.getMemberById(lo);
ZeroElementRevokeVO zrvo = BeanUtil.copyProperties(cm, ZeroElementRevokeVO.class);
if (zrvo != null) {
newlist.add(zrvo);
@ -143,7 +114,7 @@ public class ZeroElementRevokeController extends BaseController {
if (CollectionUtil.isNotEmpty(newlist)) {
for (ZeroElementRevokeVO zer : newlist) {
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zer.getPkId(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(zer.getPkId(),
EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue());
zer.setChangeNumber(approveNumber + 1);
//查询扣费金额，账户信息
@ -151,14 +122,14 @@ public class ZeroElementRevokeController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
}
zer.setCost(serviceChargeDTOR.getData().getCost());
zer.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
zer.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
zer.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
}
}
zeroElementRevokeVO.setZeroVOList(newlist);
@ -168,11 +139,7 @@ public class ZeroElementRevokeController extends BaseController {
/**
* @description: 零元撤单
* @author: zhang jing
* @date: 2022/12/30 10:22
* @param: [postageParams]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 零元撤单
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SUBMIT)
@PostMapping("/confirm")
@ -193,14 +160,14 @@ public class ZeroElementRevokeController extends BaseController {
zeroElementRevokeVO.setCreationTime(date);
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
for (ZeroElementRevokeVO zrvo : zeroElementRevokeVO.getZeroVOList()) {
Integer count = cuMemberService.checkmsLogCount(zrvo.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
Integer count = iCuMemberService.checkmsLogCount(zrvo.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
if (count > 0) {
zrvo.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
errorlist.add(zrvo);
continue;
}
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zrvo.getPkId(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(zrvo.getPkId(),
EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue());
zrvo.setChangeNumber(approveNumber + 1);
if (zeroElementRevokeVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
@ -210,7 +177,7 @@ public class ZeroElementRevokeController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
serviceChargeDTO.setQuantity(approveNumber + 1);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -233,13 +200,13 @@ public class ZeroElementRevokeController extends BaseController {
businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList);
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList);
}
}
zeroElementRevokeVO = cuMemberService.zeroRevokeBusiness(zeroElementRevokeVO);
zeroElementRevokeVO = iCuMemberService.zeroRevokeBusiness(zeroElementRevokeVO);
} else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
@ -247,11 +214,7 @@ public class ZeroElementRevokeController extends BaseController {
}
/**
* @description: 发起签呈 免付，需要签呈需要付费
* @author: zhang jing
* @date: 2023/3/4 11:06
* @param: [updateCodeVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 发起签呈 免付，需要签呈需要付费
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SUBMIT)
@PostMapping("/petition")
@ -284,7 +247,7 @@ public class ZeroElementRevokeController extends BaseController {
if (StringUtils.isNull(zero.getPkId())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PKID_NOT_NULL));
}
Integer count = cuMemberService.checkmsLogCount(zero.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
Integer count = iCuMemberService.checkmsLogCount(zero.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
if (count > 0) {
zero.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
errorlist.add(zero);
@ -293,7 +256,7 @@ public class ZeroElementRevokeController extends BaseController {
pkMemberIds.add(zero.getPkId());
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zero.getPkId(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(zero.getPkId(),
EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue());
zero.setChangeNumber(approveNumber + 1);
if (zeroElementRevokeVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
@ -302,7 +265,7 @@ public class ZeroElementRevokeController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry);
@ -323,13 +286,13 @@ public class ZeroElementRevokeController extends BaseController {
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
if (zeroElementRevokeVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList);
}
}
}
cuMemberService.zeroPetition(zeroElementRevokeVO);
iCuMemberService.zeroPetition(zeroElementRevokeVO);
return AjaxResult.success(true);
}

185
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java
View File

@ -15,20 +15,15 @@ import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.retail.member.param.ShareRetailMemberParam;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* 会员 Mapper 接口
*
* @author hzs
* @since 2022-08-04
*/
public interface CuMemberMapper extends BaseMapper<CuMember> {
/**
* 查询登录会员以及状态
*
@ -50,17 +45,11 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 前台查询会员的方法，通过传输不同的参数，查询不同的会员
*
* @param cuMember 会员编号
* @return: CuMemberExt
* @Author: sui q
* @Date: 2022/8/29 11:50
*/
List<CuMemberExt> queryMemberInfoByCondition(CuMember cuMember);
/*
* @description: 根据条件查询会员信息，查询单表
* @author: sui q
* @date: 2023/5/10 15:07
* @param: null null
* 根据条件查询会员信息，查询单表
**/
List<CuMemberExt> queryMemberByCondition(CuMember cuMember);
@ -68,10 +57,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找安置人伞上
*
* @param memberId 会员编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectPlaceSponsorOnUmbrella(@Param("memberId") Long memberId,
@Param("memberCode") String memberCode,
@ -81,10 +66,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找安置人伞上会员信息
*
* @param memberId 编号、安置人
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> querySponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCodeList") List<String> memberCodeList);
@ -92,10 +73,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找安置人伞下
*
* @param memberId 会员编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectPlaceSponsorUnderUmbrella(@Param("memberId") Long memberId);
@ -103,10 +80,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找安置人伞下
*
* @param memberId 会员编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCode(@Param("memberId") Long memberId, @Param("placeParentCode") String placeParentCode);
@ -114,10 +87,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找安置人伞下
*
* @param memberId 会员编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(@Param("memberId") Long memberId, @Param("cuMemberExtList") List<CuMemberExt> cuMemberExtList);
@ -126,9 +95,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*
* @param memberId 会员编号
* @param placeDept 安置部门
* @return: CuMemberExt
* @Author: sui q
* @Date: 2022/9/1 20:36
*/
CuMemberExt selectPlaceSponsorLastLeft(@Param("memberId") Long memberId, @Param("placeDept") Integer placeDept);
@ -136,10 +102,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找血缘伞上，推荐人
*
* @param memberId 推荐人编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectBloodKinshipOnUmbrella(Long memberId);
@ -147,38 +109,22 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 查找血缘伞下，推荐人
*
* @param memberId 推荐人编号
* @Description:
* @return: List<CuMemberExt>
* @Author: sui q
* @Date: 2022/8/29 20:54
*/
List<CuMemberExt> selectBloodKinshipUnderUmbrella(Long memberId);
/**
* 获取会员主键
*
* @return: Integer
* @Author: sui q
* @Date: 2022/9/30 17:38
*/
Long createMemberId();
/**
* @description: 查询新零售会员信息
* @author: zhang jing
* @date: 2024/12/10 11:09
* @param: [retailMemberVO]
* @return: java.util.List<com.hzs.member.base.vo.RetailMemberVO>
* 查询新零售会员信息
**/
List<RetailMemberVO> retailMemberList(RetailMemberVO retailMemberVO);
/**
* @description: 会员真实信息
* @author: zhang jing
* @date: 2022/11/16 15:13
* @param: [memberParam]
* @return: java.util.List<com.hzs.member.base.vo.CuMemberVO>
* 会员真实信息
**/
List<CuMemberVO> realCuMemberByCondition(CuMemberVO memberParam);
@ -203,11 +149,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
@Param("pkCountry") Integer pkCountry);
/**
* @description: 特殊业务-修改会员编号列表
* @author: zhang jing
* @date: 2022/12/29 11:48
* @param: [updateCodeVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateCodeVO>
* 特殊业务-修改会员编号列表
**/
List<UpdateCodeVO> puCodeList(UpdateCodeVO updateCodeVO);
@ -215,21 +157,13 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
/**
* @description: 查询全部修改过会员编号的记录
* @author: zhang jing
* @date: 2023/9/27 10:51
* @param: [updateCodeVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateCodeVO>
* 查询全部修改过会员编号的记录
**/
List<UpdateCodeVO> puCodeAllList(UpdateCodeVO updateCodeVO);
/**
* @description: 查询会员变更前信息
* @author: zhang jing
* @date: 2023/7/17 12:18
* @param: [updateCodeVO]
* @return: com.hzs.member.base.vo.UpdateCodeVO
* 查询会员变更前信息
**/
UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO);
@ -246,7 +180,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
@Param("businessType") int businessType,
@Param("updatePkMember") Long updatePkMember);
/**
* 根据业务类型批量理新
*
@ -267,9 +200,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* 保存会员信息
*
* @param cuMember 会员信息
* @return: void
* @Author: sui q
* @Date: 2023/2/2 15:19
*/
Integer insertCuMember(CuMember cuMember);
@ -282,75 +212,43 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
int insertBatchCuMember(@Param("memberList") List<CuMember> memberList);
/**
* @description:特殊业务-修改结算国
* @author: zhang jing
* @date: 2023/2/21 9:25
* @param: [upseCountryVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateCodeVO>
* 特殊业务-修改结算国
**/
List<UpdateSettleCountryVO> upseCountryList(UpdateSettleCountryVO upseCountryVO);
/**
* @description: 特殊配置 修改结算国列表
* @author: zhang jing
* @date: 2023/4/28 17:23
* @param: [upseCountryVO]
* @return: java.util.List<com.hzs.member.base.vo.UpdateSettleCountryVO>
* 特殊配置 修改结算国列表
**/
List<UpdateSettleCountryVO> upsettleCountryList(UpdateSettleCountryVO upseCountryVO);
/**
* @description: 查询修改政策币列表
* @author: zhang jing
* @date: 2023/5/9 14:25
* @param: [upVO]
* @return: java.util.List<com.hzs.member.base.vo.UpPolicyCurrencyVO>
* 查询修改政策币列表
**/
List<UpPolicyCurrencyVO> upPolicyCurrencyList(UpPolicyCurrencyVO upVO);
/**
* @description: 校验会员是否有充值审核
* @author: zhang jing
* @date: 2023/2/23 10:52
* @param: [pkMember]
* @return: java.lang.Integer
* 校验会员是否有充值审核
**/
Integer checkCecharge(@Param("pkMember") Long pkMember);
/**
* @description: 校验会员是否有提现审核
* @author: zhang jing
* @date: 2023/2/23 10:52
* @param: [pkMember]
* @return: java.lang.Integer
* 校验会员是否有提现审核
**/
Integer checkWithdraw(@Param("pkMember") Long pkMember);
/**
* @description: 校验会员所有账户是否有余额
* @author: zhang jing
* @date: 2023/2/23 10:53
* @param: [pkMember]
* @return: java.lang.Integer
* 校验会员所有账户是否有余额
**/
Integer checkAccount(@Param("pkMember") Long pkMember);
/**
* @description: 查询会员是否存在未完成基础业务办理
* @author: zhang jing
* @date: 2023/2/23 16:00
* @param: [pkMember]
* @return: java.lang.Integer
* 查询会员是否存在未完成基础业务办理
**/
Integer checkmsLogCount(@Param("pkMember") Long pkMember,
@Param("editType") Integer editType);
/**
* @description: 查询会员是否存在未完成注水业绩业务
* @author: zhang jing
* @date: 2023/2/23 16:34
* @param: [pkMember]
* @return: java.lang.Integer
* 查询会员是否存在未完成注水业绩业务
**/
Integer checkMemberAchieveCount(@Param("pkMember") Long pkMember);
@ -364,10 +262,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
List<CuMemberExt> queryMemberSelect(@Param("param") MemberSelectParam param, @Param("pkCountry") Integer pkCountry);
/*
* description: 查询历史网体的最末安置人，左右区一起查出来
* @author: sui q
* @date: 2023/4/6 17:35
* @param:
* 查询历史网体的最末安置人，左右区一起查出来
**/
List<CuMemberExt> queryCuMemberLastPlaceParent(@Param("pkMember") Long pkMember);
@ -386,24 +281,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*/
List<UserInvestmentVo> selectRegList(MarketNewsParam marketNewsParam);
/**
* @description: 查询最新会员
* @author: zhang jing
* @date: 2023/5/24 16:37
* @param: []
* @return: com.hzs.common.domain.member.base.CuMember
**/
CuMember queryRecentlyMember(@Param("pkCountry") Integer pkCountry);
/**
* @description: 查询最新国际编号
* @author: zhang jing
* @date: 2023/5/30 19:30
* @param: []
* @return: com.hzs.common.domain.member.base.CuMember
**/
CuMember queryInternationalMember();
/**
* 查询推荐列表
*
@ -412,7 +289,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* @param memberName 会员名称
* @param startCreateTime 开始时间
* @param endCreateTime 结束时间
* @param endCreateTime 结束时间
* @param memberInfo 会员信息
* @return
*/
@ -529,10 +405,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
void updatePlaceParentAndPlaceDeptById(@Param("pkMember") Long pkMember, @Param("pkPlaceParent") Long pkPlaceParent, @Param("placeDept") Integer placeDept);
/*
* @description: 查询会员左右区人数
* @author: sui q
* @date: 2023/8/15 14:34
* @param: null null
* 查询会员左右区人数
**/
List<CuMember> queryMemberLeftRightCount(@Param("pkMember") Long pkMember);
@ -603,14 +476,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*/
CuMemberExt queryParentVertex(@Param("pkMember") Long pkMember);
/**
* 查询血缘上所属团队
*
* @param pkMember 会员ID
* @return
*/
CuMemberExt queryParentTeam(@Param("pkMember") Long pkMember);
/**
* 用户消费统计
*
@ -619,11 +484,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam);
/**
* @description: 查询表是否存在
* @author: zhang jing
* @date: 2024/4/7 16:10
* @param: [tableName]
* @return: java.lang.Integer
* 查询表是否存在
**/
Integer selectExistTable(String tableName);
@ -683,11 +544,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
CuMember getParentMember(@Param("memberCode") String memberCode);
/**
* @description: 查询同名同手机号最早注册的会员
* @author: zhang jing
* @date: 2024/10/22 14:51
* @param: [pkMember, memberPoint, grade]
* @return: com.hzs.common.domain.member.base.CuMember
* 查询同名同手机号最早注册的会员
**/
CuMember sameNamePhone(@Param("memberName") String memberName,
@Param("phone") String phone,
@ -755,11 +612,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
@Param("topMemberCode") String topMemberCode);
/**
* @description: 添加等级升级记录
* @author: zhang jing
* @date: 2024/12/22 10:36
* @param: [cuMemberGrade]
* @return: void
* 添加等级升级记录
**/
void saveMemberGrade(CuMemberGrade cuMemberGrade);

10
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -21,7 +21,6 @@ import com.hzs.member.share.param.ShareRegisterParam;
import com.hzs.retail.member.param.ShareRetailMemberParam;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Date;
import java.util.List;
@ -184,7 +183,6 @@ public interface ICuMemberService extends IService<CuMember> {
**/
List<RetailMemberVO> retailMemberList(RetailMemberVO retailMemberVO);
/**
* 查询真实信息
**/
@ -719,14 +717,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/
CuMemberExt queryParentVertex(Long pkMember);
/**
* 查询血缘上所属团队
*
* @param pkMember 会员ID
* @return
*/
CuMemberExt queryParentTeam(Long pkMember);
/**
* 用户消费统计
*

160
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -89,17 +89,17 @@ import java.util.stream.Collectors;
public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements ICuMemberService {
@DubboReference
ICurrencyServiceApi currencyServiceApi;
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
ICountryServiceApi countryServiceApi;
ICountryServiceApi iCountryServiceApi;
@DubboReference
IServiceChargeServiceApi serviceChargeServiceApi;
IServiceChargeServiceApi iServiceChargeServiceApi;
@DubboReference
IGradeServiceApi gradeServiceApi;
IGradeServiceApi iGradeServiceApi;
@DubboReference
IApprovalServiceApi approvalServiceApi;
IApprovalServiceApi iApprovalServiceApi;
@DubboReference
IAwardsServiceApi awardsServiceApi;
IAwardsServiceApi iAwardsServiceApi;
@Autowired
private ICuMemberRegisterService memberRegisterService;
@ -584,7 +584,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(zeroElementRevokeVO.getSendIdList())
.fileList(zeroElementRevokeVO.getFileList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.ZERO_ELEMENT_REVOKE_PETITION);
@ -655,7 +655,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(updateCodeVO.getSendIdList())
.fileList(updateCodeVO.getFileList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -730,7 +730,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(upseCountryVO.getSendIdList())
.fileList(upseCountryVO.getFileList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.UPDATE_SETTLE_PETITION);
@ -803,7 +803,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(policyCurrencyVO.getSendIdList())
.fileList(policyCurrencyVO.getFileList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION);
@ -886,7 +886,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -990,7 +990,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -1053,7 +1053,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -1128,7 +1128,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -1309,7 +1309,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.businessCode(code)
.signType(ESignType.getEnumByValue(placeParentParam.getSignType()))
.remark(placeParentParam.getRemark()).pkMemberList(memberSet).userIdList(placeParentParam.getUserIdList()).build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PLACE_PARENT);
@ -1590,7 +1590,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
*/
@Override
public String createUserNameByPremix(Integer pkCountry, Integer digit) {
CountryDTO country = countryServiceApi.getCountry(pkCountry).getData();
CountryDTO country = iCountryServiceApi.getCountry(pkCountry).getData();
String prefix = country.getCode();
if (StringUtils.isEmpty(prefix)) {
return null;
@ -1738,7 +1738,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
@Override
public List<Tree<String>> systemListTree(List<CuMemberRetailSExt> memberRetailExtList, CuMemberRetailSExt memberRetailExt, String settleTableName) {
// 汇率
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
// 查询血缘伞下团队业绩和人数
@ -1813,7 +1813,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
private Map<String, GradeDTO> queryGradeDTOMap() {
Set<Integer> countrySet = new HashSet<>();
countrySet.add(CountryConstants.CHINA_COUNTRY);
Map<Integer, List<GradeDTO>> countryMap = gradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData();
Map<Integer, List<GradeDTO>> countryMap = iGradeServiceApi.queryCountryGradeConfigByCondition(countrySet).getData();
Map<String, GradeDTO> gradeDtoMap = new HashMap<>();
countryMap.forEach((pkCountry, gradeList) -> {
@ -1939,11 +1939,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
//查询修改前结算国等级奖衔value值
R<GradeDTO> gd = gradeServiceApi.getGrade(member.getPkRegisterGrade());
R<GradeDTO> gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade());
Integer pkRegisterGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGrade(member.getPkSettleGrade());
gd = iGradeServiceApi.getGrade(member.getPkSettleGrade());
Integer pkSettleGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry());
gd = iGradeServiceApi.getGradeByGradeValue(pkRegisterGrade, uc.getNewPkSettleCountry());
if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
@ -1951,7 +1951,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
member.setPkRegisterGrade(gd.getData().getPkId());
gd = gradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry());
gd = iGradeServiceApi.getGradeByGradeValue(pkSettleGrade, uc.getNewPkSettleCountry());
if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
@ -1959,8 +1959,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
member.setPkSettleGrade(gd.getData().getPkId());
R<BdAwards> aw = awardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = awardsServiceApi.queryAwards(uc.getNewPkSettleCountry());
R<BdAwards> aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = iAwardsServiceApi.queryAwards(uc.getNewPkSettleCountry());
if (CollectionUtil.isEmpty(awList.getData())) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL));
}
@ -2171,7 +2171,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.sendIdList(policyCurrencyVO.getSendIdList())
.fileList(policyCurrencyVO.getFileList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.POLICY_CURRENCY_PETITION);
@ -2222,11 +2222,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
member.setModifiedTime(date);
//查询修改前结算国等级奖衔value值
R<GradeDTO> gd = gradeServiceApi.getGrade(member.getPkRegisterGrade());
R<GradeDTO> gd = iGradeServiceApi.getGrade(member.getPkRegisterGrade());
Integer pkRegisterGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGrade(member.getPkSettleGrade());
gd = iGradeServiceApi.getGrade(member.getPkSettleGrade());
Integer pkSettleGrade = gd.getData().getGradeValue();
gd = gradeServiceApi.getGradeByGradeValue(pkRegisterGrade, Integer.parseInt(uc.getNewSettleCountry()));
gd = iGradeServiceApi.getGradeByGradeValue(pkRegisterGrade, Integer.parseInt(uc.getNewSettleCountry()));
if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
@ -2234,7 +2234,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
member.setPkRegisterGrade(gd.getData().getPkId());
gd = gradeServiceApi.getGradeByGradeValue(pkSettleGrade, Integer.parseInt(uc.getNewSettleCountry()));
gd = iGradeServiceApi.getGradeByGradeValue(pkSettleGrade, Integer.parseInt(uc.getNewSettleCountry()));
if (null == gd.getData()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
@ -2242,8 +2242,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_GRADE_IS_NULL));
}
member.setPkSettleGrade(gd.getData().getPkId());
R<BdAwards> aw = awardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = awardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry()));
R<BdAwards> aw = iAwardsServiceApi.getAwardsOne(member.getPkAwards());
R<List<BdAwards>> awList = iAwardsServiceApi.queryAwards(Integer.parseInt(uc.getNewSettleCountry()));
if (CollectionUtil.isEmpty(awList.getData())) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.UPDATE_COUNTRY_AFTER_AWARDS_IS_NULL));
}
@ -2285,7 +2285,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CHANGE_MEMBER_CODE.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -2350,13 +2350,13 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
@Override
public Integer getGradeTranslateValue(Integer pkId) {
R<GradeDTO> grade = gradeServiceApi.getGrade(pkId);
R<GradeDTO> grade = iGradeServiceApi.getGrade(pkId);
return grade.getData().getPkTransaction();
}
@Override
public Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId) {
R<BdAwards> awards = awardsServiceApi.getAwardsOne(pkId);
R<BdAwards> awards = iAwardsServiceApi.getAwardsOne(pkId);
return awards.getData().getPkTransaction();
}
@ -2385,7 +2385,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
@Override
public CuMember shareRegisterMember(ShareRegisterParam registerParam) {
// 处理等级
GradeDTO gradeDTO = gradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), CountryConstants.CHINA_COUNTRY).getData();
GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), CountryConstants.CHINA_COUNTRY).getData();
if (null == gradeDTO) {
return null;
}
@ -2600,8 +2600,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 安置禁止
isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember());
}
// }
}
resultMap.put(showWaresDTO.getPkWares(), isShowWares);
}
@ -2703,7 +2701,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.userIdList(updateParentPetitionParam.getUserIdList())
.sendIdList(updateParentPetitionParam.getSendIdList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -2793,7 +2791,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
.userIdList(updatePlaceParentPetitionParam.getUserIdList())
.sendIdList(updatePlaceParentPetitionParam.getSendIdList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_UPDATE_PETITION);
@ -2814,11 +2812,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return updatePlaceParentPetitionParam;
}
/**
* 修改直推（通过）
*
* @param approvalBusinessResultDTO
*/
@Override
public void updateParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改直推
@ -2842,11 +2835,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
}
}
/**
* 修改直推（驳回）
*
* @param approvalBusinessResultDTO
*/
@Override
public void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改直推
@ -2860,7 +2848,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PARENT.getValue());
serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry());
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -2892,11 +2880,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
}
}
/**
* 修改安置（通过）
*
* @param approvalBusinessResultDTO
*/
@Override
public void updatePlaceParentByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//修改安置
@ -2919,11 +2902,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
}
/**
* 修改安置（驳回）
*
* @param approvalBusinessResultDTO
*/
@Override
public void updatePlaceParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
String businessCode = approvalBusinessResultDTO.getBusinessCode();
@ -2939,7 +2917,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setPkCountry(memberServiceLog.getPkCountry());
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
throw new ServiceException(TransactionUtils.getContent(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL));
@ -2992,25 +2970,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return this.update(updateWrapper);
}
/**
* 校验新安置部门和安置编号下是否已存在节点
*
* @param placeDeptMemberCode
* @param placeDept
* @return
*/
@Override
public Long checkPlaceDeptAndMemberCode(String placeDeptMemberCode, Integer placeDept) {
return baseMapper.checkPlaceDeptAndMemberCode(placeDeptMemberCode, placeDept);
}
/**
* 校验修改直推 memberCode 是否在自己血缘伞下
*
* @param pkMember
* @param memberCode
* @return
*/
@Override
public Long checkMemberParent(Long pkMember, String memberCode) {
return baseMapper.checkMemberParent(pkMember, memberCode);
@ -3021,11 +2985,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.updateMemberEditNumber(pkMemberList, updatePkMember);
}
/**
* @param pkMember 推荐人
* @param editNewPlaceMemberCode 安置后会员编号
* @return
*/
@Override
public Long checkPlaceMemberList(Long pkMember, String editNewPlaceMemberCode) {
return baseMapper.checkPlaceMemberList(pkMember, editNewPlaceMemberCode);
@ -3041,16 +3000,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryParentVertex(pkMember);
}
@Override
public CuMemberExt queryParentTeam(Long pkMember) {
return baseMapper.queryParentTeam(pkMember);
}
/**
* 用户消费统计
*
* @return
*/
@Override
public List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam) {
return baseMapper.getMemberConsumptionStat(memberConsumptionStatParam);
@ -3061,33 +3010,16 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.getMenuMember(pkMember);
}
/**
* 查询会员服务编号列表
*
* @param memberServiceCodeParam
* @return
*/
@Override
public List<MemberServiceCodeVo> queryMemberServiceCodeList(MemberServiceCodeParam memberServiceCodeParam) {
return baseMapper.queryMemberServiceCodeList(memberServiceCodeParam);
}
/**
* 根据会员编号置空服务编号
*
* @param memberCode
*/
@Override
public void updateMemberCodeByServiceCodeBlack(String memberCode) {
baseMapper.updateMemberCodeByServiceCodeBlack(memberCode);
}
/**
* 查询最大服务编码
*
* @param pkCountry
* @return
*/
@Override
public String getMaxServiceCode(Integer pkCountry) {
return baseMapper.getMaxServiceCode(pkCountry);
@ -3098,13 +3030,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.getParentMember(memberCode);
}
/**
* 查询会员奖衔
*
* @param param 查询参数
* @param pkCountry 所属国家
* @return
*/
@Override
public List<MemberAwardsQueryVO> listMemberAwards(MemberAwardsQueryParam param, Integer pkCountry) {
return baseMapper.listMemberAwards(param, pkCountry);
@ -3223,13 +3148,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// return "注册信息已存在，请重新输入注册信息";
}
/**
* @description: 添加等级升级记录
* @author: zhang jing
* @date: 2024/12/22 10:36
* @param: [cuMemberGrade]
* @return: void
**/
@Override
public void saveMemberGrade(CuMemberGrade cuMemberGrade) {
baseMapper.saveMemberGrade(cuMemberGrade);

30
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/ZeroElementRevokeVO.java
View File

@ -19,11 +19,7 @@ import java.util.List;
import java.util.Set;
/**
* @Description: 特殊业务-零元撤单实体vo
* @Author: zhangjing
* @Time: 2022/12/28 11:21
* @Classname: ZeroElementRevokeVO
* @PackageName: com.hzs.member.base.vo
* 特殊业务-零元撤单实体vo
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -64,7 +60,7 @@ public class ZeroElementRevokeVO extends BaseApprovalEntity {
/**
* 结算等级 会员等级
*/
@Excel(name = "注册等级")
@Excel(name = "结算等级")
private String pkSettleGradeVal;
private Integer pkRegisterGrade;
@ -95,17 +91,6 @@ public class ZeroElementRevokeVO extends BaseApprovalEntity {
@Excel(name = "推荐人姓名")
private String parMemberName;
/**
* 安置人编号
*/
@Excel(name = "安置人编号")
private String placeMemberCode;
/**
* 安置人姓名
*/
@Excel(name = "安置人姓名")
private String placeMemberName;
/**
* 隶属体系
*/
@ -119,7 +104,7 @@ public class ZeroElementRevokeVO extends BaseApprovalEntity {
/**
* 创建时间
*/
@Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creationTime;
/**
@ -134,13 +119,11 @@ public class ZeroElementRevokeVO extends BaseApprovalEntity {
/**
* 结算等级
*/
@Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE)
private Integer pkSettleGrade;
/**
* 真实奖衔
*/
@Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
private Integer pkAwards;
/**
@ -224,12 +207,5 @@ public class ZeroElementRevokeVO extends BaseApprovalEntity {
private Long pkCreator;
}

6
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/ShareRetailMemberController.java
View File

@ -32,11 +32,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 新零售会员管理控制器
* @Author: jiang chao
* @Time: 2025/1/3 16:23
* @Classname: RetailMemberManageController
* @PackageName: com.hzs.retail.member.controller.manage
* 新零售会员管理控制器
*/
@Slf4j
@RestController

6
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/ShareDeleteParam.java
View File

@ -5,11 +5,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Description: 新零售0元会员删除
* @Author: jiang chao
* @Time: 2025/1/4 8:00
* @Classname: ShareDeleteParam
* @PackageName: com.hzs.retail.member.param
* 新零售0元会员删除
*/
@Data
public class ShareDeleteParam {

6
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/ShareParentDeleteParam.java
View File

@ -6,11 +6,7 @@ import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @Description: 新零售0元会员删除
* @Author: jiang chao
* @Time: 2025/1/4 8:00
* @Classname: ShareDeleteParam
* @PackageName: com.hzs.retail.member.param
* 新零售0元会员删除
*/
@Data
public class ShareParentDeleteParam {

6
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/ShareRetailMemberParam.java
View File

@ -5,11 +5,7 @@ import lombok.Data;
import java.io.Serializable;
/**
* @Description: 新零售分享会员列表查询入参
* @Author: jiang chao
* @Time: 2025/1/3 16:43
* @Classname: ShareRetailMemberParam
* @PackageName: com.hzs.retail.member.param
* 新零售分享会员列表查询入参
*/
@Data
public class ShareRetailMemberParam implements Serializable {

83
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -644,30 +644,32 @@
cm.MEMBER_CODE as memberCode,
cm.member_name as memberName,
cm.PHONE as phone,
gr.PK_TRANSACTION pkSettleGrade,
awa.PK_TRANSACTION pkAwards,
grr.grade_name pkSettleGradeVal,
awa.awards_name pkAwardsVal,
ver.VERTEX_NAME as vertexName,
ct.TEAM_NAME as teamName,
par.member_code parMemberCode,
par.member_name parMemberName,
place.member_code placeMemberCode,
place.member_name placeMemberName,
cm.CREATION_TIME creationTime
from cu_member cm
LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code
left join bd_vertex ver on ver.pk_id=cm.PK_VERTEX
left join bd_awards awa on awa.pk_id = cm.PK_AWARDS
left join bd_grade gr on gr.pk_id = cm.PK_REGISTER_GRADE
INNER join bd_grade grr on grr.pk_id=cm.PK_SETTLE_GRADE
INNER JOIN cu_member par ON par.pk_id = cm.pk_parent
INNER JOIN cu_member place ON place.pk_id = cm.pk_place_parent
where cm.del_flag = 0
and cm.CATEGORY=0
and awa.del_flag = 0
left JOIN cu_member_team ct
ON ct.pk_id = cm.pk_team_code
left join bd_vertex ver
on ver.pk_id = cm.PK_VERTEX
and ver.del_flag = 0
and cm.CONSUME_MONEY=0
and cm.CONSUME_ACHIEVE=0
and grr.GRADE_VALUE=20
left join bd_awards awa
on awa.pk_id = cm.pk_awards
and awa.del_flag = 0
left join bd_grade grr
on grr.pk_id = cm.pk_settle_grade
and grr.del_flag = 0
left JOIN cu_member par
ON par.pk_id = cm.pk_parent
where cm.del_flag = 0
and cm.CATEGORY = 0
and cm.CONSUME_MONEY = 0
and cm.CONSUME_ACHIEVE = 0
and grr.GRADE_VALUE = 20
<if test="memberCode != null and memberCode != ''">
and(cm.member_code like #{memberCode} || '%')
</if>
@ -675,25 +677,19 @@
and cm.member_name like #{memberName} || '%'
</if>
<if test="vertexId != null">
and cm.PK_VERTEX=#{vertexId}
and cm.PK_VERTEX = #{vertexId}
</if>
<if test="teamId != null">
and cm.pk_team_code=#{teamId}
and cm.pk_team_code = #{teamId}
</if>
<if test="phone != null and phone != ''">
and cm.phone like #{phone} || '%'
</if>
<if test="pkCountry != null">
and cm.PK_SETTLE_COUNTRY=#{pkCountry}
and cm.PK_SETTLE_COUNTRY = #{pkCountry}
</if>
<if test="pkAwards != null">
and cm.pk_awards=#{pkAwards}
</if>
<if test="placeMemberCode != null and placeMemberCode != ''">
and place.member_code like #{placeMemberCode} || '%'
</if>
<if test="placeMemberName != null and placeMemberName != ''">
and place.member_name like #{placeMemberName} || '%'
and cm.pk_awards = #{pkAwards}
</if>
<if test="parMemberCode != null and parMemberCode != ''">
and par.member_code like #{parMemberCode} || '%'
@ -701,8 +697,8 @@
<if test="parMemberName != null and parMemberName != ''">
and par.member_name like #{parMemberName} || '%'
</if>
<if test="pkRegisterGrade != null">
and cm.PK_REGISTER_GRADE=#{pkRegisterGrade}
<if test="pkSettleGrade != null">
and cm.pk_settle_grade = #{pkSettleGrade}
</if>
ORDER BY cm.CREATION_TIME DESC
</select>
@ -1597,21 +1593,6 @@
</if>
</select>
<!--查询最新会员-->
<select id="queryRecentlyMember" resultType="com.hzs.common.domain.member.base.CuMember">
select max(COUNTRY_CODE) COUNTRY_CODE
from cu_member
where pk_settle_country = #{pkCountry}
and COUNTRY_CODE is not null
</select>
<!--查询最新会员国际编号-->
<select id="queryInternationalMember" resultType="com.hzs.common.domain.member.base.CuMember">
select max(to_number(substr(global_code, 3))) global_code
from cu_member
where global_code is not null
</select>
<select id="parentList" resultType="com.hzs.member.base.vo.ParentMemberVo">
select a.* from ( select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade,
cm.PK_SETTLE_GRADE pkSettleGrade,
@ -2006,20 +1987,6 @@
where rownum = 1
</select>
<!-- 查询血缘上所属团队 -->
<select id="queryParentTeam" resultMap="MemberResultMap">
select *
from (select cm.*
from cu_member cm
where cm.pk_team_code is not null
and cm.del_flag = 0
start
with cm.pk_id = #{pkMember}
connect by cm.pk_id = prior cm.pk_parent
order by level)
where rownum = 1
</select>
<select id="getMemberConsumptionStat" resultType="com.hzs.member.base.vo.MemberConsumptionStatVo">
select
cm.MEMBER_CODE memberCode,

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/controller/BaseController.java
View File

@ -16,8 +16,6 @@ import com.hzs.common.core.web.page.TableDataInfo;
/**
* web层通用数据处理
*
* @author hzs
*/
@Slf4j
public class BaseController {

8
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java
View File

@ -13,12 +13,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 秒接日志记录表
* </p>
*
* @author hzs
* @since 2025-01-03
* 注水盒数记录表
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ -86,7 +81,6 @@ public class CuMemberSpeRetail extends BaseEntity {
@TableField("CONSUME_PV")
private BigDecimal consumePv;
/**
* 系统类型
*/