From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 09:27:49 +0800
Subject: [PATCH] 金币领取

---
 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 105b1df..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;
@@ -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;
 		}
@@ -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<>();

--
Gitblit v1.8.0