generated from root/miduo_server
订单列表,无法输入0秒问题处理
parent
0622fb56cc
commit
085c7eda1a
|
|
@ -51,8 +51,8 @@ public class OrderInfoController {
|
||||||
@RequestMapping(value = "/getOrder", method = {RequestMethod.POST, RequestMethod.GET})
|
@RequestMapping(value = "/getOrder", method = {RequestMethod.POST, RequestMethod.GET})
|
||||||
public String getOrder(HttpServletRequest request, ModelMap map) throws Exception {
|
public String getOrder(HttpServletRequest request, ModelMap map) throws Exception {
|
||||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||||
long startTime = DateUtil.timeToStamp(parameterMap.get("startTime").replace("T"," "));
|
long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime").replace("T"," "));
|
||||||
long endTime = DateUtil.timeToStamp(parameterMap.get("endTime").replace("T"," "));
|
long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime").replace("T"," "));
|
||||||
String serverId = parameterMap.get("serverId");
|
String serverId = parameterMap.get("serverId");
|
||||||
String userId = parameterMap.get("userId");
|
String userId = parameterMap.get("userId");
|
||||||
String packId = parameterMap.get("packId");
|
String packId = parameterMap.get("packId");
|
||||||
|
|
@ -68,8 +68,8 @@ public class OrderInfoController {
|
||||||
public void exportExcelRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
public void exportExcelRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||||
String userId = parameterMap.get("userId");
|
String userId = parameterMap.get("userId");
|
||||||
long startTime = DateUtil.timeToStamp(parameterMap.get("startTime").replace("T"," "));
|
long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime").replace("T"," "));
|
||||||
long endTime = DateUtil.timeToStamp(parameterMap.get("endTime").replace("T"," "));
|
long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime").replace("T"," "));
|
||||||
|
|
||||||
List<Corder> cgPayOrders = findOrders(startTime, endTime, userId, "ALLORDER", "0");
|
List<Corder> cgPayOrders = findOrders(startTime, endTime, userId, "ALLORDER", "0");
|
||||||
if(cgPayOrders.isEmpty()){
|
if(cgPayOrders.isEmpty()){
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,28 @@ public class DateUtil {
|
||||||
return d.getTime();
|
return d.getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 日期转换为时间戳
|
||||||
|
* @param timers
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static long timeToStamp2(String timers) {
|
||||||
|
Date d = new Date();
|
||||||
|
int i = 0;
|
||||||
|
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
do {
|
||||||
|
try {
|
||||||
|
// 日期转换为时间戳
|
||||||
|
d = sf.parse(timers);
|
||||||
|
i = 2;
|
||||||
|
} catch (ParseException e) {
|
||||||
|
sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}while (i < 2);
|
||||||
|
return d.getTime();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 日期转换为时间戳
|
* 日期转换为时间戳
|
||||||
* @param timers
|
* @param timers
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
<span class="c-red">*</span>
|
<span class="c-red">*</span>
|
||||||
开始时间:</label>
|
开始时间:</label>
|
||||||
<div class="formControls col-xs-8 col-sm-9">
|
<div class="formControls col-xs-8 col-sm-9">
|
||||||
<input type="datetime-local" name="startTime" class="input-text" style="width: 210px" min="1970-01-01T00:00:00" step="1">
|
<input type="datetime-local" name="startTime" class="input-text" style="width: 210px" step="1">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row cl">
|
<div class="row cl">
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
<span class="c-red">*</span>
|
<span class="c-red">*</span>
|
||||||
结束时间:</label>
|
结束时间:</label>
|
||||||
<div class="formControls col-xs-8 col-sm-9">
|
<div class="formControls col-xs-8 col-sm-9">
|
||||||
<input type="datetime-local" name="endTime" class="input-text" style="width: 210px" min="1970-01-01T00:00:00" step="1">
|
<input type="datetime-local" name="endTime" class="input-text" style="width: 210px" step="1">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row cl">
|
<div class="row cl">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue