From d9ca3c9af0e2c1520b2163ca658febdd0a4e69f2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 11:55:02 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 6 +++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 6 +++
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java | 3 +
src/main/resources/mapper/member/MemberWalletCoinDao.xml | 3 +
src/main/java/com/xcong/excoin/modules/otc/vo/OrderDetailVo.java | 56 ++++++++++++++++++++++++++++
5 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
index 0c3607c..ac5c391 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
@@ -28,6 +28,9 @@
@ApiModelProperty(value = " 指纹解锁功能 1：是 0:否")
private Integer fingerprintState;
+
+ @ApiModelProperty(value = "是否设置昵称 1-是 2-否")
+ private Integer nickName;
/**
* 一直需要输入密码
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index c8fff73..bcd9111 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -875,6 +875,12 @@
memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
}
+ if (StrUtil.isEmpty(member.getName())) {
+ memberPersonCenterInfoVo.setNickName(2);
+ } else {
+ memberPersonCenterInfoVo.setNickName(1);
+ }
+
Integer fingerprintState = member.getFingerprintState();
memberPersonCenterInfoVo.setFingerprintState(fingerprintState);
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
index 6881d04..22b2ac7 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
@@ -46,6 +46,12 @@
return Result.ok(page.getRecords());
}
+ @ApiOperation(value = "订单详情")
+ @GetMapping(value = "/orderDetail/{id}")
+ public Result orderDetail(@PathVariable("id") Long id) {
+ return null;
+ }
+
@ApiOperation(value = "已付款，请放币")
@PostMapping(value = "/hasPay/{id}")
public Result hasPay(@PathVariable("id") Long id) {
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/OrderDetailVo.java
new file mode 100644
index 0000000..443034d
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/OrderDetailVo.java
@@ -0,0 +1,56 @@
+package com.xcong.excoin.modules.otc.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "OtcOrderDetailVo", description = "otc订单详情")
+public class OrderDetailVo {
+
+ @ApiModelProperty(value = "交易总额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "交易数量")
+ private BigDecimal usdtAmount;
+
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("下单时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "银行名称")
+ private String bankName;
+
+ @ApiModelProperty(value = "银行卡号")
+ private String bankNo;
+
+ @ApiModelProperty(value = "姓名")
+ private String payName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+
+ @ApiModelProperty(value = "商家昵称")
+ private String saleName;
+
+ @ApiModelProperty(value = "商家ID")
+ private Long mbId;
+
+ @ApiModelProperty(value = "订单数量")
+ private Integer orderCnt;
+
+ @ApiModelProperty(value = "完成率")
+ private BigDecimal finishRatio;
+}
diff --git a/src/main/resources/mapper/member/MemberWalletCoinDao.xml b/src/main/resources/mapper/member/MemberWalletCoinDao.xml
index 764eb39..2b1845c 100644
--- a/src/main/resources/mapper/member/MemberWalletCoinDao.xml
+++ b/src/main/resources/mapper/member/MemberWalletCoinDao.xml
@@ -41,7 +41,8 @@
<update id="reduceFrozenBalance">
update member_wallet_coin
- set frozen_balance = frozen_balance - #{amount}
+ set frozen_balance = frozen_balance - #{amount},
+ total_balance = total_balance - #{amount}
where id=#{id}
</update>
--
Gitblit v1.9.1