From 8d3b7abedb862a933bfb29768a8982fcbaa24d0d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 25 May 2020 12:19:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java | 96 +++++++++++++++--------------------------------
1 files changed, 31 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
index ee26bd5..32725f9 100644
--- a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
+++ b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
@@ -1,25 +1,19 @@
package com.xcong.excoin.modules.home.controller;
-import java.util.Date;
-
-import org.apache.commons.codec.digest.Md5Crypt;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.druid.util.StringUtils;
-import com.xcong.excoin.common.annotations.UserAuth;
import com.xcong.excoin.common.response.Result;
-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.MemberQuickBuySaleEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.home.service.MemberQuickBuySaleService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@RestController
@@ -28,69 +22,41 @@
public class MemberQuickBuySaleController {
@Autowired
- MemberQuickBuySaleDao memberQuickBuySaleDao;
+ MemberQuickBuySaleService memberQuickBuySaleService;
@ApiOperation(value = "USDT快速充值", notes = "USDT快速充值")
@RequestMapping(value = "/recharge", method = RequestMethod.POST)
- public Result recharge(@RequestBody MemberQuickBuySaleDto memberQuickBuySaleDto,
- @UserAuth MemberEntity memberEntity) {
- // 验证是否实名认证
- if (MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())) {
- return Result.fail("请先实名认证");
- }
- String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();
- // 验证支付密码
- String tradePassword = memberEntity.getTradePassword();
- if (StringUtils.isEmpty(tradePassword)) {
- return Result.fail("请先配置交易密码");
- }
- if (StringUtils.isEmpty(tradePasswordWeb)) {
- return Result.fail("请输入交易密码");
- }
- // System.out.println("交易密码:"+MD5.GetMD5Code(tradePasswordWeb)+" tradePassword =
- // "+tradePassword);
- // 验证交易密码
- if (!Md5Crypt.apr1Crypt(tradePasswordWeb).equals(tradePassword)) {
- return Result.fail("请输入正确的交易密码");
- }
- // 生成订单号
- Long timestamp = System.currentTimeMillis();
- int random = (int) (Math.random() * 10);
- String chargeNo = String.valueOf(timestamp).substring(2) + random;
- // 插入订单表
- MemberQuickBuySaleEntity memberQuickBuySaleEntity = new MemberQuickBuySaleEntity();
- memberQuickBuySaleEntity.setOrderStatus(memberQuickBuySaleEntity.CHARGE_STATUS_CREATE);
- memberQuickBuySaleEntity.setMemberId(memberEntity.getId());
- memberQuickBuySaleEntity.setCreateTime(new Date());
- memberQuickBuySaleEntity.setOrderNo(chargeNo);
- memberQuickBuySaleEntity.setOrderType("B");
- // 支付码 ID+四位随机数
- int ran = (int) (Math.random() * 10000000);
- memberQuickBuySaleEntity.setPaymentCode(ran + "");
- memberQuickBuySaleEntity.setPaymentAccount(memberQuickBuySaleDto.getPaymentAccount());
- memberQuickBuySaleEntity.setPaymentName(memberQuickBuySaleDto.getPaymentName());
-
- System.out.println("实体对象:"+memberQuickBuySaleEntity);
- memberQuickBuySaleDao.insert(memberQuickBuySaleEntity);
- // 返回前台付款方式
-// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
- return Result.ok("购买成功,请及时付款");
+ public Result recharge(@RequestBody MemberQuickBuySaleDto memberQuickBuySaleDto) {
+ return memberQuickBuySaleService.recharge(memberQuickBuySaleDto);
}
@ApiOperation(value = "USDT充值支付确认", notes = "USDT充值支付确认")
- @ApiImplicitParam(name = "token", value = "token", required = false, dataType = "String", paramType = "body")
- @RequestMapping(value = "/commitPay", method = RequestMethod.GET)
- public Result commitPay(@PathVariable(value = "id") Long id) {
- // 用户提交支付确认 将状态改为付款中
- MemberQuickBuySaleEntity MemberQuickBuySaleEntity = new MemberQuickBuySaleEntity();
- MemberQuickBuySaleEntity.setId(id);
- MemberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_PAID);
- memberQuickBuySaleDao.updateById(MemberQuickBuySaleEntity);
-
- // TODO dingtalk
-
- return Result.ok("确认成功");
+ @RequestMapping(value = "/commitPay", method = RequestMethod.POST)
+ public Result commitPay(@RequestBody MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto) {
+ return memberQuickBuySaleService.commitPay(memberQuickBuySaleCommitDto);
+ }
+
+ @ApiOperation(value = "查询单个买卖记录", notes = "查询单个买卖记录")
+ @GetMapping(value = "/selectById/{id}")
+ public Result selectById(@PathVariable(value = "id") Long id) {
+ return memberQuickBuySaleService.selectById(id);
+ }
+
+
+
+ /**
+ * 充值撤销
+ *
+ * @param memberChargeUsdt
+ * @param page
+ * @param rows
+ * @return
+ */
+ @ApiOperation(value = "充值撤销", notes = "充值撤销")
+ @GetMapping(value = "/cancel/{id}")
+ public Result cancel(@PathVariable(value = "id") Long id) {
+ return memberQuickBuySaleService.cancelRecharge(id);
}
--
Gitblit v1.9.1