From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index 6a0ac33..f1e91cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -82,7 +82,7 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
+
@Resource
private ConfigService configService;
@@ -94,7 +94,7 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -115,7 +115,7 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
+
@Resource
private UserInviteRecordService userInviteRecordService;
@@ -124,10 +124,10 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
+
@Resource
private CustomerNameService customerNameService;
-
+
@Resource
private CustomerContentService customerContentService;
@@ -248,10 +248,11 @@
if ("2".equalsIgnoreCase(ios)) {
down = DOWNURL;
}
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state == null || !state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
+
if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
return "redirect:" + down;
}
@@ -287,7 +288,7 @@
// request.setAttribute("error", "1");
return "redirect:" + down;
}
-
+
// 淇濆瓨閭�璇疯褰�
userInviteRecordService.saveInviteRecord(code, uid);
@@ -525,14 +526,10 @@
}
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- try {
- JSONObject rdata = new JSONObject();
- rdata.put("uid", uid);
- rdata.put("id", id);
- LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ JSONObject rdata = new JSONObject();
+ rdata.put("uid", uid);
+ rdata.put("id", id);
+ LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(1001, "鏈煡閿欒"));
}
@@ -540,20 +537,10 @@
JSONObject data = new JSONObject();
data.put("uid", uid);
data.put("id", id);
-
- try {
- LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
+ LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0