From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..caa3ca8 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,16 @@
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.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;
@@ -64,6 +66,10 @@
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
+
+ @Resource
+ private BrandInfoRecordService brandInfoRecordService;
+
/**
* 鑾峰彇鍝佺墝鍒嗙被
@@ -105,6 +111,22 @@
out.print(JsonUtil.loadFalseResult("鏈�夋嫨鏁版嵁"));
return;
}
+
+ // 鏂扮増鍒犻櫎
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ if (VersionUtil.greaterThan_2_1(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