IOS上线隐藏我的界面的banner与超级会员升级信息

admin

2020-05-06 24a8d17e007545f7426c48352109aa1a9c6587ee

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -19,10 +19,12 @@
import com.yeshi.fanli.entity.bus.lable.MergeClass;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;

import com.yeshi.fanli.entity.taobao.TaobaoMeterial;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

@@ -31,15 +33,16 @@
import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.lable.LabelService;

import com.yeshi.fanli.service.inter.lable.MergeClassService;

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -97,6 +100,9 @@


   @Resource

   private TaoBaoGoodsActivityService taoBaoGoodsActivityService;



   @Resource

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   /**

    * 9.9商品

@@ -599,7 +605,7 @@
            // 判断收藏

            if (!StringUtil.isNullOrEmpty(uid)) {

               CollectionGoodsV2 collectionGoods = collectionGoodsV2Service

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId(),Constant.SOURCE_TYPE_TAOBAO);

               if (collectionGoods != null) {

                  collected = 1;

               }

@@ -866,6 +872,40 @@
      data.put("type", type);

      data.put("result_list", array);



      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }



   @RequestMapping("getFlashSaleNew")

   public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {

      List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(time);

      if (detailList0 == null)

         detailList0 = new ArrayList<>();

      List<DaTaoKeDetailV2> detailList = new ArrayList<>();

      detailList.addAll(detailList0);

      JSONArray array = new JSONArray();

      if (page == 1) {

         if (auctionId != null && detailList != null)

            for (int i = 0; i < detailList.size(); i++) {

               if (detailList.get(i).getGoodsId().longValue() == auctionId) {

                  DaTaoKeDetailV2 goods = detailList.get(i);

                  detailList.remove(i);

                  detailList.add(0, goods);

                  break;

               }

            }



         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         if (detailList != null)

            for (DaTaoKeDetailV2 detail : detailList) {

               array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),

                     hongBaoManageService.getFanLiRate() + "", null)));

            }

      }



      JSONObject data = new JSONObject();

      data.put("count", detailList.size());

      data.put("result_list", array);

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }



@@ -1168,7 +1208,7 @@
         JSONObject data = new JSONObject();

         if (page == 1) {

            // 抽奖规则

            String rules = configService.get("free_goods_rule");

            String rules = configService.get(ConfigKeyEnum.freeGoodsRule.getKey());

            data.put("ruleLink", rules);

         }