From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 2eddfeb..6609362 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -2,14 +2,13 @@
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.security.SignatureException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -21,8 +20,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.taobao.TbImgUtil;
import org.yeshi.utils.wx.WXUtil;
@@ -34,6 +31,7 @@
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.bus.user.cloud.UserCloud;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.dynamic.SimpleGoods;
@@ -51,6 +49,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
+import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -100,6 +99,9 @@
@Resource
private ActivityUserService activityUserService;
+
+ @Resource
+ private UserCloudService userCloudService;
/**
* 瀹㈡湇娑堟伅鍥炶皟
@@ -268,9 +270,9 @@
JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data");
JSONArray array = data.optJSONObject("recommend").optJSONArray("resultList");
-
- long startTime=System.currentTimeMillis();
-
+
+ long startTime = System.currentTimeMillis();
+
for (int i = array.size() - 1; i >= 0; i--) {
JSONObject item = array.optJSONObject(i);
String title = item.optString("itemName");
@@ -337,14 +339,46 @@
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
try {
- goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null, new Date(startTime-1000*60*20L*i));
+ goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null,
+ new Date(startTime - 1000 * 60 * 20L * i));
} catch (GoodsEvaluateException e) {
e.printStackTrace();
- }catch(Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
}
+ @RequestMapping(value = "yhg/groupmsg")
+ public void groupMsg(HttpServletRequest request, PrintWriter out) {
+ StringBuilder stringBuilder = new StringBuilder();
+ try {
+ byte[] buffer = new byte[2048];
+ int readBytes = 0;
+ while ((readBytes = request.getInputStream().read(buffer)) > 0) {
+ stringBuilder.append(new String(buffer, 0, readBytes));
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ JSONObject root = JSONObject.fromObject(stringBuilder.toString());
+ if (root.optInt("messageType") == 9) {
+ String content = root.optJSONObject("data").optString("content");
+ LogHelper.test("浜戝彂鍗曠兢鍐呭:" + content);
+ if (content.trim().equalsIgnoreCase(Constant.YHG_CLOUD_GROUP_AWAKEN_KEY)) {
+ LogHelper.test("浜戝彂鍗曠兢鍖归厤:" + root.optString("wcId") + "-"
+ + root.optJSONObject("data").optString("fromGroup"));
+ userCloudService.cacheMatchGroup(root.optString("wcId"),
+ root.optJSONObject("data").optString("fromGroup"));
+ }
+ }
+ } catch (Exception e) {
+
+ }
+
+ }
+
}
--
Gitblit v1.8.0