From 8c04d27e5cebb7e654c208533e9567c4df2c8acc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:21:44 +0800
Subject: [PATCH] 券时间限制
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
index a2c2597..5666f37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
@@ -11,10 +11,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.JsonUtil;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dto.common.CommonContentNav;
import com.yeshi.fanli.dto.common.CommonContentResult;
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
@@ -22,34 +19,32 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
-import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
@Service
public class CommonTemplateContentServiceImpl implements CommonTemplateContentService {
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private TaobaoMeterialService taobaoMeterialService;
@@ -145,7 +140,7 @@
} else if (type == CommonContentTypeEnum.chaoPinReMai) {
navList = getCommonNav();
} else if (type == CommonContentTypeEnum.mianDan) {
- navList = getCommonNav();
+ navList = new ArrayList<>();
}
return navList;
@@ -184,7 +179,7 @@
} else if (type == CommonContentTypeEnum.haoQuan) {
result = getHaoQuanContent(cid, page, pageSize);
} else if (type == CommonContentTypeEnum.mianDan) {
- result = getHaoQuanContent(cid, page, pageSize);
+ result = getMianDanContent(page, pageSize);
}
if (result != null) {// 鍟嗗搧淇℃伅杩囨护
@@ -212,15 +207,36 @@
if ("-1".equalsIgnoreCase(cid)) {
result = DaTaoKeApiUtil.search("", null, null, new BigDecimal("10"), page, pageSize,
DaTaoKeApiUtil.SORT_DEFAULT);
+ if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
+ result = new DaTaoKeGoodsResult();
+ result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(null,
+ new BigDecimal("10"),null, page, pageSize));
+ result.setTotalCount(
+ daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
+ }
} else if ("0".equalsIgnoreCase(cid)) {
result = DaTaoKeApiUtil.search("", null, null, new BigDecimal("10"), page, pageSize,
DaTaoKeApiUtil.SORT_CREATETIME);
+ if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
+ result = new DaTaoKeGoodsResult();
+ result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(null,
+ new BigDecimal("10"),"createTime", page, pageSize));
+ result.setTotalCount(
+ daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
+ }
} else {
List<Integer> cidList = new ArrayList<>();
cidList.add(Integer.parseInt(cid));
result = DaTaoKeApiUtil.search("", cidList, null, new BigDecimal("10"), page, pageSize,
DaTaoKeApiUtil.SORT_DEFAULT);
+ if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
+ result = new DaTaoKeGoodsResult();
+ result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(Integer.parseInt(cid),
+ new BigDecimal("10"),null, page, pageSize));
+ result.setTotalCount(
+ daTaoKeGoodsDetailV2Service.countByMaxPrice(Integer.parseInt(cid), new BigDecimal("10")));
+ }
}
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
@@ -496,7 +512,7 @@
List<Integer> cidList = new ArrayList<>();
cidList.add(1);// 濂宠
int sort = getCommonSort(cid);
- result = DaTaoKeApiUtil.search("鍐呰。 濂�", cidList, null, null, page, pageSize, sort);
+ result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
if (result != null) {
--
Gitblit v1.8.0