From 04511f746e0cd35fa18e0877d7861d271eb81e9a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 07 Sep 2023 17:54:28 +0800 Subject: [PATCH] 优惠卷列表 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 79 insertions(+), 38 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index 1e1ee93..6f9217b 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java @@ -78,6 +78,8 @@ private final MallScoreRecordMapper mallScoreRecordMapper; private final MallScoreAchieveReleaseMapper mallScoreAchieveReleaseMapper; private final NBYHService nbyhService; + private final MallMemberAuthMapper mallMemberAuthMapper; + private final MallMemberAlipayMapper mallMemberAlipayMapper; @Override public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) { @@ -829,52 +831,91 @@ } Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId(); - MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId); - if(ObjectUtil.isEmpty(mallMemberBank)){ - return new FebsResponse().fail().message("提现银行卡已删除"); + MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(wtihdrawTypeId); + if(ObjectUtil.isEmpty(mallMemberAlipay)){ + return new FebsResponse().fail().message("提现方式已删除"); } String agreeType = mallMemberWithdrawInfo.getAgreeType(); - if("1".equals(agreeType)){ - mallMemberWithdraw.setStatus(2); - mallMemberWithdrawMapper.updateById(mallMemberWithdraw); - QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>(); - flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo()); - flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue()); - MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper); - if(ObjectUtil.isNotEmpty(mallMoneyFlow)){ - mallMoneyFlow.setStatus(2); - mallMoneyFlowMapper.updateById(mallMoneyFlow); - } - return new FebsResponse().success(); - }else{ - String bankName = mallMemberBank.getBankName(); - NBYHResponse nbyhResponse = new NBYHResponse(); - if("宁波银行".equals(bankName)){ - nbyhResponse = nbyhService.tradeSinge(mallMemberWithdraw.getId()); - }else{ - nbyhResponse = nbyhService.tradeSingeOuterTransfer(mallMemberWithdraw.getId()); - } - if(nbyhResponse.isFlag()){ - mallMemberWithdraw.setStatus(2); - mallMemberWithdrawMapper.updateById(mallMemberWithdraw); + mallMemberWithdraw.setStatus(2); + mallMemberWithdrawMapper.updateById(mallMemberWithdraw); - QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>(); - flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo()); - flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue()); - MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper); - if(ObjectUtil.isNotEmpty(mallMoneyFlow)){ - mallMoneyFlow.setStatus(2); - mallMoneyFlowMapper.updateById(mallMoneyFlow); - } - return new FebsResponse().success().message(nbyhResponse.getMsg()); - }else{ - return new FebsResponse().fail().message(nbyhResponse.getMsg()); - } + QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>(); + flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo()); + flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue()); + MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper); + if(ObjectUtil.isNotEmpty(mallMoneyFlow)){ + mallMoneyFlow.setStatus(2); + mallMoneyFlowMapper.updateById(mallMoneyFlow); } + return new FebsResponse().success(); +// if("1".equals(agreeType)){ +// }else{ +// String bankName = mallMemberBank.getBankName(); +// NBYHResponse nbyhResponse = new NBYHResponse(); +// if("宁波银行".equals(bankName)){ +// nbyhResponse = nbyhService.tradeSinge(mallMemberWithdraw.getId()); +// }else{ +// nbyhResponse = nbyhService.tradeSingeOuterTransfer(mallMemberWithdraw.getId()); +// } +// if(nbyhResponse.isFlag()){ +// mallMemberWithdraw.setStatus(2); +// mallMemberWithdrawMapper.updateById(mallMemberWithdraw); +// +// QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>(); +// flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo()); +// flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue()); +// MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper); +// if(ObjectUtil.isNotEmpty(mallMoneyFlow)){ +// mallMoneyFlow.setStatus(2); +// mallMoneyFlowMapper.updateById(mallMoneyFlow); +// } +// return new FebsResponse().success().message(nbyhResponse.getMsg()); +// }else{ +// return new FebsResponse().fail().message(nbyhResponse.getMsg()); +// } +// } } + @Override + public IPage<MallMemberAuth> memberAuthList(MoneyChargeListDto moneyChargeListDto, QueryRequest request) { + Page<MallMemberAuth> page = new Page<>(request.getPageNum(), request.getPageSize()); + return mallMemberAuthMapper.getMemberAuthListInPage(page, moneyChargeListDto); + } + + @Override + public FebsResponse authAgree(Long id) { + MallMemberAuth mallMemberAuth = mallMemberAuthMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMemberAuth)){ + return new FebsResponse().fail().message("系统繁忙,请刷新后重试"); + } + if(1 != mallMemberAuth.getStatus()){ + return new FebsResponse().fail().message("当前状态不是进行中"); + } + mallMemberAuth.setStatus(2); + mallMemberAuthMapper.updateById(mallMemberAuth); + + MallMember mallMember = mallMemberMapper.selectById(mallMemberAuth.getMemberId()); + mallMember.setIsAuth(1); + mallMemberMapper.updateById(mallMember); + return new FebsResponse().success(); + } + + @Override + public FebsResponse authDisagree(Long id) { + MallMemberAuth mallMemberAuth = mallMemberAuthMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMemberAuth)){ + return new FebsResponse().fail().message("系统繁忙,请刷新后重试"); + } + if(1 != mallMemberAuth.getStatus()){ + return new FebsResponse().fail().message("当前状态不是进行中"); + } + mallMemberAuth.setStatus(3); + mallMemberAuthMapper.updateById(mallMemberAuth); + return new FebsResponse().success(); + } + private String refererIds(String parentId) { boolean flag = false; if (StrUtil.isBlank(parentId)) { -- Gitblit v1.9.1