From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 16:41:49 +0800
Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 80a6b25..465af3a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -10,6 +10,7 @@
import java.util.regex.Pattern;
import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
@@ -41,6 +42,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -54,6 +56,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.cache.IntegralGetCacheManager;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -110,9 +113,15 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private TokenRecordService tokenRecordService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private IntegralGetCacheManager integralGetCacheManager;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -130,7 +139,7 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
-
+
try {
TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
out.print(JsonUtil.loadTrueResult(tokenVO));
@@ -142,7 +151,6 @@
}
}
-
TaoBaoGoodsBrief tb = null;
String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
@@ -243,10 +251,9 @@
return;
}
-
JSONObject data = new JSONObject();
-
- if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+
+ if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
if (tb != null) {
TaoBaoGoodsBrief goodsBrief = null;
try {
@@ -265,11 +272,12 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", 3);
- data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
+ data.put("goods",
+ gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
out.print(JsonUtil.loadTrueResult(data));
return;
}
-
+
if (tb != null) {
commonGoods = new CommonGoods();
commonGoods.setPrice(tb.getZkPrice());
@@ -278,7 +286,7 @@
commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
commonGoods.setPicture(tb.getPictUrl());
}
-
+
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", commonGoods.getTitle());
taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
@@ -339,9 +347,9 @@
return false;
}
-
/**
* 鍙ｄ护棰嗗彇
+ *
* @param acceptData
* @param kw
* @param goodsType
@@ -356,9 +364,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
-
-
+
/**
* 鎼滅储鍊欓�夎瘝
*
@@ -411,7 +417,8 @@
*/
@RequestMapping(value = "searchGoods")
public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,
- Integer order, PrintWriter out) {
+ Integer order, Long uid, HttpSession session, PrintWriter out) {
+
if (goodsType == null || goodsType < 1 || goodsType > 3) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶閫掓纭钩鍙板弬鏁�"));
return;
@@ -427,6 +434,24 @@
return;
}
final String searchkey = key.trim();
+
+ if (uid != null) {
+ if (page == 1) {
+ integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());
+ } else if (page > 1) {
+ Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());
+ if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 瓒呰繃15s娴忚
+ integralGetCacheManager.clearSearchTime(acceptData.getDevice());
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 澧炲姞閲戝竵
+ integralGetService.addSearchResultScan(uid, key);
+ }
+ });
+ }
+ }
+ }
executor.execute(new Runnable() {
@Override
@@ -598,6 +623,7 @@
private void searchJDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {
JDSearchResult result = null;
+ boolean hasCoupon = false;
String way = configService.get("jd_api_search_key");
if ("1".equals(way)) {
JDFilter filterAPI = new JDFilter();
@@ -633,6 +659,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
filterAPI.setIsCoupon(1); // 鏈夊埜
}
@@ -688,6 +715,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
jdfilter.setHasCoupon(1); // 鏈夊埜
}
@@ -740,7 +768,13 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
- array.add(gson.toJson(goodsDetailVO));
+ if (hasCoupon) {
+ if (goodsDetailVO.isHasCoupon()) {
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ } else {
+ array.add(gson.toJson(goodsDetailVO));
+ }
}
}
}
--
Gitblit v1.8.0