From 462c39faeab614ce29e2887548a257e441c6ae5d Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 15:37:39 +0800
Subject: [PATCH] 修改出参
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..deabfe7 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;
@@ -26,6 +27,8 @@
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 +41,8 @@
MemberWalletCoinDao memberWalletCoinDao;
@Resource
MemberPaymentMethodDao memberPaymentMethodDao;
+ @Resource
+ PlatformPaymentMethodDao platformPaymentMethodDao;
@Override
public Result recharge(MemberEntity member,MemberQuickBuySaleDto memberQuickBuySaleDto) {
@@ -47,7 +52,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());
@@ -58,10 +63,29 @@
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);
+ // 返回前台付款方式
+// memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);
+// memberQuickBuySaleEntity.setReceiveMethod(payMethodList.get(index));
// 返回前台付款方式
// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
- return Result.ok("购买成功,请及时付款");
+ return Result.ok(memberQuickBuySaleVo);
}
@Override
@@ -69,7 +93,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());
@@ -128,7 +152,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 +177,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