From 06ccd882e48b982cf29dfd3ff17066d261403324 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 28 May 2020 16:51:53 +0800
Subject: [PATCH] 移除重复的会员收款方式类
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
index 5842411..401e7ac 100644
--- a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
@@ -8,24 +8,26 @@
import org.springframework.stereotype.Service;
+import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.home.dao.MemberPaymentMethodDao;
import com.xcong.excoin.modules.home.dao.MemberQuickBuySaleDao;
import com.xcong.excoin.modules.home.dto.MemberQuickBuySaleCommitDto;
import com.xcong.excoin.modules.home.dto.MemberQuickBuySaleDto;
-import com.xcong.excoin.modules.home.entity.MemberPaymentMethodEntity;
import com.xcong.excoin.modules.home.entity.MemberQuickBuySaleEntity;
import com.xcong.excoin.modules.home.mapper.MemberQuickBuySaleEntityMapper;
import com.xcong.excoin.modules.home.service.MemberQuickBuySaleService;
+import com.xcong.excoin.modules.home.vo.MemberQuickBuySaleDetailVo;
import com.xcong.excoin.modules.home.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.dao.MemberDao;
+import com.xcong.excoin.modules.member.dao.MemberPaymentMethodDao;
import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberPaymentMethodEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.platform.dao.PlatformPaymentMethodDao;
import com.xcong.excoin.modules.platform.entity.PlatformPaymentMethodEntity;
@@ -56,6 +58,7 @@
memberQuickBuySaleEntity.setMemberId(member.getId());
memberQuickBuySaleEntity.setAmountUsdt(memberQuickBuySaleDto.getAmountUsdt());
memberQuickBuySaleEntity.setAmountCny(memberQuickBuySaleDto.getAmountCny());
+ memberQuickBuySaleEntity.setUnitPrice(memberQuickBuySaleDto.getUnitPrice());
memberQuickBuySaleEntity.setCreateTime(new Date());
memberQuickBuySaleEntity.setOrderNo(chargeNo);
memberQuickBuySaleEntity.setOrderType("B");
@@ -63,26 +66,10 @@
int ran = (int) (Math.random() * 10000000);
memberQuickBuySaleEntity.setPaymentCode(ran + "");
- // 收款信息
- QueryWrapper<PlatformPaymentMethodEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("status", "1");
- List<PlatformPaymentMethodEntity> paymentMethodList = platformPaymentMethodDao.selectList(queryWrapper);
- // 随机一个
- if (CollectionUtils.isEmpty(paymentMethodList)) {
- return Result.fail("收款方式为空");
- }
-// int total = paymentMethodList.size();
-// int index = (int) (Math.random() * total);
-// PlatformPaymentMethodEntity paymemtMethod = paymentMethodList.get(index);
-// memberQuickBuySaleEntity.setPaymentName(paymemtMethod.getName());
-// memberQuickBuySaleEntity.setPaymentAccount(paymemtMethod.getAccount());
memberQuickBuySaleDao.insert(memberQuickBuySaleEntity);
- MemberQuickBuySaleVo memberQuickBuySaleVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);
+ MemberQuickBuySaleVo memberQuickBuySaleVo = new MemberQuickBuySaleVo();
+ memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());
// 返回前台付款方式
-// memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);
-// memberQuickBuySaleEntity.setReceiveMethod(payMethodList.get(index));
- // 返回前台付款方式
-// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
return Result.ok(memberQuickBuySaleVo);
}
@@ -105,12 +92,35 @@
@Override
public Result selectById(Long id) {
MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectById(id);
- MemberQuickBuySaleVo memberQuickBuySaleVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);
+ MemberQuickBuySaleDetailVo memberQuickBuySaleDetailVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);
+ // 收款信息
+ QueryWrapper<PlatformPaymentMethodEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("status", "1");
+ List<PlatformPaymentMethodEntity> paymentMethodList = platformPaymentMethodDao.selectList(queryWrapper);
+ // 随机一个
+ if (CollectionUtils.isEmpty(paymentMethodList)) {
+ return Result.fail("收款方式为空");
+ }
+ memberQuickBuySaleDetailVo.setPlatforPaymentMethodList(paymentMethodList);
long startTime = memberQuickBuySaleEntity.getCreateTime().getTime();
long nowTime = new Date().getTime();
long third = 30*60*1000;
- memberQuickBuySaleVo.setTimeLeft((third-nowTime+startTime)/1000);
- return Result.ok(memberQuickBuySaleVo);
+ memberQuickBuySaleDetailVo.setTimeLeft((third-nowTime+startTime)/1000);
+ return Result.ok(memberQuickBuySaleDetailVo);
+ }
+
+ @Override
+ public Result selectAll(String type) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ QueryWrapper<MemberQuickBuySaleEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("member_id", member.getId());
+ if(!StringUtils.isEmpty(type)) {
+ queryWrapper.eq("order_type", type);
+ }
+ queryWrapper.orderByDesc("id");
+ List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);
+ List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);
+ return Result.ok(memberQuickBuySaleDetailVoList);
}
@Override
@@ -130,7 +140,6 @@
if (extractUsdt.compareTo(walletCoin.getAvailableBalance())==1) {
return Result.fail("您当前可用USDT额度不够");
}
-
// 判断是否存在收款方式
List<MemberPaymentMethodEntity> payMentMethodList = memberPaymentMethodDao.selectByMemberId(member.getId());
@@ -171,11 +180,8 @@
public Result cancelRecharge(Long id) {
// 获取当前登录用户
MemberEntity member = LoginUserUtils.getAppLoginUser();
- if(member==null) {
- return Result.fail("登录用户已失效");
- }
- MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(id,member.getId());
- memberQuickBuySaleEntity.setOrderStatus(1);
+ MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(member.getId(),id);
+ memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
// 判断是否存在足够余额
--
Gitblit v1.9.1