From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理

---
 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java |   49 +++++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 28 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..9f6a8f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -32,6 +32,7 @@
 import com.yeshi.fanli.entity.system.CustomerName;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 import com.yeshi.fanli.entity.taobao.PidUser;
+import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -82,7 +83,7 @@
 
 	@Resource
 	private GoodsSecondClassService goodsSecondClassService;
-	
+
 	@Resource
 	private ConfigService configService;
 
@@ -94,7 +95,7 @@
 
 	@Resource
 	private TaoBaoCouponService taoBaoCouponService;
-	
+
 	@Resource
 	private ThreeSaleSerivce threeSaleSerivce;
 
@@ -115,7 +116,7 @@
 
 	@Resource
 	private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-	
+
 	@Resource
 	private UserInviteRecordService userInviteRecordService;
 
@@ -124,10 +125,10 @@
 
 	@Resource
 	private TaoBaoUnionConfigService taoBaoUnionConfigService;
-	
+
 	@Resource
 	private CustomerNameService customerNameService;
-	
+
 	@Resource
 	private CustomerContentService customerContentService;
 
@@ -248,10 +249,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 +289,7 @@
 			// request.setAttribute("error", "1");
 			return "redirect:" + down;
 		}
-		
+
 		// 淇濆瓨閭�璇疯褰�
 		userInviteRecordService.saveInviteRecord(code, uid);
 
@@ -398,7 +400,12 @@
 				try {
 					if (request.getSession().getAttribute("search-quan-" + map.get("FromUserName")) == null) {
 						request.getSession().setAttribute("search-quan-" + map.get("FromUserName"), "1");
-						TaoBaoSearchResult result = TaoKeApiUtil.searchCouple(content, null, 1, 5);
+						SearchFilter sf = new SearchFilter();
+						sf.setPage(1);
+						sf.setPageSize(5);
+						sf.setKey(content);
+						sf.setQuan(1);
+						TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
 						if (result == null || result.getTaoBaoGoodsBriefs() == null
 								|| result.getTaoBaoGoodsBriefs().size() <= 0) {
 							Map<String, String> parmas = new HashMap<>();
@@ -525,14 +532,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 +543,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