记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit e0e1e601 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

view

parent 2218316f
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 12 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/nftOrder/orderRefundView.html
View file @ e0e1e601
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
<label>订单编号：</label> <label>订单编号：</label>
<input type="text" name="orderCode"/> <input type="text" name="orderCode"/>
</li> </li>
<li>
<label>哈希值：</label>
<input type="text" name="nftId"/>
</li>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<li> <li>
...@@ -52,7 +48,7 @@ ...@@ -52,7 +48,7 @@
</select> </select>
</li> </li>
<li> <li>
<label>订单状态：</label> <label>退款状态：</label>
<select name="status"> <select name="status">
<option value="">全部</option> <option value="">全部</option>
<option value="1">申请退款</option> <option value="1">申请退款</option>
...@@ -60,6 +56,18 @@ ...@@ -60,6 +56,18 @@
<option value="3">退款失败</option> <option value="3">退款失败</option>
</select> </select>
</li> </li>
<li class="select-time">
<label>支付时间： </label>
<input type="text" class="time-input" placeholder="开始日期" name="payTimeStart"/>
<span>-</span>
<input type="text" class="time-input" placeholder="结束日期" name="payTimeEnd"/>
</li>
</div>
<div class="col-sm-12">
<li>
<label>哈希值：</label>
<input type="text" name="nftId"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a> class="fa fa-search"></i>&nbsp;搜索</a>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/nftOrder/orderView.html
View file @ e0e1e601
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
<label>订单编号：</label> <label>订单编号：</label>
<input type="text" name="orderCode"/> <input type="text" name="orderCode"/>
</li> </li>
<li>
<label>哈希值：</label>
<input type="text" name="nftId"/>
</li>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<li> <li>
...@@ -66,6 +62,16 @@ ...@@ -66,6 +62,16 @@
<span>-</span> <span>-</span>
<input type="text" class="time-input" placeholder="结束日期" name="payTimeEnd"/> <input type="text" class="time-input" placeholder="结束日期" name="payTimeEnd"/>
</li> </li>
</div>
<div class="col-sm-12">
<li>
<label>哈希值：</label>
<input type="text" name="nftId"/>
</li>
<li>
<label>兑换码：</label>
<input type="text" name="exCode"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a> class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -135,8 +141,12 @@ ...@@ -135,8 +141,12 @@
{ {
field: 'payType', field: 'payType',
title: '支付方式', title: '支付方式',
formatter: function (value) { formatter: function (value, row) {
return $.table.selectDictLabel(payTypeDic, value); if (row.orderType == 2 || row.orderType == 4) {
return row.exCode;
} else {
return $.table.selectDictLabel(payTypeDic, value);
}
}, },
}, },
{ {
...@@ -160,7 +170,14 @@ ...@@ -160,7 +170,14 @@
}, },
{ {
field: 'name', field: 'name',
title: '藏品名称' title: '藏品名称',
formatter: function (value, row) {
if (row.boxSkuId) {
return value.trim().split(" ")[0] + " (盲盒)";
} else {
return value.trim().split(" ")[0];
}
}
}, },
{ {
field: 'tradingAt', field: 'tradingAt',
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/testController.java 0 → 100644
View file @ e0e1e601
package com.liquidnet.service.goblin.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.SimpleTimeZone;
@Slf4j
//@Api(tags = "正在下单相关")
@RestController
@RequestMapping("/zhengzai/app")
public class testController {
public static void main(String[] args) {
/*SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dateInstance = SimpleDateFormat.getDateInstance();
String format = dateInstance.format("2022-01-01 22:22:22");
Date parse = simpleDateFormat.parse("2022-01-01 22:22:22");
DateTimeFormatter.ofLocalizedTime();
Calendar.getInstance()*/
}
}
class person implements Comparable {
@Override
public int compareTo(Object o) {
return 0;
}
}
class eumue {
private final String name;
private final int num;
private eumue(String name, int num) {
this.name = name;
this.num = num;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment