From b2ec644128294893de349262672658261a78da82 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 16:39:40 +0800
Subject: [PATCH] 查下所有的买卖记录
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 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 94575aa..4a602c5 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
@@ -22,6 +22,7 @@
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.MemberWalletCoinDao;
@@ -63,32 +64,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 = new MemberQuickBuySaleVo();
memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());
- memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);
- long startTime = memberQuickBuySaleEntity.getCreateTime().getTime();
- long nowTime = new Date().getTime();
- long third = 30*60*1000;
- memberQuickBuySaleVo.setTimeLeft((third-nowTime+startTime)/1000);
// 返回前台付款方式
-// memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);
-// memberQuickBuySaleEntity.setReceiveMethod(payMethodList.get(index));
- // 返回前台付款方式
-// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
return Result.ok(memberQuickBuySaleVo);
}
@@ -111,12 +90,32 @@
@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());
+ queryWrapper.eq("order_type", type);
+ List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);
+ List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);
+ return Result.ok(memberQuickBuySaleDetailVoList);
}
@Override
@@ -136,7 +135,6 @@
if (extractUsdt.compareTo(walletCoin.getAvailableBalance())==1) {
return Result.fail("您当前可用USDT额度不够");
}
-
// 判断是否存在收款方式
List<MemberPaymentMethodEntity> payMentMethodList = memberPaymentMethodDao.selectByMemberId(member.getId());
--
Gitblit v1.9.1