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

## 去掉不需要的方法；调整代码写法；

This commit is contained in:
cabbage 2025-05-12 11:17:06 +08:00
parent e46bfb4b6a
commit 7060aa4bdb
2 changed files with 100 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,6 @@ import java.util.stream.Collectors;
/**
* @Description: 会员服务需要保存不同的表, 用于处理服务内的事务
* @Author: sui q
* @Time: 2022/9/13 9:26
* @Classname: CuMemberBusinessServiceImpl
* @PackageName: com.hzs.member.base.service.impl
*/
@ -100,33 +98,33 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Autowired
private MemberToolsHandler memberToolsHandler;
@Autowired
private ICuMemberAchieveService cuMemberAchieveService;
private ICuMemberAchieveService iCuMemberAchieveService;
@Autowired
private ICuMemberExpireHistoryService iCuMemberExpireHistoryService;
@Autowired
private RedisService redisService;
@Autowired
private ICuMemberService cuMemberService;
private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberRegisterService cuMemberRegisterService;
private ICuMemberRegisterService iCuMemberRegisterService;
@Autowired
private ICuMemberAccountService cuMemberAccountService;
private ICuMemberAccountService iCuMemberAccountService;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
private ICuMemberTradeService iCuMemberTradeService;
@Autowired
private ICuMemberLevelService cuMemberLevelService;
private ICuMemberLevelService iCuMemberLevelService;
@Autowired
private ICuMemberAwardsService cuMemberAwardsService;
private ICuMemberAwardsService iCuMemberAwardsService;
@Autowired
private ICuMemberChangeLogService cuMemberChangeLogService;
private ICuMemberChangeLogService iCuMemberChangeLogService;
@Autowired
private ICuMemberShareService cuMemberShareService;
private ICuMemberShareService iCuMemberShareService;
@Autowired
private ICuMemberTradeDetailService cuMemberTradeDetailService;
private ICuMemberTradeDetailService iCuMemberTradeDetailService;
@Autowired
private ICuMemberTradeBonusService cuMemberTradeBonusService;
private ICuMemberTradeBonusService iCuMemberTradeBonusService;
@Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Override
@ -134,7 +132,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public void updateCuMember(CuMember cuMember) {
redisService.lockKeyMany(CacheConstants.UPD_MEMBER + cuMember.getMemberCode());
try {
cuMemberService.updateById(cuMember);
iCuMemberService.updateById(cuMember);
} finally {
redisService.unlock(CacheConstants.UPD_MEMBER + cuMember.getMemberCode());
}
@ -146,9 +144,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param cuMember 会员信息
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:35
*/
@Override
@Transactional(rollbackFor = Exception.class)
@ -157,7 +152,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 当cuMember为空时，不更新会员表
if (cuMember != null) {
// 验证等级是否发生了变化
CuMember member = cuMemberService.getMember(cuMember.getPkId());
CuMember member = iCuMemberService.getMember(cuMember.getPkId());
if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) {
saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade());
}
@ -197,7 +192,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
acPickExt.setOrderCode(saOrder.getOrderCode());
pickExtList.add(acPickExt);
}
cuMemberTradeService.saveBatch(cuMemberTradeList);
iCuMemberTradeService.saveBatch(cuMemberTradeList);
if (pickExtList.size() > 0 && !iAcPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) {
throw new RuntimeException("更新提货单失败");
}
@ -217,12 +212,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单
* @param pkOldLevel 原等级
* @Description: 保存奖衔
* @return: void
* @Author: sui q
* @Date: 2023/3/25 17:20
*/
private Boolean saveLevelUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldLevel) {
// TODO new V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录
// V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录
if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()
&& EUpgradeType.BUY_UPGRADE.getValue() == levelType) {
// 购买升级
@ -245,7 +237,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build();
cuMemberLevel.setPkCountry(cuMember.getPkSettleCountry());
cuMemberLevel.setPkCreator(cuMember.getPkId());
return cuMemberLevelService.save(cuMemberLevel);
return iCuMemberLevelService.save(cuMemberLevel);
}
/**
@ -254,13 +246,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单
* @param pkOldAwards 会员
* @Description: 保存奖衔, 升级送奖项默认免考
* @return: void
* @Author: sui q
* @Date: 2023/3/25 17:20
*/
private void saveAwardsUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldAwards) {
// 记录奖衔升级历史
CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime()));
CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime()));
CuMemberAwards cuMemberAwards = CuMemberAwards.builder()
.period(cuMemberSettlePeriod.getPkId())
.pkMember(cuMember.getPkId())
@ -273,7 +262,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build();
cuMemberAwards.setPkCountry(cuMember.getPkSettleCountry());
cuMemberAwards.setPkCreator(cuMember.getPkId());
cuMemberAwardsService.save(cuMemberAwards);
iCuMemberAwardsService.save(cuMemberAwards);
}
@Override
@ -285,10 +274,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (isPay) {
updateCuMember(cuMember);
} else {
if (cuMemberService.getMember(cuMember.getPkId()) != null) {
if (iCuMemberService.getMember(cuMember.getPkId()) != null) {
updateCuMember(cuMember);
} else {
cuMemberService.saveMember(cuMember);
iCuMemberService.saveMember(cuMember);
}
}
// 代表在线支付，在线支付先插入一条充值信息
@ -309,40 +298,19 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return true;
}
@Override
public Boolean saveShareMember(CuMember cuMember) {
// 保存会员
cuMemberService.saveMember(cuMember);
// 保存账户
saveMemberAccount(cuMember);
// 保存会员注册、等级信息
// 用户注册信息
CuMemberRegister cuMemberRegister = BeanUtil.copyProperties(cuMember, CuMemberRegister.class);
cuMemberRegister.setPkMember(cuMember.getPkId());
cuMemberRegisterService.save(cuMemberRegister);
// 解锁 安置位置
// redisService.unlock(CacheConstants.POSITION + cuMember.getPkPlaceParent() + cuMember.getPlaceDept());
return null;
}
/**
* @param cuMember 会员
* @Description: 保存会员账户信息
* @return: void
* @Author: sui q
* @Date: 2023/3/15 18:36
*/
private void saveMemberAccount(CuMember cuMember) {
// 新会员生成账户，保存账户
CuMemberAccount cuMemberAccount = CuMemberAccount.builder()
.pkMember(cuMember.getPkId())
// .account6(saOrder.getOrderAmount())
.build();
cuMemberAccount.setPkCreator(cuMember.getPkCreator());
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
// 获取账户配置，判断是否有积分账户
cuMemberAccountService.save(cuMemberAccount);
// 验证订单是否存在购买的订单
iCuMemberAccountService.save(cuMemberAccount);
}
private void saveMemberRecords(CuMember cuMember, SaOrder saOrder) {
@ -356,20 +324,20 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 用户注册信息
CuMemberRegister cuMemberRegister = BeanUtil.copyProperties(cuMember, CuMemberRegister.class);
cuMemberRegister.setPkMember(cuMember.getPkId());
cuMemberRegisterService.save(cuMemberRegister);
iCuMemberRegisterService.save(cuMemberRegister);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveMember(CuMember cuMember, SaOrder saOrder) {
// 生成会员
cuMemberService.saveMember(cuMember);
iCuMemberService.saveMember(cuMember);
// 记录等级，记录注册记录
saveMemberRecords(cuMember, saOrder);
// 生成账户信息
saveMemberAccount(cuMember);
// 更新分享会员表状态
cuMemberShareService.updateCuMemberShare(cuMember.getPkCreator());
iCuMemberShareService.updateCuMemberShare(cuMember.getPkCreator());
saveMemberOnLineTrade(null, saOrder, null);
// 解锁 安置位置
@ -397,7 +365,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
if (cuMember != null) {
// 验证等级是否发生了变化，海外存在累计升级的国家
CuMember member = cuMemberService.getMember(cuMember.getPkId());
CuMember member = iCuMemberService.getMember(cuMember.getPkId());
if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) {
saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade());
}
@ -431,22 +399,19 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单编号
* @param bdAccount 账户
* @Description: 插入充值记录trade
* @return: CuMemberAccountExt
* @Author: sui q
* @Date: 2023/3/23 16:08
*/
private CuMemberAccountExt insertRechargeTrade(SaOrder saOrder, BdAccount bdAccount) {
// 扣款 扣款信息
Integer pkCountry = saOrder.getPkCountry();
Long pkMember = saOrder.getPkCreator();
CuMember cuMember = cuMemberService.getMember(saOrder.getPkCreator());
CuMember cuMember = iCuMemberService.getMember(saOrder.getPkCreator());
if (cuMember != null) {
pkCountry = cuMember.getPkSettleCountry();
pkMember = cuMember.getPkId();
}
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(pkMember).build();
cuMemberAccount.setPkCountry(pkCountry);
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
if (cuMemberAccountExtList.size() == 0) {
throw new RuntimeException("没有找到会员账户");
}
@ -456,7 +421,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
BigDecimal originalMoney = ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue());
CuMemberTrade cuMemberTrade = packageMemberTrade(saOrder, pkCountry, bdAccount.getPkId(), originalMoney, tradeMoney, ETradeClassify.RECHARGE.getValue());
cuMemberTrade.setRemarks("在线充值");
cuMemberTradeService.save(cuMemberTrade);
iCuMemberTradeService.save(cuMemberTrade);
BigDecimal afterAccount = ComputeUtil.computeAdd(ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue()), tradeMoney);
ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + bdAccount.getFieldValue(), afterAccount);
ReflectUtils.invokeSetter(cuMemberAccountExt, MemberFieldConstants.PAY_ACCOUNT + bdAccount.getFieldValue(), tradeMoney);
@ -467,9 +432,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
* @param saOrder 订单
* @param cuMemberAccount 账户
* @Description: 插入会员的交易明细
* @return: void
* @Author: sui q
* @Date: 2022/9/13 15:12
*/
@Transactional(rollbackFor = Exception.class)
@Override
@ -534,7 +496,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberTradeBonusList.add(cuMemberTradeBonus);
}
// 查询会员的发放明细
List<CuMemberTradeDetail> cuMemberTradeDetailList = cuMemberTradeDetailService.queryCuMemberTradeDetail(cuMemberAccount.getPkMember());
List<CuMemberTradeDetail> cuMemberTradeDetailList = iCuMemberTradeDetailService.queryCuMemberTradeDetail(cuMemberAccount.getPkMember());
if (cuMemberTradeDetailList.size() > 0 && ComputeUtil.compareValue(bonusTradeMoney)) {
// 会员发放交易明细
List<CuMemberTradeDetail> updMemberTradeDetailList = new ArrayList<>();
@ -568,11 +530,11 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateMemberAccount.setConsumeAccount4(consumeMoney.negate());
}
// 更新会员发放交易流水表
cuMemberTradeDetailService.updateCuMemberTradeDetail(updMemberTradeDetailList);
iCuMemberTradeDetailService.updateCuMemberTradeDetail(updMemberTradeDetailList);
}
if (cuMemberTradeBonusList.size() > 0) {
// 新增会员奖金交易流水表
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList);
iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(cuMemberTradeBonusList);
}
}
}
@ -592,7 +554,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
private void saveAndUpdateCuMember(List<CuMemberTrade> cuMemberTradeList, CuMemberAccount updateMemberAccount) {
if (cuMemberTradeList.size() > 0) {
cuMemberTradeService.saveBatch(cuMemberTradeList);
iCuMemberTradeService.saveBatch(cuMemberTradeList);
}
updateCuMemberAccount(updateMemberAccount);
}
@ -602,9 +564,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
*
* @param updateMemberAccount 账户
* @throws RuntimeException 抛出异常
* @return: void
* @Author: sui q
* @Date: 2023/3/16 14:16
*/
private void updateCuMemberAccount(CuMemberAccount updateMemberAccount) {
Long pkMember = updateMemberAccount.getPkMember();
@ -613,7 +572,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
// 更新账户余额
try {
if (!cuMemberAccountService.updateMemberAccount(updateMemberAccount, pkMember)) {
if (!iCuMemberAccountService.updateMemberAccount(updateMemberAccount, pkMember)) {
throw new RuntimeException("用户付款失败，请重试！");
}
} finally {
@ -670,55 +629,48 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
CuMemberAccount payMemberAccount;
// 默认回退给创建人
payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() ||
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 会员账号 验证会员账户是否存在金额
CuMember member = cuMemberService.getMemberById(saOrder.getPkMember());
CuMember member = iCuMemberService.getMemberById(saOrder.getPkMember());
// 会员变为死点
member.setCategory(ECategory.LOGGED_OUT.getValue());
member.setCustomerType(ECustomerType.DEAD_POINT.getValue());
member.setPkModified(saOrder.getPkModified());
member.setModifiedTime(DateUtils.currentDateTime());
cuMemberService.updateById(member);
iCuMemberService.updateById(member);
// 撤销正常订单，修改 cu_member_register 账户状态为死点
CuMemberRegister cuMemberRegister = new CuMemberRegister();
cuMemberRegister.setPkMember(member.getPkId());
cuMemberRegister.setPkCountry(saOrder.getPkCountry());
cuMemberRegister.setPkModified(saOrder.getPkCreator());
cuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
iCuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
}
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true;
}
/**
* @description: 自助撤单-注册单撤单
* @author: zhang jing
* @date: 2023/11/23 16:19
* @param: [pkApprove, saOrder, businessCommissionDTO]
* @return: java.lang.Boolean
**/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
deductCancelOrderCost(businessCommissionDTO);
// 回退给创建人
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() ||
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 会员账号 验证会员账户是否存在金额
CuMember member = cuMemberService.getMember(saOrder.getPkMember());
CuMember member = iCuMemberService.getMember(saOrder.getPkMember());
//删除会员
UpdateWrapper<CuMember> updateWrapper = new UpdateWrapper();
UpdateWrapper<CuMember> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("MEMBER_CODE", CommonUtil.deleteMemberCode(member.getMemberCode()));
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("MODIFIED_TIME", DateUtils.currentDateTime());
updateWrapper.set("PK_MODIFIED", saOrder.getPkModified());
updateWrapper.eq("PK_ID", member.getPkId());
cuMemberService.update(updateWrapper);
iCuMemberService.update(updateWrapper);
// 删除会员注册表
UpdateWrapper<CuMemberRegister> updateWrapperRegister = new UpdateWrapper<>();
@ -726,20 +678,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateWrapperRegister.set("MODIFIED_TIME", DateUtils.currentDateTime());
updateWrapperRegister.set("PK_MODIFIED", saOrder.getPkModified());
updateWrapperRegister.eq("PK_MEMBER", member.getPkId());
cuMemberRegisterService.update(updateWrapperRegister);
iCuMemberRegisterService.update(updateWrapperRegister);
}
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true;
}
/**
* @description: 自助服务-生成订单
* @author: zhang jing
* @date: 2023/4/18 17:13
* @param: [pkApprove, saOrder, payMemberAccount]
* @return: void
**/
@Transactional(rollbackFor = Exception.class)
@Override
public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) {
@ -752,7 +696,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney) {
CuMemberAccount cuMemberAccountParam = CuMemberAccount.builder().pkMember(pkMember).build();
cuMemberAccountParam.setPkCountry(pkCountry);
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccountParam);
List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccountParam);
if (CollectionUtil.isEmpty(cuMemberAccountExtList)) {
return Boolean.FALSE;
}
@ -784,7 +728,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.build();
cuMemberTrade.setPkCountry(pkCountry);
cuMemberTrade.setPkCreator(pkMember);
cuMemberTradeService.save(cuMemberTrade);
iCuMemberTradeService.save(cuMemberTrade);
}
@Override
@ -807,7 +751,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt) {
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(acDrawRewardNumExt.getPkMember()).build();
cuMemberAccount.setPkCountry(acDrawRewardNumExt.getPkCountry());
List<CuMemberAccountExt> cuMemberAccountExtList = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
List<CuMemberAccountExt> cuMemberAccountExtList = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount);
if (cuMemberAccountExtList.size() == 0) {
throw new RuntimeException("没有找到会员账户");
}
@ -835,10 +779,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
CuMemberAccount updateMemberAccount = new CuMemberAccount();
List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount);
if (newCuMemberTradeBonusList.size() > 0) {
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
}
// 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
cuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount);
}
@ -860,7 +804,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 返回的流水明细
List<CuMemberTrade> cuMemberTradeList = new ArrayList<>();
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
// 如果有订单支付流水明细
if (CollectionUtil.isNotEmpty(cuMemberTrades)) {
// 订单所属国家和订单支付流水国家不相同则为跨国，需要以订单支付流水中的国家为准进行退款
@ -899,7 +843,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
updateMemberAccount.setConsumeAccount4(BigDecimal.ZERO);
BigDecimal bonusTradeMoney = tradeMoney;
List<Integer> consumeTypeList = Arrays.asList(EConsumeType.ORDER.getValue(), EConsumeType.BACK_ORDER.getValue());
List<CuMemberTradeBonus> cuMemberTradeBonusList = cuMemberTradeBonusService.queryCuMemberTradeBonus(consumeTypeList, saOrder.getPkId());
List<CuMemberTradeBonus> cuMemberTradeBonusList = iCuMemberTradeBonusService.queryCuMemberTradeBonus(consumeTypeList, saOrder.getPkId());
for (CuMemberTradeBonus cuMemberTradeBonus : cuMemberTradeBonusList) {
if (!ComputeUtil.compareValue(bonusTradeMoney)) {
break;
@ -958,26 +902,26 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 按照memberList 倒叙往后删除
Date currentDateTime = DateUtils.currentDateTime();
List<Long> centerIdList = saOrderMap.values().stream().map(BaseEntity::getPkCreator).distinct().collect(Collectors.toList());
List<CuMemberAccount> cuMemberAccountList = cuMemberAccountService.queryCuMemberAccountByPkMembers(centerIdList);
List<CuMemberAccount> cuMemberAccountList = iCuMemberAccountService.queryCuMemberAccountByPkMembers(centerIdList);
Map<Long, CuMemberAccount> cuMemberAccountMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberAccountList.size()));
cuMemberAccountList.forEach(cuMemberAccount ->
cuMemberAccountMap.put(cuMemberAccount.getPkMember(), cuMemberAccount));
for (int i = memberList.size() - 1; i >= 0; i--) {
Long pkMember = memberList.get(i);
SaOrderExt saOrder = saOrderMap.get(pkMember);
CuMember cuMember = cuMemberService.getMemberById(pkMember);
CuMember cuMember = iCuMemberService.getMemberById(pkMember);
// 删除等级
cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
// 回退奖衔,根据订单从 cu_member_awards查询
cuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
cuMemberService.deleteCuMemberByPkMember(pkMember, pkApprove, currentDateTime);
cuMemberAccountService.deleteCuMemberAccountByPkMember(pkMember, pkApprove, currentDateTime);
iCuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
iCuMemberService.deleteCuMemberByPkMember(pkMember, pkApprove, currentDateTime);
iCuMemberAccountService.deleteCuMemberAccountByPkMember(pkMember, pkApprove, currentDateTime);
// 撤销正常订单，修改 cu_member_register 账户状态为死点
CuMemberRegister cuMemberRegister = new CuMemberRegister();
cuMemberRegister.setPkMember(pkMember);
cuMemberRegister.setPkCountry(saOrder.getPkCountry());
cuMemberRegister.setPkModified(saOrder.getPkCreator());
cuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
iCuMemberRegisterService.updateCuMemberRegister(cuMemberRegister);
CuMemberAccount payMemberAccount = cuMemberAccountMap.get(saOrder.getPkCreator());
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
}
@ -986,7 +930,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
private void deductCancelOrderCost(BusinessCommissionDTO businessCommissionDTO) {
if (businessCommissionDTO != null) {
if (!cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO)) {
if (!iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO)) {
throw new RuntimeException("撤销订单扣除业务手续费失败");
}
}
@ -1000,17 +944,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()
) {
cuMemberService.updateById(cuMember);
iCuMemberService.updateById(cuMember);
// 回退等级
cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
// 回退奖衔,根据订单从 cu_member_awards查询
cuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
iCuMemberAwardsService.deleteCuMemberAwards(saOrder.getPkId(), pkApprove, currentDateTime);
}
// 部分撤单 todo 发货后邮费不退，未发货退邮费
if (saOrder.getBackOrderAmount() != null && ComputeUtil.compareValue(saOrder.getBackOrderAmount())) {
cancelPartOrderBackAmount(pkApprove, saOrder);
} else {
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
// 回退账号余额
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
}
@ -1019,7 +963,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Override
public void cancelPartOrderBackAmount(Long pkApprove, SaOrderExt saOrder) {
CuMemberAccount payMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
BigDecimal backOrderAmount = saOrder.getBackOrderAmount();
// 考虑部分撤单
// 部分退，回退金额按照 币种扣除的倒叙扣除 现金->消费->奖金 奖金->消费->现金
@ -1039,7 +983,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
mustPayMoneyMap.put(areaCurrencyDTO.getPkAccount(), mustPayMoney);
}
}
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
Map<Integer, CuMemberTrade> cuMemberTradeMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberTrades.size()));
cuMemberTrades.forEach(cuMemberTrade ->
cuMemberTradeMap.put(cuMemberTrade.getPkAccount(), cuMemberTrade));
@ -1084,10 +1028,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
}
if (newCuMemberTradeBonusList.size() > 0) {
cuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
}
// 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
cuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount);
}
@ -1095,13 +1039,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Override
public String orderChangeProductPre(SaOrder saOrder, SaOrder updateOrder) {
// 查询会员订单支付币种
List<CuMemberTrade> cuMemberTrades = cuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
List<CuMemberTrade> cuMemberTrades = iCuMemberTradeService.queryCuMemberTrade(saOrder.getPkCreator(), saOrder.getOrderCode());
// 查询会员当前余额
CuMemberAccount cuMemberAccount = new CuMemberAccount();
cuMemberAccount.setPkCountry(saOrder.getPkCountry());
cuMemberAccount.setPkMember(saOrder.getPkCreator());
CuMemberAccountExt tmpCuMemberAccount = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
CuMemberAccountExt tmpCuMemberAccount = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
if (CollectionUtil.isNotEmpty(cuMemberTrades)) {
List<AreaCurrencyDTO> currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(saOrder.getPkCountry()).getData();
@ -1140,13 +1084,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public void orderChangeProduct(SaOrder saOrder, SaOrder updateOrder, Long userId, Object obj) {
if (null != saOrder && null != updateOrder) {
// 撤销订单
this.cancelOrderBackAccount(userId, saOrder, cuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()));
this.cancelOrderBackAccount(userId, saOrder, iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()));
// 查询会员当前余额
CuMemberAccount cuMemberAccount = new CuMemberAccount();
cuMemberAccount.setPkCountry(saOrder.getPkCountry());
cuMemberAccount.setPkMember(saOrder.getPkCreator());
CuMemberAccountExt tmpCuMemberAccount = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
CuMemberAccountExt tmpCuMemberAccount = iCuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0);
// 获取需要扣除各币种金额
R<CuMemberAccountExt> resultR = iSaOrderServiceApi.queryOrderSpendDetails(tmpCuMemberAccount, updateOrder, null);
@ -1178,7 +1122,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 追加业务实体不为null，需要处理
if (obj instanceof BusinessCommissionDTO) {
// 业务办理扣款逻辑
if (!cuMemberTradeService.businessCommissionSubmit((BusinessCommissionDTO) obj)) {
if (!iCuMemberTradeService.businessCommissionSubmit((BusinessCommissionDTO) obj)) {
throw new ServiceException("业务手续费扣款失败");
}
}
@ -1205,7 +1149,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
List<CuMemberTrade> saveMemberTradeList = new ArrayList<>();
// 查询订单创建人账户
CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
// 订单所属专区扣币的第一位配置
AreaCurrencyDTO areaCurrencyDTO = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), pkCountry).getData().get(0);
// 专区扣币的第一位配置所用字段
@ -1214,7 +1158,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (EOrderPayType.WALLET.getValue() == saOrder.getPayType()) {
// 钱包支付
// 查询之前订单的支付明细
List<CuMemberTrade> memberTradeList = cuMemberTradeService.querySourceCodeLastTrade(pkMember, orderCode, null);
List<CuMemberTrade> memberTradeList = iCuMemberTradeService.querySourceCodeLastTrade(pkMember, orderCode, null);
// 获取所有账户配置ID
List<Integer> pkAccountList = memberTradeList.stream().map(CuMemberTrade::getPkAccount).collect(Collectors.toList());
@ -1278,7 +1222,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
// 批量插入会员明细
cuMemberTradeService.batchSaveTradeByMemberCode(saveMemberTradeList);
iCuMemberTradeService.batchSaveTradeByMemberCode(saveMemberTradeList);
// 奖金账户有变化，需要同步处理 可提现奖金账户
BigDecimal bonusBigDecimal = ReflectUtils.invokeGetter(updateMemberAccount, MemberFieldConstants.ACCOUNT + 4);
@ -1287,7 +1231,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
ReflectUtils.invokeSetter(updateMemberAccount, MemberFieldConstants.WITHDRAW_ACCOUNT + 4, bonusBigDecimal);
}
// 更新会员余额
cuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
iCuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
// 更新创建人账号（根据订单类型不同，进行处理）
switch (EOrderType.getEnumByValue(saOrder.getOrderType())) {
@ -1299,13 +1243,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId);
memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate);
memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue());
cuMemberService.update(memberUpdateWrapper);
iCuMemberService.update(memberUpdateWrapper);
// 添加会员信息修改记录
CuMemberChangeLog cuMemberChangeLog = new CuMemberChangeLog();
cuMemberChangeLog.setPkMember(saOrder.getPkMember());
cuMemberChangeLog.setChangeType(EMemberChangeType.ORDER_RETURN.getValue());
cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel());
cuMemberChangeLogService.save(cuMemberChangeLog);
iCuMemberChangeLogService.save(cuMemberChangeLog);
}
}
@ -1318,7 +1262,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
memberUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId);
memberUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date());
memberUpdateWrapper.set("CATEGORY", ECategory.LOGGED_OUT.getValue());
cuMemberService.update(memberUpdateWrapper);
iCuMemberService.update(memberUpdateWrapper);
// 添加会员信息修改记录
List<CuMemberChangeLog> cuMemberChangeLogList = new ArrayList<>();
for (Long pkMember : pkMemberList) {
@ -1329,7 +1273,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel());
cuMemberChangeLogList.add(cuMemberChangeLog);
}
cuMemberChangeLogService.saveBatch(cuMemberChangeLogList);
iCuMemberChangeLogService.saveBatch(cuMemberChangeLogList);
}
@ -1415,7 +1359,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Date nowDate = new Date();
// 会员账户
CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
// 会员更新账户
CuMemberAccount updateMemberAccount = new CuMemberAccount();
updateMemberAccount.setPkMember(pkMember);
@ -1442,9 +1386,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
cuMemberTrade.setCreationTime(nowDate);
// 保存会员交易明细
cuMemberTradeService.save(cuMemberTrade);
iCuMemberTradeService.save(cuMemberTrade);
// 更新会员账户
cuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
iCuMemberAccountService.updateMemberAccount(updateMemberAccount, userId);
return null;
}
@ -1461,12 +1405,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Long pkMember = cuMember.getPkParent();
Integer pkCountry = cuMember.getPkSettleCountry();
// 获取推荐人的左右区
CuMember parentMember = cuMemberService.queryMember(pkMember);
CuMember parentMember = iCuMemberService.queryMember(pkMember);
int placeDept;
// 查询当前的业绩
CuMemberAchieve cuMemberAchieve = cuMemberAchieveService.queryCuMemberAchieveByPkMember(pkMember, pkCountry);
CuMemberAchieve cuMemberAchieve = iCuMemberAchieveService.queryCuMemberAchieveByPkMember(pkMember, pkCountry);
placeDept = getPlaceDept(isFirst, isFirstAchieve, cuMemberAchieve, parentMember.getPkId());
CuMemberExt cuMemberExt = cuMemberService.queryPlaceSponsorLastLeft(pkMember, placeDept);
CuMemberExt cuMemberExt = iCuMemberService.queryPlaceSponsorLastLeft(pkMember, placeDept);
CuMember placeCuMember = new CuMember();
if (cuMemberExt != null) {
placeCuMember.setPkPlaceParent(cuMemberExt.getPkId());
@ -1518,7 +1462,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
} else {
// 验证左右区人数，放入人数少的
List<CuMember> personNumList = cuMemberService.queryMemberLeftRightCount(pkParent);
List<CuMember> personNumList = iCuMemberService.queryMemberLeftRightCount(pkParent);
if (personNumList != null && personNumList.size() > 1) {
long leftNum = 0;
long rigthNum = 0;
@ -1588,7 +1532,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
*/
private String handleExistMemberContinue(Long pkMember, EMemberContinue eMemberContinue) {
// 查询会员信息
CuMember cuMember = cuMemberService.queryMember(pkMember);
CuMember cuMember = iCuMemberService.queryMember(pkMember);
if (null == cuMember) {
log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember);
return "会员不存在";
@ -1602,7 +1546,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Integer pkCountry = cuMember.getPkSettleCountry();
// 查询同姓名、同手机号最高奖衔
CuMemberExt cuMemberExt = cuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
CuMemberExt cuMemberExt = iCuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
// 休止期月数会员为6个月
int stopMonth = 6;
@ -1617,7 +1561,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 更新前，记录历史同姓名、同手机号【有效期】和【休止期】，撤单时需要使用
iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry);
// 【有效期】只更新同手机号比自己有效期早的，【休止期】按照同姓名、同手机号下最高奖衔的来算 -- 新注册订单，有效期肯定是最大的
cuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, cuMember.getExpireDate(), stopMonth, pkCountry);
iCuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, cuMember.getExpireDate(), stopMonth, pkCountry);
break;
case UPGRADE_ORDER:
// 升级订单
@ -1627,32 +1571,32 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return null;
} else {
// 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
}
break;
case UPGRADE_CANCEL:
// 升级撤单
if (stopMonth == 6) {
// 休止期是6个月，只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
}
break;
case CHANGE_AWARDS:
// 会员修改奖衔
// 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
break;
case BUY_GIFT:
// 续约礼包，下单成功后，更新【有效期】【休止期】
// 【有效期】【休止期】全部更新为续约这个最新的会员数据
cuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, null, stopMonth, pkCountry);
iCuMemberService.updateExpireAndStopDate(pkMember, memberName, phone, null, stopMonth, pkCountry);
break;
case CHANGE_INFO:
// 变更户籍（修改会员姓名 或 手机号）
// 更新前，记录历史同姓名、同手机号【有效期】和【休止期】
iCuMemberExpireHistoryService.saveExpireHistory(pkMember, memberName, phone, pkCountry);
// 【有效期】按最新更新，【休止期】按照同姓名、同手机号下最高奖衔的来算
cuMemberService.updateExpireAndStopDateByChange(pkMember, memberName, phone, stopMonth, pkCountry);
iCuMemberService.updateExpireAndStopDateByChange(pkMember, memberName, phone, stopMonth, pkCountry);
break;
default:
log.error("会员续约处理传入类型错误，eMemberContinue : {}", eMemberContinue);
@ -1660,7 +1604,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
// 更新有效状态
cuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
iCuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
return null;
}
@ -1674,7 +1618,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
*/
private String handleNotExistMemberContinue(Long pkMember) {
// 查询会员信息
CuMember cuMember = cuMemberService.queryMemberNotFlag(null, pkMember);
CuMember cuMember = iCuMemberService.queryMemberNotFlag(null, pkMember);
if (null == cuMember) {
log.error("会员续约有效期处理，会员不存在 pkMember ：{}", pkMember);
return "会员不存在";
@ -1688,7 +1632,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
Integer pkCountry = cuMember.getPkSettleCountry();
// 查询同姓名、同手机号最高奖衔
CuMemberExt cuMemberExt = cuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
CuMemberExt cuMemberExt = iCuMemberService.querySameMemberByAwards(memberName, phone, pkCountry);
if (null == cuMemberExt) {
log.info("会员续约不处理，会员撤单后不存在相同户籍数据");
return null;
@ -1706,14 +1650,14 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (null != cuMemberExpireHistory) {
// 有历史【有效期】记录
// 同姓名、同手机号，重置有效期等为历史记录中数据
cuMemberService.resetExpireAndStopDate(memberName, phone, cuMemberExpireHistory.getExpireDate(), cuMemberExpireHistory.getStopDate(), pkCountry);
iCuMemberService.resetExpireAndStopDate(memberName, phone, cuMemberExpireHistory.getExpireDate(), cuMemberExpireHistory.getStopDate(), pkCountry);
} else {
// 没有历史【有效期】记录
// 只需要处理【休止期】
cuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
iCuMemberService.updateStopDate(pkMember, memberName, phone, stopMonth, pkCountry);
}
// 更新有效状态
cuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
iCuMemberService.updateExpireStatus(null, memberName, phone, pkCountry);
return null;
}

3
bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml
View File

@ -57,9 +57,6 @@
<if test="approveState != null">
and r.APPROVE_STATE = #{approveState}
</if>
<if test="batch != null and batch != ''">
and r.BATCH like '%' || #{batch} || '%'
</if>
<if test="approver != null and approver != ''">
and r.APPROVER like '%' || #{approver} || '%'
</if>