From e179d8660bf4837455a38c24e74320143e0d2e17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 23 一月 2019 16:05:28 +0800
Subject: [PATCH] 首页的邀请控制
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index ca8829f..d5b107c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1,10 +1,12 @@
package com.yeshi.fanli.controller.client;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -21,6 +23,10 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
@@ -62,6 +68,7 @@
import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
+import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -92,6 +99,7 @@
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -105,6 +113,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -217,6 +226,9 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -703,7 +715,15 @@
data.put("tbPidInfo", clientTBPid);
JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));
+ if (taoBaoGoodsBriefExtra.getImgList() != null)
+ taoBaoGoodsBriefExtra.getImgList().add(0, taoBaoGoodsBriefExtra.getPictUrl());
taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());
+ taobaoJson.put("saleCount", taoBaoGoodsBriefExtra.getSalesCount());// 閿�閲忥紙鍜宻alesCount涓�鑷达紝姝ゅ澶勭悊鍏煎锛�
+ if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
+ taobaoJson.put("coupon", true);
+ else
+ taobaoJson.put("coupon", false);
+
// taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", taobaoJson);
String info = configService.get("detail_prompt");
@@ -1289,14 +1309,30 @@
JSONObject data = new JSONObject();
data.put("count", count);
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getApiCommonGson();
+
+ GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+ gsonBuilder.excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
+
+ Gson gson = gsonBuilder.create();
+
if (list != null) {
- Map<String, String> map = hongBaoManageService.convertMap();
BigDecimal proportion = manageService.getFanLiRate();
for (ScanHistoryV2 sh : list) {
TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
goods.setId(sh.getId());
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
+ extra.setCreatetime(sh.getCreateTime());
+ array.add(gson.toJson(extra));
}
}
data.put("data", array);
@@ -1575,7 +1611,8 @@
* @param out
*/
@RequestMapping(value = "getNewRecommendInfo")
- public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {
+ public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
+ PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
@@ -1686,7 +1723,16 @@
if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& Integer.parseInt(acceptData.getVersion()) > 37)) {
- root.put("invite", invite);
+ if (uid != null) {
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 娌℃湁鍏抽棴閭�璇�
+ root.put("invite", invite);
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+ } else
+ root.put("invite", invite);
}
}
@@ -1870,7 +1916,7 @@
List<String> finalImgList = new ArrayList<>();
for (String img : tb.getImgList()) {
- finalImgList.add(img);
+ finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
}
JSONObject goods = new JSONObject();
@@ -1994,6 +2040,7 @@
data.put("goods", goods);
data.put("shareUsers", listShareUser);
data.put("couponUsers", listCouponUser);
+ data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0