From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java | 241 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 222 insertions(+), 19 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 897add2..456e56e 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
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.annotation.Resource;
@@ -28,6 +29,32 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private static List<CommonContentNav> getCommonNav() {
+ List<CommonContentNav> navList = new ArrayList<>();
+ navList.add(new CommonContentNav("1", "缁煎悎"));
+ navList.add(new CommonContentNav("2", "鏈�鏂�"));
+ navList.add(new CommonContentNav("3", "鐑崠"));
+ navList.add(new CommonContentNav("4", "閿�閲�"));
+ navList.add(new CommonContentNav("5", "杩斿埄姣�"));
+ return navList;
+ }
+
+ private static int getCommonSort(String cid) {
+ int sort = DaTaoKeApiUtil.SORT_DEFAULT;
+ if ("1".equalsIgnoreCase(cid))
+ sort = DaTaoKeApiUtil.SORT_DEFAULT;
+ else if ("2".equalsIgnoreCase(cid))
+ sort = DaTaoKeApiUtil.SORT_CREATETIME;
+ else if ("3".equalsIgnoreCase(cid))
+ sort = DaTaoKeApiUtil.SORT_COUPON_NUM;
+ else if ("4".equalsIgnoreCase(cid))
+ sort = DaTaoKeApiUtil.SORT_SALES;
+ else if ("5".equalsIgnoreCase(cid))
+ sort = DaTaoKeApiUtil.SORT_COMMISSION;
+
+ return sort;
+ }
+
@Override
public List<CommonContentNav> getNavList(CommonContentTypeEnum type) {
List<CommonContentNav> navList = new ArrayList<>();
@@ -49,17 +76,9 @@
navList.add(new CommonContentNav("3", "30~50鍏冨埜"));
navList.add(new CommonContentNav("4", "50鍏冧互涓婂埜"));
} else if (type == CommonContentTypeEnum.juJia) {
- navList.add(new CommonContentNav("1", "缁煎悎"));
- navList.add(new CommonContentNav("2", "鏈�鏂�"));
- navList.add(new CommonContentNav("3", "鐑崠"));
- navList.add(new CommonContentNav("4", "閿�閲�"));
- navList.add(new CommonContentNav("5", "杩斿埄姣�"));
+ navList = getCommonNav();
} else if (type == CommonContentTypeEnum.meiShi) {
- navList.add(new CommonContentNav("1", "缁煎悎"));
- navList.add(new CommonContentNav("2", "鏈�鏂�"));
- navList.add(new CommonContentNav("3", "鐑崠"));
- navList.add(new CommonContentNav("4", "閿�閲�"));
- navList.add(new CommonContentNav("5", "杩斿埄姣�"));
+ navList = getCommonNav();
} else if (type == CommonContentTypeEnum.muYin) {
navList.add(new CommonContentNav("1", "绮鹃��"));
navList.add(new CommonContentNav("2", "澶囧瓡"));
@@ -69,23 +88,48 @@
navList.add(new CommonContentNav("6", "4~6宀�"));
navList.add(new CommonContentNav("7", "7~12宀�"));
} else if (type == CommonContentTypeEnum.reMai) {
- navList.add(new CommonContentNav("1", "缁煎悎"));
- navList.add(new CommonContentNav("2", "鏈�鏂�"));
- navList.add(new CommonContentNav("3", "鐑崠"));
- navList.add(new CommonContentNav("4", "閿�閲�"));
- navList.add(new CommonContentNav("5", "杩斿埄姣�"));
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.chuanYiDaPei) {
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.meiZhuangGehu) {
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.jingPinXieBao) {
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.chaoNanReMai) {
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.shuMaShouJi) {
+ navList = getCommonNav();
+ } else if (type == CommonContentTypeEnum.yunDongKuXie) {
+ navList = getCommonNav();
}
+
return navList;
}
-
-
@Cacheable(value = "commonContentCache", key = "#type+'-'+#cid+'-'+#page+'-'+#pageSize")
@Override
public CommonContentResult getContentList(CommonContentTypeEnum type, String cid, int page, int pageSize) {
- if (type == CommonContentTypeEnum._9k9)
+ if (type == CommonContentTypeEnum._9k9) {
return get9K9Content(cid, page, pageSize);
-
+ } else if (type == CommonContentTypeEnum.chuanYiDaPei) {
+ return getChuanYiDaPeiContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.meiZhuangGehu) {
+ return getMeiZhuangGeHuContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.jingPinXieBao) {
+ return getJingPinXieBaoContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.chaoNanReMai) {
+ return getJingPinXieBaoContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.shuMaShouJi) {
+ return getJingPinXieBaoContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.yunDongKuXie) {
+ return getJingPinXieBaoContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.chaoNanReMai) {
+ return getChaoNanReMaiContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.shuMaShouJi) {
+ return getShuMaShouJiContent(cid, page, pageSize);
+ } else if (type == CommonContentTypeEnum.yunDongKuXie) {
+ return getYunDongKuXieContent(cid, page, pageSize);
+ }
return null;
}
@@ -116,4 +160,163 @@
return new CommonContentResult(goodsList, count);
}
+ /**
+ * 绌胯。鎼厤
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ private CommonContentResult getChuanYiDaPeiContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ List<Integer> cidList = new ArrayList<>();
+ cidList.add(1);// 濂宠
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("鍐呰。 濂�", cidList, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ return new CommonContentResult(goodsList, count);
+ }
+
+ /**
+ * 缇庡涓姢
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ private CommonContentResult getMeiZhuangGeHuContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ List<Integer> cidList = new ArrayList<>();
+ cidList.add(3);// 缇庡
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("娲楁姢", cidList, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ return new CommonContentResult(goodsList, count);
+ }
+
+ /**
+ * 绮惧搧闉嬪寘
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+
+ private CommonContentResult getJingPinXieBaoContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("闉� 濂�", null, null, null, page, pageSize, sort);
+ DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("鍖� 濂�", null, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount() + result1.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ if (result1.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result1.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ Collections.shuffle(goodsList);
+ return new CommonContentResult(goodsList, count);
+ }
+
+ /**
+ * 娼敺鐑崠
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ private CommonContentResult getChaoNanReMaiContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("娼� 鐢�", null, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ Collections.shuffle(goodsList);
+ return new CommonContentResult(goodsList, count);
+ }
+
+ /**
+ * 鏁扮爜鎵嬫満
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ private CommonContentResult getShuMaShouJiContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("鐢�", null, null, null, page, pageSize, sort);
+ DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("鎵嬫満", null, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount() + result1.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ if (result1.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result1.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ Collections.shuffle(goodsList);
+ return new CommonContentResult(goodsList, count);
+ }
+
+ /**
+ * 杩愬姩閰烽瀷
+ *
+ * @param cid
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ private CommonContentResult getYunDongKuXieContent(String cid, int page, int pageSize) {
+ DaTaoKeGoodsResult result = null;
+ int sort = getCommonSort(cid);
+ result = DaTaoKeApiUtil.search("闉� 鐢�", null, null, null, page, pageSize, sort);
+ DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("杩愬姩 鐢�", null, null, null, page, pageSize, sort);
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ long count = 0;
+ if (result != null) {
+ count = result.getTotalCount() + result1.getTotalCount();
+ if (result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ if (result1.getGoodsList() != null)
+ for (DaTaoKeDetailV2 detail : result1.getGoodsList())
+ goodsList.add(TaoBaoUtil.convert(detail));
+ }
+ Collections.shuffle(goodsList);
+ return new CommonContentResult(goodsList, count);
+ }
+
}
--
Gitblit v1.8.0