From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 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 896be43..0644b97 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -2,6 +2,8 @@
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;
@@ -19,7 +21,9 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.yeshi.utils.JsonUtil;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.yeshi.utils.taobao.TbImgUtil;
import org.yeshi.utils.wx.WXUtil;
import com.aliyun.openservices.ons.api.Message;
@@ -27,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;
@@ -39,13 +41,13 @@
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;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
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;
@@ -92,6 +94,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private ActivityUserService activityUserService;
@@ -159,17 +164,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();
- }
- }
}
}
@@ -245,20 +239,49 @@
* @throws
*/
@RequestMapping(value = "faquan/haowuquan")
- public void haoWuQuan(HttpServletRequest request, String content, String sign, PrintWriter out) {
- if (!sign.equalsIgnoreCase(StringUtil.Md5(content + "banliapp"))) {
- out.print(JsonUtil.loadFalseResult("绛惧悕閿欒"));
- return;
+ public void haoWuQuan(HttpServletRequest request, String content, PrintWriter out) {
+ // if (!sign.equalsIgnoreCase(StringUtil.Md5(content + "banliapp"))) {
+ // out.print(JsonUtil.loadFalseResult("绛惧悕閿欒"));
+ // return;
+ // }
+ String contentDecode = "";
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ List<MultipartFile> files = multipartRequest.getFiles("file");
+ try {
+ InputStream input = files.get(0).getInputStream();
+ InputStreamReader reader = new InputStreamReader(input, "UTF-16LE");
+ int d = -1;
+ String st = "";
+ while ((d = reader.read()) != -1) {
+ st += ((char) d);
+ }
+ System.out.println(st);
+ contentDecode = st;
+
+ contentDecode = contentDecode.substring(contentDecode.indexOf("(") +1,
+ contentDecode.length()).trim();
+ if (contentDecode.endsWith(")"))
+ contentDecode = contentDecode.substring(0, contentDecode.length() - 1);
+
+ System.out.println(contentDecode);
+
+ reader.close();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
- String contentDecode = StringUtil.getFromBase64(content);
- JSONObject data = JSONObject.fromObject(contentDecode);
+
+ JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data");
JSONArray array = data.optJSONObject("recommend").optJSONArray("resultList");
- for (int i = 0; i < array.size(); 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");
JSONArray imageArray = item.optJSONArray("imageList");
List<String> imgList = new ArrayList<>();
for (int j = 0; j < imageArray.size(); j++) {
@@ -274,7 +297,7 @@
if (goodsBrief == null)
continue;
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -288,7 +311,13 @@
imgInfo.setW(1);
imgInfo.setLarge(false);
imgInfo.setUrl(imgList.get(j));
- if (i != 0) {
+ String sourceImg = imgList.get(j);
+ if (!imgInfo.getUrl().startsWith("http")) {
+ sourceImg = "https:" + imgInfo.getUrl();
+ }
+ imgInfo.setUrl(TbImgUtil.getTBSizeImg(sourceImg, 500));
+ imgInfo.setUrlHD(sourceImg);
+ if (j != 0) {
imgInfo.setType(ImgEnum.img);
} else {
imgInfo.setType(ImgEnum.goods);
@@ -309,13 +338,11 @@
imageList.add(imgInfo);
}
- List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HOT, 1, 20);
-
- ruleList.get(0).getActivityUser();
+ List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
try {
- goodsEvaluateService.addGoodsEvaluate(itemId, imageList, user, doc, null);
+ goodsEvaluateService.addGoodsEvaluate(itemId, imageList, user, doc, null, null);
} catch (GoodsEvaluateException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0