From 9b16b4c4dfa58ebe81431efc42ae6c55635bff88 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 17:06:37 +0800
Subject: [PATCH] 下单接口
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 11 ++++++-----
src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java | 9 ++++-----
src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java | 5 +++++
src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleCommitDto.java | 8 +++++++-
4 files changed, 22 insertions(+), 11 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 d172586..a6dbf07 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
@@ -5,6 +5,7 @@
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -56,8 +57,6 @@
if (StringUtils.isEmpty(tradePasswordWeb)) {
return Result.fail("请输入交易密码");
}
- // System.out.println("交易密码:"+MD5.GetMD5Code(tradePasswordWeb)+" tradePassword =
- // "+tradePassword);
// 验证交易密码
if (!tradePassword.equals(SecureUtil.md5(tradePasswordWeb))) {
return Result.fail("请输入正确的交易密码");
@@ -68,7 +67,7 @@
@ApiOperation(value = "commitPay", notes = "USDT充值支付确认")
@RequestMapping(value = "/commitPay", method = RequestMethod.POST)
- public Result commitPay(@RequestBody MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto) {
+ public Result commitPay(@RequestBody @Valid MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto) {
return memberQuickBuySaleService.commitPay(memberQuickBuySaleCommitDto);
}
@@ -85,8 +84,8 @@
}
@ApiOperation(value = "cancel", notes = "充值撤销")
- @GetMapping(value = "/cancel/{id}")
- public Result cancel(@PathVariable(value = "id") Long id) {
+ @GetMapping(value = "/cancel")
+ public Result cancel(@RequestParam(value = "id") Long id) {
return memberQuickBuySaleService.cancelRecharge(id);
}
diff --git a/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleCommitDto.java b/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleCommitDto.java
index 2746b33..3d3a550 100644
--- a/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleCommitDto.java
+++ b/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleCommitDto.java
@@ -1,22 +1,28 @@
package com.xcong.excoin.modules.home.dto;
+import javax.validation.constraints.NotNull;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
-@ApiModel(value = "确认快捷买入接收参数", description = "确认快捷买入接收参数")
+@ApiModel(value = "MemberQuickBuySaleCommitDto", description = "确认快捷买入接收参数")
public class MemberQuickBuySaleCommitDto {
+ @NotNull(message = "订单id不能为空")
@ApiModelProperty(value = "主键",example = "1")
private Long id;
+ @NotNull(message = "付款方式不能为空")
@ApiModelProperty(value = "付款方式 1-支付宝2-微信3-银行卡",example = "1")
private int paymentType;
+ @NotNull(message = "收款账号不能为空")
@ApiModelProperty(value = "收款账号",example = "13000000000")
private String paymentAccount;
+ @NotNull(message = "收款人姓名不能为空")
@ApiModelProperty(value = "收款人姓名",example = "张三")
private String paymentName;
}
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 4a602c5..d28f72d 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.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;
@@ -57,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");
@@ -112,7 +114,9 @@
MemberEntity member = LoginUserUtils.getAppLoginUser();
QueryWrapper<MemberQuickBuySaleEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("member_id", member.getId());
- queryWrapper.eq("order_type", type);
+ if(!StringUtils.isEmpty(type)) {
+ queryWrapper.eq("order_type", type);
+ }
List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);
List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);
return Result.ok(memberQuickBuySaleDetailVoList);
@@ -175,11 +179,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.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
// 判断是否存在足够余额
diff --git a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
index 176f278..c106062 100644
--- a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
@@ -1,8 +1,10 @@
package com.xcong.excoin.modules.home.vo;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xcong.excoin.modules.platform.entity.PlatformPaymentMethodEntity;
import io.swagger.annotations.ApiModel;
@@ -34,6 +36,9 @@
private String orderType;
@ApiModelProperty(value = "剩余时间")
private Long timeLeft;
+ @ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
@ApiModelProperty(value = "平台收款方式")
private List<PlatformPaymentMethodEntity> platforPaymentMethodList;
}
--
Gitblit v1.9.1