From 0eb89737650e091c0f377732beb761cbd6d8e577 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 15:17:26 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 147 ++++++++++++++++++++++++++++++------------------
1 files changed, 92 insertions(+), 55 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 9270c40..d6a1e7b 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
@@ -3,16 +3,22 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,6 +44,8 @@
private final MallMemberMapper mallMemberMapper;
+ private final MallMemberWalletMapper mallMemberWalletMapper;
+
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
@@ -49,6 +57,9 @@
private final AppVersionMapper appVersionMapper;
private final MallNewsInfoMapper mallNewsInfoMapper;
+ private final MallShopApplyMapper mallShopApplyMapper;
+
+ private final IMallMoneyFlowService mallMoneyFlowService;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -312,70 +323,96 @@
}
@Override
- public MallNewsInfo getNewsInfoById(long id) {
- return mallNewsInfoMapper.selectById(id);
- }
-
- @Override
- public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
- Page<AdminMallNewsInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<AdminMallNewsInfoVo> adminMallNewsInfoVos = mallNewsInfoMapper.getNewInfoListInPage(page, mallNewsInfo);
- return adminMallNewsInfoVos;
- }
-
- @Override
- public FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
- Integer type = mallNewsInfoDto.getType();
- if(type == 2){
- Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
- if(goodsId == 0L){
- return new FebsResponse().fail().message("请选择跳转的产品");
- }
- }
- MallNewsInfo mallNewsInfo = new MallNewsInfo();
- mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
- mallNewsInfo.setContent(mallNewsInfoDto.getContent());
- mallNewsInfo.setType(mallNewsInfoDto.getType());
- if(mallNewsInfoDto.getType() == 2){
- mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
- }
- mallNewsInfoMapper.insert(mallNewsInfo);
- return new FebsResponse().success();
- }
-
- @Override
- public FebsResponse delNewsInfo(Long id) {
- MallNewsInfo mallNewsInfo = mallNewsInfoMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallNewsInfo)){
+ @Transactional
+ public FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto) {
+ Long memberId = mallSystemPayDto.getId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
}
- mallNewsInfoMapper.deleteById(id);
+
+ BigDecimal bigDecimal = mallSystemPayDto.getAddBalance();
+ if(bigDecimal.compareTo(BigDecimal.ZERO) <= 0){
+ return new FebsResponse().fail().message("拨付数目需要大于0");
+ }
+
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ mallMemberWallet.setBalance(mallMemberWallet.getBalance().add(bigDecimal));
+ mallMemberWalletMapper.updateBalanceWithId(mallMemberWallet);
+
+ mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, FlowTypeEnum.BALANCE.getValue());
return new FebsResponse().success();
}
@Override
- public FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
- MallNewsInfo mallNewsInfoBefore = mallNewsInfoMapper.selectById(mallNewsInfoDto.getId());
- if(ObjectUtil.isEmpty(mallNewsInfoBefore)){
+ public AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id) {
+ AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
+ return adminAgentLevelSetInfoVo;
+ }
+
+ @Override
+ public FebsResponse agentLevelSetUpdate(AgentLevelSetUpdateDto agentLevelSetUpdateDto) {
+ Long memberId = agentLevelSetUpdateDto.getId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
}
- Integer type = mallNewsInfoDto.getType();
- if(type == 2){
- Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
- if(goodsId == 0L){
- return new FebsResponse().fail().message("请选择跳转的产品");
- }
- }
- MallNewsInfo mallNewsInfo = new MallNewsInfo();
- mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
- mallNewsInfo.setContent(mallNewsInfoDto.getContent());
- mallNewsInfo.setType(mallNewsInfoDto.getType());
- if(mallNewsInfoDto.getType() == 2){
- mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
- }
- mallNewsInfoMapper.insert(mallNewsInfo);
- mallNewsInfoMapper.deleteById(mallNewsInfoDto.getId());
+ mallMember.setLevel(agentLevelSetUpdateDto.getLevelCode());
+ mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse resetPwd(Long id) {
+ MallMember mallMember = this.baseMapper.selectById(id);
+ if (mallMember == null) {
+ throw new FebsException("用户不存在");
+ }
+
+ String pwd = SecureUtil.md5("a123456");
+ mallMember.setPassword(pwd);
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("重置成功");
+ }
+
+ @Override
+ public IPage<MallDataVo> getMallDataList(MallMember mallMember, QueryRequest request) {
+ Page<MallDataVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallDataVo> mallDataVos = this.baseMapper.getMallDataListInPage(page, mallMember);
+ return mallDataVos;
+ }
+
+ @Override
+ public IPage<MallShopApply> findShopApplyListInPage(MallShopApply mallShopApply, QueryRequest request) {
+ Page<MallShopApply> page = new Page<>(request.getPageNum(), request.getPageSize());
+
+ return mallShopApplyMapper.selectShopApplyInPage(mallShopApply, page);
+ }
+
+ @Override
+ public MallShopApply findShopApplyById(Long id) {
+ return mallShopApplyMapper.selectById(id);
+ }
+
+ @Override
+ public void applyCheckAgree(Long id) {
+ MallShopApply apply = mallShopApplyMapper.selectById(id);
+ if (!MallShopApply.APPLY_ING.equals(apply.getStatus())) {
+ throw new FebsException("申请已审核, 请勿重复操作");
+ }
+
+ apply.setStatus(MallShopApply.APPLY_AGREE);
+ mallShopApplyMapper.updateById(apply);
+ }
+
+ @Override
+ public void applyCheckDisAgree(Long id) {
+ MallShopApply apply = mallShopApplyMapper.selectById(id);
+ if (!MallShopApply.APPLY_ING.equals(apply.getStatus())) {
+ throw new FebsException("申请已审核, 请勿重复操作");
+ }
+
+ apply.setStatus(MallShopApply.APPLY_DISAGREE);
+ mallShopApplyMapper.updateById(apply);
+ }
}
--
Gitblit v1.9.1