金币BUG修改

admin

2019-09-22 b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -36,11 +36,11 @@
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

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

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

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

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

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

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

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

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

@@ -173,7 +173,7 @@
         if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))

            root.put("scoreExchange", getScoreExchangeInfo(acceptData));



         if (VersionUtil.greaterThan_2_0_0(acceptData.getPlatform(), acceptData.getVersion()))

         if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))

            root.put("searchDiscovery", getSearchDiscoveryInfo(acceptData));



         out.print(JsonUtil.loadTrueResult(root));

@@ -723,9 +723,10 @@
   public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {



      int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

		
      List<Special> list = specialService.listByPlaceKey("special_channel_activity",platformCode, Integer.parseInt(acceptData.getVersion()));

		


      List<Special> list = specialService.listByPlaceKey("special_channel_activity", platformCode,

            Integer.parseInt(acceptData.getVersion()));



      long time = System.currentTimeMillis();

      // 删除尚未启用的过期的

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

@@ -733,6 +734,11 @@
         if (special.getState() == 1L) {

            list.remove(i--);

         } else {

            if (special.getStartTime() != null && special.getEndTime() != null)

               special.setTimeTask(true);

            else

               special.setTimeTask(false);

				
            if (special.isTimeTask()) {

               if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {

                  list.remove(i--);