admin
2019-12-24 48e4c4328cfd305d5465b66db11521ff70723683
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) {