From 4c902d9c20dd965d1ec832760809c622d1df9aac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Jun 2021 11:17:03 +0800
Subject: [PATCH] 20210617 开售开关
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java | 7 ++-----
src/main/resources/templates/febs/views/modules/trademanage/bzzNewPrice.html | 4 ++--
src/main/java/com/xcong/excoin/modules/trademanage/vo/BzzNewPriceVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/trademanage/dto/BzzNewPriceDto.java | 2 +-
src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
index 7335c7c..46478a7 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
@@ -56,7 +56,7 @@
String bzzStart = redisUtils.getString("bzz_start");
BzzNewPriceVo bzzNewPriceVo = new BzzNewPriceVo();
bzzNewPriceVo.setNewprice(newPrice);
- bzzNewPriceVo.setBzzStart(bzzStart);
+ bzzNewPriceVo.setBzzStart(Integer.parseInt(bzzStart));
bzzNewPriceVo.setId(1L);
model.addAttribute("member", bzzNewPriceVo);
return FebsUtil.view("modules/trademanage/bzzNewPriceUpdate");
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/dto/BzzNewPriceDto.java b/src/main/java/com/xcong/excoin/modules/trademanage/dto/BzzNewPriceDto.java
index 612930d..448c2b4 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/dto/BzzNewPriceDto.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/dto/BzzNewPriceDto.java
@@ -8,7 +8,7 @@
private String newprice;
- private String bzzStart;
+ private Integer bzzStart;
private long id;
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
index e64a4cc..57714e1 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
@@ -55,7 +55,7 @@
String bzzStart = redisUtils.getString("bzz_start");
BzzNewPriceVo bzzNewPriceVo = new BzzNewPriceVo();
bzzNewPriceVo.setNewprice(newPrice);
- bzzNewPriceVo.setBzzStart(bzzStart);
+ bzzNewPriceVo.setBzzStart(Integer.parseInt(bzzStart));
List<BzzNewPriceVo> bzzNewPrices = new ArrayList<>();
bzzNewPrices.add(bzzNewPriceVo);
@@ -71,10 +71,7 @@
if(StrUtil.isEmpty(newprice)){
return new FebsResponse().fail().message("最新价不能为空");
}
- String bzzStart = bzzNewPriceDto.getBzzStart();
- if(StrUtil.isEmpty(bzzStart)){
- return new FebsResponse().fail().message("是否开售不能为空");
- }
+ int bzzStart = bzzNewPriceDto.getBzzStart();
boolean flag = redisUtils.set("bzz_order_new_price", newprice);
boolean flagStart = redisUtils.set("bzz_start", bzzStart);
if(flag && flagStart){
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/vo/BzzNewPriceVo.java b/src/main/java/com/xcong/excoin/modules/trademanage/vo/BzzNewPriceVo.java
index b5c8b6b..0729e46 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/vo/BzzNewPriceVo.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/vo/BzzNewPriceVo.java
@@ -6,7 +6,7 @@
public class BzzNewPriceVo {
private String newprice;
- private String bzzStart;
+ private Integer bzzStart;
private long id;
}
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/bzzNewPrice.html b/src/main/resources/templates/febs/views/modules/trademanage/bzzNewPrice.html
index 75a8df6..dad28e9 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/bzzNewPrice.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/bzzNewPrice.html
@@ -78,9 +78,9 @@
{field: 'newprice', title: '最新价', minWidth: 100,align:'left'},
{field: 'bzzStart', title: '是否开售',
templet: function (d) {
- if (d.bzzStart === '1') {
+ if (d.bzzStart === 1) {
return '<span style="color:green;">开始</span>'
- } else if (d.bzzStart === '2') {
+ } else if (d.bzzStart === 2) {
return '<span style="color:red;">停止</span>'
} else{
return ''
--
Gitblit v1.9.1