From 34f072555c7dc6ff63f8586150d73c6379b7a16c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期五, 23 十一月 2018 16:57:20 +0800
Subject: [PATCH] 用户未输入最高价格时    最高价格限制99999

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 05f8a66..a69c22b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1637,7 +1637,7 @@
 				bossData.put("portrait", boss.getPortrait());
 			}
 			
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
 			Long createTime = threeSale.getCreateTime();
 			Date inviteTime = new Date(createTime);
 			bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
@@ -1646,6 +1646,11 @@
 		
 		JSONObject resultData = new JSONObject();
 		
+		String helpLink = configService.get("team_help_url");
+		if (helpLink == null) {
+			helpLink = "";
+		}
+		resultData.put("helpLink", helpLink);
 		resultData.put("firstTeam", firstTeam);
 		resultData.put("firstTeamTotal", firstTeamTotal);
 		resultData.put("secondTeam", secondTeam);
@@ -1695,6 +1700,7 @@
 		} else {
 			ThreeSaleExtraInfo extraInfo = list.get(0);
 			extraInfo.setNickname(nickname);
+			extraInfo.setUpdateTime(new Date());
 			threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
 		}
 		
@@ -1713,13 +1719,13 @@
 		
 		List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
 		if (listThreeSale == null || listThreeSale.size() == 0) {
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
 			return;
 		}
 		
 		UserInfo worker = listThreeSale.get(0).getWorker();
 		if (worker == null) {
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
 			return;
 		}
 		

--
Gitblit v1.8.0