文章

yujian

2019-12-28 207ae7df18d601d839d945d32c5519f95b959a92

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java

@@ -27,6 +27,7 @@
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.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -70,6 +71,9 @@
   @Resource

   private BrandInfoRecordService brandInfoRecordService;

   

   @Resource

   private ConfigService configService;

	
   

   /**

    * 获取品牌分类

@@ -86,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));



@@ -114,7 +119,7 @@
         

         // 新版删除

         if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {

            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

               brandInfoRecordService.deleteRecord(Arrays.asList(ids.split(",")), uid, acceptData.getDevice());

               out.print(JsonUtil.loadTrueResult("删除成功"));

               return;