From 4eec0941212a811ba4400eb628164189c17623d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 二月 2019 17:42:28 +0800
Subject: [PATCH] 增加第三方订单处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 178 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 77 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 62b0b83..d52211c 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;
@@ -71,7 +78,6 @@
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.goods.HonestService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
@@ -88,11 +94,13 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
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;
@@ -106,6 +114,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;
@@ -163,9 +172,6 @@
private SystemConfigService systemConfigService;
@Resource
- private HonestService honestService;
-
- @Resource
private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
@@ -221,6 +227,12 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -308,7 +320,7 @@
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- List<Honest> honestList = honestService.getHonestListCache();
+ List<Honest> honestList = null;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
@@ -706,8 +718,18 @@
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", gson.toJson(taoBaoGoodsBriefExtra));
+ data.put("taobao", taobaoJson);
String info = configService.get("detail_prompt");
data.put("info", info);
String onlyInfo = configService.get("only_info");
@@ -1291,14 +1313,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);
@@ -1357,16 +1395,18 @@
/**
* 闃叉璇锋眰棰戠巼杩囬珮
+ *
*/
- String key = "linkParse-" + acceptData.getDevice() + "-" + id;
+ if (Constant.IS_OUTNET) {
+ String key = "linkParse-" + acceptData.getDevice() + "-" + id;
- String value = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(value)) {
- out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
- return;
+ String value = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+ return;
+ }
+ redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
}
- redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
-
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1575,7 +1615,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) {
@@ -1675,8 +1716,29 @@
JSONObject invite = new JSONObject();
JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");
invite.put("jumpDetail", jumpDetail);
+ invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");
- root.put("invite", invite);
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
+ } else {
+
+ // 鎸夌収鐗堟湰杩斿洖锛岀増鏈鐩栬冻澶熷悗鍙垹闄�
+ if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
+ || ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) > 37)) {
+ 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);
+ }
+ }
out.print(JsonUtil.loadTrueResult(root));
@@ -1786,7 +1848,7 @@
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
}
});
@@ -1813,7 +1875,11 @@
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
}
}
@@ -1854,7 +1920,7 @@
List<String> finalImgList = new ArrayList<>();
for (String img : tb.getImgList()) {
- finalImgList.add(img);
+ finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
}
JSONObject goods = new JSONObject();
@@ -1978,6 +2044,17 @@
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);
+
+ JSONObject shareActivity = new JSONObject();
+ shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
+ new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+ shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
+
+ if (!StringUtil.isNullOrEmpty(uid)
+ && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+ } else
+ data.put("shareActivity", shareActivity);
out.print(JsonUtil.loadTrueResult(data));
@@ -2062,62 +2139,9 @@
}
List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
-
- // 閲嶆柊鍋氭帹鑽�
- if (goodsList == null || goodsList.size() == 0) {
-
- goodsList = new ArrayList<>();
-
- TaoBaoGoodsBrief goods = null;
-
- try {
- goods = redisManager.getTaoBaoGoodsBrief(id);
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
-
- if (goods == null) {
- // 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
- CommonGoods.GOODS_TYPE_TB);
- // 鍟嗗搧鏈夋湰鍦扮紦瀛�
- if (cgoods != null) {
- // 鎸夊悕瀛楁悳绱㈠晢鍝�
- SearchFilter sf = new SearchFilter();
- sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));
-
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
-
- if (result != null && result.getTaoBaoGoodsBriefs() != null
- && result.getTaoBaoGoodsBriefs().size() > 0) {
-
- for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {
- if (goodsList.size() == 10) {
- break;
- }
- goodsList.add(gds);
- }
- }
- }
- }
-
- // 闇�瑕佸彟鍋氭帹鑽�
- if (goodsList.size() < 2) {
- try {
- List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
- if (list != null) {
- for (int i = 0; i < list.size(); i++) {
- if (i == 10) {
- break;
- }
- goodsList.add(list.get(i).getTaoBaoGoodsBrief());
- }
- }
- } catch (Exception e2) {
- e2.printStackTrace();
- }
-
- }
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<TaoBaoGoodsBrief>();
}
BigDecimal proportion = manageService.getFanLiRate();
--
Gitblit v1.8.0