From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 47d518d..3be498e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1878,21 +1878,28 @@
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
+ ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);
+ if (threeSale == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
- UserInfo worker = listThreeSale.get(0).getWorker();
+ UserInfo worker = threeSale.getWorker();
if (worker == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
-
+
ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());
if (extraInfo == null) {
extraInfo = new ThreeSaleExtraInfo();
+ Long bossUid = threeSale.getBoss().getId();
+ if (uid == bossUid) {
+ extraInfo.setType(1); // 鐩存帴
+ } else {
+ extraInfo.setType(2); // 闂存帴
+ }
+
extraInfo.setWorker(worker);
extraInfo.setNickname(memoName);
extraInfo.setCreateTime(new Date());
@@ -2224,7 +2231,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0