文章

yujian

2019-12-28 207ae7df18d601d839d945d32c5519f95b959a92

 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) {