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 | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 3c4eaac..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
@@ -8,6 +8,7 @@
import org.springframework.stereotype.Service;
+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;
@@ -21,11 +22,14 @@
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;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
+import com.xcong.excoin.modules.platform.dao.PlatformPaymentMethodDao;
+import com.xcong.excoin.modules.platform.entity.PlatformPaymentMethodEntity;
@Service
public class MemberQuickBuySaleServiceImpl extends ServiceImpl<MemberQuickBuySaleDao, MemberQuickBuySaleEntity> implements MemberQuickBuySaleService{
@@ -38,6 +42,8 @@
MemberWalletCoinDao memberWalletCoinDao;
@Resource
MemberPaymentMethodDao memberPaymentMethodDao;
+ @Resource
+ PlatformPaymentMethodDao platformPaymentMethodDao;
@Override
public Result recharge(MemberEntity member,MemberQuickBuySaleDto memberQuickBuySaleDto) {
@@ -47,7 +53,7 @@
String chargeNo = String.valueOf(timestamp).substring(2) + random;
// 插入订单表
MemberQuickBuySaleEntity memberQuickBuySaleEntity = new MemberQuickBuySaleEntity();
- memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CREATE);
+ memberQuickBuySaleEntity.setOrderStatus(1);
memberQuickBuySaleEntity.setMemberId(member.getId());
memberQuickBuySaleEntity.setAmountUsdt(memberQuickBuySaleDto.getAmountUsdt());
memberQuickBuySaleEntity.setAmountCny(memberQuickBuySaleDto.getAmountCny());
@@ -59,9 +65,10 @@
memberQuickBuySaleEntity.setPaymentCode(ran + "");
memberQuickBuySaleDao.insert(memberQuickBuySaleEntity);
+ MemberQuickBuySaleVo memberQuickBuySaleVo = new MemberQuickBuySaleVo();
+ memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());
// 返回前台付款方式
-// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
- return Result.ok("购买成功,请及时付款");
+ return Result.ok(memberQuickBuySaleVo);
}
@Override
@@ -69,7 +76,7 @@
// 用户提交支付确认 将状态改为付款中
MemberQuickBuySaleEntity memberQuickBuySaleEntity = new MemberQuickBuySaleEntity();
memberQuickBuySaleEntity.setId(memberQuickBuySaleCommitDto.getId());
- memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_PAID);
+ memberQuickBuySaleEntity.setOrderStatus(2);
memberQuickBuySaleEntity.setPaymentAccount(memberQuickBuySaleCommitDto.getPaymentAccount());
memberQuickBuySaleEntity.setPaymentName(memberQuickBuySaleCommitDto.getPaymentName());
@@ -83,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
@@ -109,7 +136,6 @@
return Result.fail("您当前可用USDT额度不够");
}
-
// 判断是否存在收款方式
List<MemberPaymentMethodEntity> payMentMethodList = memberPaymentMethodDao.selectByMemberId(member.getId());
if(CollectionUtils.isEmpty(payMentMethodList)){
@@ -128,7 +154,7 @@
String chargeNo = String.valueOf(timestamp).substring(2) + random;
// 插入订单表
MemberQuickBuySaleEntity memberQuickBuySaleEntity = new MemberQuickBuySaleEntity();
- memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CREATE);
+ memberQuickBuySaleEntity.setOrderStatus(1);
memberQuickBuySaleEntity.setMemberId(member.getId());
memberQuickBuySaleEntity.setAmountUsdt(memberQuickBuySaleDto.getAmountUsdt());
memberQuickBuySaleEntity.setAmountCny(memberQuickBuySaleDto.getAmountCny());
@@ -153,7 +179,7 @@
return Result.fail("登录用户已失效");
}
MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(id,member.getId());
- memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
+ memberQuickBuySaleEntity.setOrderStatus(1);
memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
// 判断是否存在足够余额
--
Gitblit v1.9.1