From aa43ebe703d3b28520a8b1e4b852b8beb957c5ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 20 四月 2020 14:21:25 +0800
Subject: [PATCH] 京东订单爬单规则修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
index 4d98a73..a92a750 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -12,7 +12,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 
 import javax.annotation.Resource;
 import javax.crypto.Mac;
@@ -24,7 +23,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 import org.yeshi.utils.wx.WXUtil;
 
@@ -33,11 +31,9 @@
 import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
 import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
-import com.yeshi.fanli.dto.push.PushContentDTO;
 import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
 import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
-import com.yeshi.fanli.entity.config.push.PushMsgFactory;
 import com.yeshi.fanli.entity.dynamic.ImgInfo;
 import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
 import com.yeshi.fanli.entity.dynamic.SimpleGoods;
@@ -45,7 +41,6 @@
 import com.yeshi.fanli.entity.shop.BanLiShopOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
-import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.activity.ActivityUserService;
@@ -165,17 +160,6 @@
 			String uid = json.optJSONObject("customizedData").optString("鐢ㄦ埛ID");
 			msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,
 					"android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());
-			if (!StringUtil.isNullOrEmpty(uid))// 鎺ㄩ�佸鏈嶆秷鎭�
-			{
-				PushContentDTO dto = PushMsgFactory.createMsgKefu();
-				try {
-					pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null);
-				} catch (NumberFormatException e) {
-					e.printStackTrace();
-				} catch (PushException e) {
-					e.printStackTrace();
-				}
-			}
 		}
 
 	}
@@ -288,12 +272,12 @@
 		JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data");
 
 		JSONArray array = data.optJSONObject("recommend").optJSONArray("resultList");
-		for (int i = array.size()-1; i >=0; i--) {
+		for (int i = array.size() - 1; i >= 0; i--) {
 			JSONObject item = array.optJSONObject(i);
 			String title = item.optString("itemName");
 			String doc = item.optString("cusShareText");
 			long itemId = item.optLong("itemId");
-			String publishTime=item.optString("cusPublishTime");
+			String publishTime = item.optString("cusPublishTime");
 			JSONArray imageArray = item.optJSONArray("imageList");
 			List<String> imgList = new ArrayList<>();
 			for (int j = 0; j < imageArray.size(); j++) {

--
Gitblit v1.8.0