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

## 撤单处理会员等级；

This commit is contained in:
cabbage 2025-10-28 11:41:47 +08:00
parent c922be0693
commit 970bba1555
21 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java
View File

@ -119,19 +119,6 @@ public interface IMemberServiceApi {
*/
R<CuMember> getMember(Long pkMember);
/**
* 获取会员缓存
*
* @param memberCode 会员编号
* @return CuMember
*/
R<CuMember> queryMember(String memberCode);
/*
* 查询会员
**/
R<CuMember> queryMember(Long pkMember);
/**
* 保存新会员信息,待支付订单
*
@ -366,4 +353,13 @@ public interface IMemberServiceApi {
*/
R<Integer> getMemberPhoneCount(String phone);
/**
* 查询最新升级记录
*
* @param pkMember 会员ID
* @param pkOrder 订单ID（可为null）
* @return
*/
R<CuMemberLevel> getLastUpgrade(Long pkMember, Long pkOrder);
}

9
bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberRechargeController.java
View File

@ -1,6 +1,5 @@
package com.hzs.member.account.controller.api;
import com.hzs.common.core.constant.msg.FinanceMsgConstants;
import com.hzs.common.core.enums.EOrderPrefix;
import com.hzs.common.core.utils.CommonUtil;
@ -20,14 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
/**
* <p>
* 会员充值表 前端控制器
* </p>
*
* @author hzs
* @since 2022-09-08
*/
@RestController
@ -105,7 +98,7 @@ public class ApiCuMemberRechargeController extends BaseController {
// 用户支付密不能为空
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.PAYMENT_PASSWORD_NOT_EMPTY));
}
CuMember cuMember = cuMemberService.queryMember(SecurityUtils.getUserId());
CuMember cuMember = cuMemberService.getMember(SecurityUtils.getUserId());
if (SecurityUtils.matchesPassword(pwd, cuMember.getPayPwd())) {
return AjaxResult.success();
}

7
bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java
View File

@ -21,7 +21,6 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLogExt;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.system.config.BdAccount;
import com.hzs.common.domain.system.config.BdTransfer;
import com.hzs.common.domain.system.config.BdTransferSpecial;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils;
import com.hzs.member.account.dto.CuMemberRechargeAccountParam;
@ -42,7 +41,7 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -171,10 +170,10 @@ public class ApiCuMemberTransferController extends BaseController {
private List<CuMemberServiceLog> getServiceLogValue(Integer pkCountry, Long pkMember) {
//查询体系
CuMember cuMember = cuMemberService.queryMember(pkMember);
CuMember cuMember = cuMemberService.getMember(pkMember);
Long pkVertex = cuMember.getPkVertex();
List<Integer> editTypeList = Arrays.asList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
List<Integer> editTypeList = Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
CuMemberServiceLogExt log = new CuMemberServiceLogExt();
log.setPkMember(pkMember);
log.setPkVertex(pkVertex);

8
bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberAccountSummaryController.java
View File

@ -79,7 +79,7 @@ public class CuMemberAccountSummaryController {
if (EStatisticsScope.TOP.getValue() == param.getType()) {
// 按顶点统计
CuMember cuMember = iCuMemberService.queryMember(param.getPkMember());
CuMember cuMember = iCuMemberService.getMember(param.getPkMember());
if (cuMember != null) {
cuMemberAccountExt = iCuMemberAccountService.queryAccountSummaryByMember(cuMember.getMemberCode(), pkCountry);
code = cuMember.getMemberCode();
@ -101,7 +101,7 @@ public class CuMemberAccountSummaryController {
}
} else if (EStatisticsScope.MEMBER.getValue() == param.getType()) {
// 按会员统计
CuMember cuMember = iCuMemberService.queryMember(param.getMemberCode());
CuMember cuMember = iCuMemberService.getMember(param.getMemberCode());
if (cuMember != null) {
cuMemberAccountExt = iCuMemberAccountService.queryAccountSummaryByMember(param.getMemberCode(), pkCountry);
code = cuMember.getMemberCode();
@ -143,7 +143,7 @@ public class CuMemberAccountSummaryController {
if (EStatisticsScope.TOP.getValue() == param.getType()) {
// 按顶点统计
CuMember cuMember = iCuMemberService.queryMember(param.getPkMember());
CuMember cuMember = iCuMemberService.getMember(param.getPkMember());
if (cuMember != null) {
cuMemberAccountExt = iCuMemberAccountService.queryAccountSummaryByMember(cuMember.getMemberCode(), pkCountry);
code = cuMember.getMemberCode();
@ -159,7 +159,7 @@ public class CuMemberAccountSummaryController {
}
} else if (EStatisticsScope.MEMBER.getValue() == param.getType()) {
// 按会员统计
CuMember cuMember = iCuMemberService.queryMember(param.getMemberCode());
CuMember cuMember = iCuMemberService.getMember(param.getMemberCode());
if (cuMember != null) {
cuMemberAccountExt = iCuMemberAccountService.queryAccountSummaryByMember(param.getMemberCode(), pkCountry);
code = cuMember.getMemberCode();

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

@ -187,8 +187,8 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
private CuMemberTrade getCuMemberTradeToTransferOut(CuMemberTransfer cuMemberTransfer) {
Long pkMember = cuMemberTransfer.getPkMember();
Long toPkMember = cuMemberTransfer.getToPkMember();
CuMember member = iCuMemberService.queryMember(pkMember);
CuMember toMember = iCuMemberService.queryMember(toPkMember);
CuMember member = iCuMemberService.getMember(pkMember);
CuMember toMember = iCuMemberService.getMember(toPkMember);
//提现金额
BigDecimal tradeAmount = cuMemberTransfer.getTransferMoney();
BigDecimal amount = tradeAmount.negate();
@ -224,8 +224,8 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
private CuMemberTrade getCuMemberTradeToTransferIn(CuMemberTransfer cuMemberTransfer) {
Long pkMember = cuMemberTransfer.getPkMember();
Long toPkMember = cuMemberTransfer.getToPkMember();
CuMember member = iCuMemberService.queryMember(pkMember);
CuMember toMember = iCuMemberService.queryMember(toPkMember);
CuMember member = iCuMemberService.getMember(pkMember);
CuMember toMember = iCuMemberService.getMember(toPkMember);
//提现金额
BigDecimal tradeAmount = cuMemberTransfer.getIssuedAmount();
int accountType = cuMemberTransfer.getPkToAccount();

2
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

@ -97,7 +97,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
@Override
public CuMemberDisVO queryCuMemberDis(MemberAchieveDisParam memberAchieveDisParam) {
CuMember cuMember = iCuMemberService.queryMember(memberAchieveDisParam.getMemberCode());
CuMember cuMember = iCuMemberService.getMember(memberAchieveDisParam.getMemberCode());
CuMemberDisVO cuMemberDisVO = BeanUtil.copyProperties(cuMember, CuMemberDisVO.class);
cuMemberDisVO.setMemberCode(cuMember.getMemberCode());
cuMemberDisVO.setMemberName(cuMember.getMemberName());

17
bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java
View File

@ -17,6 +17,7 @@ import com.hzs.member.base.dto.ShowWaresDTO;
import com.hzs.member.base.dto.ZeroElementRevokeDTO;
import com.hzs.member.base.service.*;
import com.hzs.member.base.IMemberServiceApi;
import com.hzs.member.detail.service.ICuMemberLevelService;
import com.hzs.member.empty.service.ICuMemberEmptyCodeService;
import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam;
import lombok.extern.slf4j.Slf4j;
@ -42,6 +43,8 @@ public class MemberServiceProvider implements IMemberServiceApi {
private ICuMemberBusinessService iCuMemberBusinessService;
@Autowired
private ICuMemberEmptyCodeService iCuMemberEmptyCodeService;
@Autowired
private ICuMemberLevelService iCuMemberLevelService;
@Override
public R<LoginMember> getMemberInfo(String memberCode) {
@ -156,16 +159,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberService.getMember(pkMember));
}
@Override
public R<CuMember> queryMember(String memberCode) {
return R.ok(iCuMemberService.queryMember(memberCode));
}
@Override
public R<CuMember> queryMember(Long pkMember) {
return R.ok(iCuMemberService.queryMember(pkMember));
}
@Override
public R<Boolean> saveMember(CuMember cuMember) {
try {
@ -357,4 +350,8 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberService.getMemberPhoneCount(phone));
}
@Override
public R<CuMemberLevel> getLastUpgrade(Long pkMember, Long pkOrder) {
return R.ok(iCuMemberLevelService.getLastUpgrade(pkMember, pkOrder));
}
}

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

@ -80,16 +80,6 @@ public interface ICuMemberService extends IService<CuMember> {
*/
CuMember getMember(Long pkId);
/*
* 查询会员
**/
CuMember queryMember(String memberCode);
/*
* 查询会员
**/
CuMember queryMember(Long pkMember);
/**
* 校验会员下的安置人、推荐人是否存在
*

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

@ -899,6 +899,11 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, BusinessCommissionDTO businessCommissionDTO) {
deductCancelOrderCost(businessCommissionDTO);
if (EOrderType.RETAIL_UPGRADE.getValue() == saOrder.getOrderType()) {
// 处理等级
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, new Date());
}
// 更新会员标记，如果是则更新会员信息
if (saOrder.getUpdateFlag() != null && EYesNo.YES.getIntValue() == saOrder.getUpdateFlag()) {
if (null != cuMember) {

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

@ -167,16 +167,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
return baseMapper.queryLoginMember(null, pkId);
}
@Override
public CuMember queryMember(String memberCode) {
return baseMapper.queryLoginMember(memberCode, null);
}
@Override
public CuMember queryMember(Long pkMember) {
return baseMapper.queryLoginMember(null, pkMember);
}
@Override
public boolean checkLowerMember(Long pkMember) {
LambdaQueryWrapper<CuMember> queryWrapper = new LambdaQueryWrapper<>();

10
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java
View File

@ -28,4 +28,14 @@ public interface CuMemberLevelMapper extends BaseMapper<CuMemberLevel> {
*/
int insertGradeBatch(@Param("memberGradeList") List<CuMemberGrade> memberGradeList);
/**
* 查询最新升级记录
*
* @param pkMember 会员ID
* @param pkOrder 订单ID（可为null）
* @return
*/
CuMemberLevel getLastUpgrade(@Param("pkMember") Long pkMember,
@Param("pkOrder") Long pkOrder);
}

9
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java
View File

@ -37,4 +37,13 @@ public interface ICuMemberLevelService extends IService<CuMemberLevel> {
*/
int insertGradeBatch(List<CuMemberGrade> memberGradeList);
/**
* 查询最新升级记录
*
* @param pkMember 会员ID
* @param pkOrder 订单ID（可为null）
* @return
*/
CuMemberLevel getLastUpgrade(Long pkMember, Long pkOrder);
}

6
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java
View File

@ -38,4 +38,10 @@ public class CuMemberLevelServiceImpl extends ServiceImpl<CuMemberLevelMapper, C
return baseMapper.insertGradeBatch(memberGradeList);
}
@Override
public CuMemberLevel getLastUpgrade(Long pkMember, Long pkOrder) {
return baseMapper.getLastUpgrade(pkMember, pkOrder);
}
}

4
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
View File

@ -90,7 +90,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
if (CollUtil.isNotEmpty(pkMemberList)) {
//根据国家查汇率
BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
CuMember cuMember = iCuMemberService.queryMember(pkMember);
CuMember cuMember = iCuMemberService.getMember(pkMember);
//查询会员排除注水业绩
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMemberList(pkMemberList).memberCode(cuMember.getMemberCode()).systemType(systemType).build();
CuMemberRetailAchieveVO excludeWaterAchieve = baseMapper.selectExcludeWaterSmallAchieve(memberAchieveVO);
@ -361,7 +361,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
.memberRetailSTable(memberSecondTable)
.pkMemberList(pkMemberList).systemType(systemType).build();
List<CuMemberRetailDataStatisticsDetailVO> statisticsDetailVOList = baseMapper.getRetailDataStatisticsDetail(memberAchieveVO);
CuMember cuMember = iCuMemberService.queryMember(userId);
CuMember cuMember = iCuMemberService.getMember(userId);
CuMemberRetailDataStatisticsResultVO result = DataStatisticsUtil.getCalcMap(statisticsDetailVOList, cuMember);
log.info("statisticsDetailVOList: {}", JSONUtil.toJsonStr(statisticsDetailVOList));
log.info("calcMap -> {}", JSONUtil.toJsonStr(result));

16
bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml
View File

@ -101,4 +101,20 @@
)
</update>
<!-- 查询最新升级记录 -->
<select id="getLastUpgrade" resultMap="CuMemberLevel">
select *
from (
select *
from CU_MEMBER_LEVEL cml
where cml.del_flag = 0
<if test="pkOrder != null">
and (cml.pk_order != #{pkOrder} or cml.pk_order is null )
</if>
and cml.pk_member = #{pkMember}
order by cml.upgrade_time desc
) t
where rownum = 1
</select>
</mapper>

4
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java
View File

@ -179,7 +179,7 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
}
// 会员信息
CuMember cuMember = iMemberServiceApi.queryMember(detailParam.getMemberCode()).getData();
CuMember cuMember = iMemberServiceApi.getMember(detailParam.getMemberCode()).getData();
// 封装业务操作日志
logDTOList.add(BusinessLogDTO.builder()
.businessType(EApprovalBusiness.PICK_ADD.getValue())
@ -283,7 +283,7 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
}
// 被操作会员
CuMember cuMember = iMemberServiceApi.queryMember(detailParam.getMemberCode()).getData();
CuMember cuMember = iMemberServiceApi.getMember(detailParam.getMemberCode()).getData();
// 封装业务操作日志
logDTOList.add(BusinessLogDTO.builder()
.businessType(EApprovalBusiness.PICK_ADD_DEL.getValue())

5
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java
View File

@ -619,11 +619,10 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
Long pkBaseId = baseConfig.getPkId();
//推荐人
Long pkMember = saOrderExt.getPkReference();
log.info("推荐人编号：" + pkMember);
//推荐人等级ID
Integer pkSettleGrade = memberServiceApi.queryMember(pkMember).getData().getPkSettleGrade();
Integer pkSettleGrade = memberServiceApi.getMember(pkMember).getData().getPkSettleGrade();
//被推荐人等级ID
Integer pkRecommendGrade = memberServiceApi.queryMember(saOrderExt.getPkMember()).getData().getPkSettleGrade();
Integer pkRecommendGrade = memberServiceApi.getMember(saOrderExt.getPkMember()).getData().getPkSettleGrade();
log.info("被推荐人编号：" + saOrderExt.getPkMember());
//国家
Integer pkCountry = saOrderExt.getPkCountry();

30
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -302,11 +302,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助服务-修改地址订单列表
* @author: zhang jing
* @date: 2023/5/11 16:03
* @param: [param]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助服务-修改地址订单列表
**/
@GetMapping("/selflist")
public TableDataInfo selflist(MyOrderParam param) {
@ -357,11 +353,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助业务-订单自提订单列表
* @author: zhang jing
* @date: 2023/5/29 9:10
* @param: [selfPickUpParam]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助业务-订单自提订单列表
**/
@GetMapping("/self-list")
public TableDataInfo selfOrderList(MyOrderParam param) {
@ -519,11 +511,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助撤单列表(24点内)
* @author: zhang jing
* @date: 2023/11/21 10:33
* @param: [param]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助撤单列表(24点内)
**/
@GetMapping("/selfRevokeList")
public TableDataInfo selfRevokeList(MyOrderParam param) {
@ -551,11 +539,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自动撤单参数校验
* @author: zhang jing
* @date: 2023/11/21 14:49
* @param: [orderQueryParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 自动撤单参数校验
**/
@PostMapping("/check-self-revoke-order")
public AjaxResult checkSelfRevokeOrder(@RequestBody MyOrderVO myOrderVO) {
@ -577,11 +561,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助撤单
* @author: zhang jing
* @date: 2023/11/21 15:19
* @param: [orderCancelParam]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 自助撤单
**/
@PostMapping("/self-revoke-order")
public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) {

49
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -21,6 +21,7 @@ import com.hzs.common.core.utils.reflect.ReflectUtils;
import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.business.UpPolicyCurrency;
import com.hzs.common.domain.member.detail.CuMemberLevel;
import com.hzs.common.domain.member.detail.CuMemberServiceLog;
import com.hzs.common.domain.member.ext.CuMemberAccountExt;
import com.hzs.common.domain.member.ext.CuMemberExt;
@ -84,7 +85,7 @@ import java.util.stream.Collectors;
public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> implements ISaOrderService {
@DubboReference
IMemberServiceApi memberServiceApi;
IMemberServiceApi iMemberServiceApi;
@DubboReference
IMemberBankServiceApi memberBankServiceApi;
@DubboReference
@ -201,7 +202,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public CuMember getCuMemberByKey(Long pkId) {
return memberServiceApi.getMemberById(pkId).getData();
return iMemberServiceApi.getMemberById(pkId).getData();
}
@Override
@ -478,7 +479,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
//创建用户
CuMemberExt memberExt = createMember(orderBlankRegParams);
R<CuMember> member = memberServiceApi.createEmptyOrderMember(memberExt);
R<CuMember> member = iMemberServiceApi.createEmptyOrderMember(memberExt);
if (member.getData() == null) {
throw new ServiceException("保存会员失败");
}
@ -663,7 +664,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Transactional(rollbackFor = Exception.class)
public void revokeSaOrderByOrderCode(Long pkApprove, OrderCancelParam orderCancelParam, ValidateCancelOrderVO validateCancelOrderVO) {
SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt();
CuMemberExt memberExt = memberServiceApi.getMemberById(saOrderExt.getPkMember()).getData();
CuMemberExt memberExt = iMemberServiceApi.getMemberById(saOrderExt.getPkMember()).getData();
BusinessCommissionDTO businessCommissionDTO = null;
if (orderCancelParam.getCancelRoad() == 1) {
EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL;
@ -735,7 +736,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
throw new ServiceException("更新订单失败");
}
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) {
throw new ServiceException("撤单失败");
}
} else {
@ -756,7 +757,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|| (ObjectUtil.isNotEmpty(memberExt) && ECancelOrderType.OTHER_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType() && saOrderExt.getPayTime().equals(memberExt.getPayTime()))
) {
// 单点撤单，变死点
R<Boolean> tmpR = memberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
R<Boolean> tmpR = iMemberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new ServiceException("撤单失败 " + tmpR.getMsg());
}
@ -770,7 +771,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
baseMapper.updateSaOrderByMember(memberList, pkApprove, currentDate);
}
R<Boolean> tmpR = memberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
R<Boolean> tmpR = iMemberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new ServiceException("撤单失败 " + tmpR.getMsg());
}
@ -905,7 +906,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 如果是注册订单，需要校验下面是否有会员
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 注册类订单，需要校验是否推荐过人或者安置过人，如果有则不允许进行取消
if (memberServiceApi.checkLowerMember(saOrder.getPkMember()).getData()) {
if (iMemberServiceApi.checkLowerMember(saOrder.getPkMember()).getData()) {
// 订单所属会员下存在用户不能取消
return TransactionUtils.getContent(MemberMsgConstants.EXIST_MEMBER_NOT_CANCEL);
}
@ -931,7 +932,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 如果是注册订单，需要取消点位
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
if (!memberServiceApi.cancelMember(saOrder.getPkMember()).getData()) {
if (!iMemberServiceApi.cancelMember(saOrder.getPkMember()).getData()) {
throw new ServiceException("取消订单失败");
}
}
@ -1131,7 +1132,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Transactional(rollbackFor = Exception.class)
public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) {
SaOrderExt saOrderExt = myOrderVO.getSaOrderExt();
BusinessCommissionDTO businessCommissionDTO = null;
if (saOrderExt != null) {
// 删除订单
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
@ -1158,17 +1158,19 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderChargeLogService.save(saOrderChargeLog);
// 撤销注册订单
CuMember member = memberServiceApi.getMember(SecurityUtils.getUserId()).getData();
CuMember member = iMemberServiceApi.getMember(SecurityUtils.getUserId()).getData();
if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()
|| (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && myOrderVO.getPayTime().equals(member.getPayTime()))
|| (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue()
&& myOrderVO.getPayTime().equals(member.getPayTime())
&& member.getCreationTime().equals(member.getPayTime()))
) {
// 逻辑删除会员
if (!memberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, null).getData()) {
throw new ServiceException("撤单失败");
}
} else {
// 其他撤单
this.handleCancelUpgradeOrder(saOrderExt, myOrderVO.getUpdSaOrder(), pkApprove, businessCommissionDTO);
this.handleCancelUpgradeOrder(saOrderExt, myOrderVO.getUpdSaOrder(), pkApprove, null);
}
try {
@ -1384,14 +1386,29 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
private void handleCancelUpgradeOrder(SaOrderExt saOrderExt, SaOrder updSaOrder, Long pkApprove, BusinessCommissionDTO businessCommissionDTO) {
// 其他撤单 撤销升级订单
CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
if (EOrderType.RETAIL_PICK.getValue() == saOrderExt.getOrderType()) {
if (EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) {
// 处理等级
// 获取最新的升级记录，如果没有则查询会员的注册信息
// 查询会员升级记录表最终数据
CuMemberLevel cuMemberLevel = iMemberServiceApi.getLastUpgrade(cuMember.getPkId(), saOrderExt.getPkId()).getData();
if (null != cuMemberLevel) {
// 存在升级记录
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
} else {
// 没有升级记录，重置成会员
cuMember.setPkSettleGrade(iGradeServiceApi.getGradeByGradeValue(EGrade.MEMBER.getValue(), saOrderExt.getPkCountry()).getData().getPkId());
cuMember.setConsumeMoney(BigDecimal.ZERO);
cuMember.setConsumeAchieve(BigDecimal.ZERO);
}
saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue());
} else if (EOrderType.RETAIL_PICK.getValue() == saOrderExt.getOrderType()) {
// 新提货订单
if (!iAcRetailPickService.cancelRetailPickOrder(saOrderExt.getPkId(), pkApprove)) {
throw new ServiceException("撤销订单退还提货失败");
}
}
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) {
throw new ServiceException("撤单处理会员失败");
}
}

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

@ -1,7 +1,5 @@
package com.hzs.system.config.controller.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.EnumsPrefixConstants;
@ -30,24 +28,17 @@ import java.util.List;
import java.util.Map;
/**
* <p>
* 会员转账币种白名单 前端控制器
* </p>
*
* @author hzs
* @since 2024-07-03
*/
@RestController
@RequestMapping("/manage/transfer-white")
public class CuMemberTransferWhiteController extends BaseController {
@DubboReference
private IMemberServiceApi iMemberServiceApi;
@DubboReference
IMemberServiceApi iMemberServiceApi;
@Autowired
private ICuMemberTransferWhiteService transferWhiteService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
@ -127,7 +118,7 @@ public class CuMemberTransferWhiteController extends BaseController {
@Log(module = EOperationModule.TRADE_CONFIG, business = EOperationBusiness.TRANSFER_ACCOUNT_WHITE, method = EOperationMethod.UPDATE)
@PostMapping("/update")
public AjaxResult updateTransferConfig(@RequestBody CuMemberTransferWhiteVO transferWhiteVO) {
CuMember cumember = iMemberServiceApi.queryMember(transferWhiteVO.getMemberCode()).getData();
CuMember cumember = iMemberServiceApi.getMember(transferWhiteVO.getMemberCode()).getData();
AjaxResult ajaxResult = parametersVerify(transferWhiteVO, cumember);
if ((Integer) ajaxResult.get(AjaxResult.CODE_TAG) == HttpStatus.ERROR) {
return ajaxResult;

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

@ -54,7 +54,9 @@ public class BdGradeServiceImpl extends ServiceImpl<BdGradeMapper, BdGrade> impl
@Override
public BdGrade getGradeByGradeValue(Integer gradeValue, Integer pkCountry) {
LambdaQueryWrapper<BdGrade> queryWrapper = new LambdaQueryWrapper<>();
if (null != pkCountry) {
queryWrapper.eq(BdGrade::getPkCountry, pkCountry);
}
queryWrapper.eq(BdGrade::getGradeValue, gradeValue);
queryWrapper.orderByAsc(BdGrade::getStartValue);
return baseMapper.selectOne(queryWrapper);