From 1e1ae4f19489644c9ff35125d075a30f89536d16 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 21 五月 2020 17:35:36 +0800
Subject: [PATCH] 后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index aef86ba..3a9bef9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -802,13 +802,12 @@
* type 绫诲瀷锛�0鍏ㄩ儴銆�1娣樺疂 2浜笢銆佹嫾澶氬
* @param out
*/
- @RequestMapping(value = "teamOrderSearch", method = RequestMethod.POST)
+ @RequestMapping(value = "teamOrderSearch")
public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, String key, PrintWriter out) {
if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
List<TeamOrderVO> resultList = new ArrayList<>();
if (StringUtil.isNullOrEmpty(key)) {
@@ -917,6 +916,14 @@
}
}
}
+ String orderTime = "涓嬪崟" + teamVO.getDownTime() ;
+ if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {
+ orderTime += "\n鏀惰揣" + teamVO.getSettleTime();
+ }
+ if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {
+ orderTime += "\n鍞悗" + teamVO.getServiceTime();
+ }
+ teamVO.setOrderTime(orderTime);
map.put(mapKey, teamVO);
}
--
Gitblit v1.8.0