From 207ae7df18d601d839d945d32c5519f95b959a92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 十二月 2019 11:28:49 +0800
Subject: [PATCH] 文章
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
index bf533cc..35b1859 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
@@ -25,14 +25,17 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.brand.BrandClassService;
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
+import com.yeshi.fanli.service.inter.brand.BrandInfoRecordService;
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -65,6 +68,13 @@
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
+ @Resource
+ private BrandInfoRecordService brandInfoRecordService;
+
+ @Resource
+ private ConfigService configService;
+
+
/**
* 鑾峰彇鍝佺墝鍒嗙被
*
@@ -80,6 +90,7 @@
}
JSONObject data = new JSONObject();
+ data.put("bgPicture", configService.get("brand_background_picture"));
data.put("count", list.size());
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
@@ -105,6 +116,22 @@
out.print(JsonUtil.loadFalseResult("鏈�夋嫨鏁版嵁"));
return;
}
+
+ // 鏂扮増鍒犻櫎
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ brandInfoRecordService.deleteRecord(Arrays.asList(ids.split(",")), uid, acceptData.getDevice());
+ out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ return;
+ }
+ } else {
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ brandInfoRecordService.deleteRecord(Arrays.asList(ids.split(",")), uid, acceptData.getDevice());
+ out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ return;
+ }
+ }
+
taoBaoShopHistoryService.deleteHistory(Arrays.asList(ids.split(",")), uid, acceptData.getDevice());
out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
} catch (Exception e) {
--
Gitblit v1.8.0