From 0c9417cb26dec0e376166e33a0556f9d4fba0924 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期五, 23 十一月 2018 15:28:12 +0800
Subject: [PATCH] 子分类筛选价格限制99999
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 57fae0b..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,15 +1637,20 @@
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));
+ bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
}
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