订单奖励修改

admin

2019-10-22 32f925357776c46bd9e35cf9aad4fdd0f6535d1d

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

@@ -31,16 +31,17 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.goods.recommend.HomeRecommendGoodsService;

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

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;

@@ -125,6 +126,11 @@


   @Resource

   private DaTaoKeGoodsService daTaoKeGoodsService;

	
   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

	
	


   /**

    * 新版推荐专题管理(1.5.3)

@@ -173,7 +179,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));

@@ -200,8 +206,10 @@
   }



   private JSONObject getSpikeGoodsContent(AcceptData acceptData) {

      List<String> dtoList = DaTaoKeUtil.getDingDongQiangTime();

      long nowTime = System.currentTimeMillis();

      Calendar calendar=   Calendar.getInstance(); 
      calendar.setTimeInMillis(nowTime);

      List<String> dtoList = DaTaoKeUtil.getDingDongQiangTime(calendar);	
      int dateNum = Integer.parseInt(TimeUtil.getGernalTime(nowTime, "ddHH"));

      String timeStr = null;

      int nextPos = 0;

@@ -212,6 +220,7 @@
            break;

         }

      }

		
      if (timeStr == null)

         timeStr = dtoList.get(dtoList.size() - 1);



@@ -364,7 +373,7 @@
         for (int i = 0; i < arrayKeys.size(); i++) {

            String name = arrayKeys.get(i).toString();

            JSONObject params = new JSONObject();

            params.put("searchKey", name);

            params.put("content", name);



            SearchKeyVO keyVO = new SearchKeyVO();

            keyVO.setName(name);

@@ -723,9 +732,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 +743,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--);

@@ -755,4 +770,44 @@
         out.print(JsonUtil.loadTrueResult(data));

   }



	
   /**

    * 获取专题渠道活动

    * 
    * @param acceptData

    * @param uid

    * @param callback

    * @param out

    */

   @RequestMapping(value = "getGuide")

   public void getGuide(AcceptData acceptData, Long uid, PrintWriter out) {

      String tips = null;

      if (uid == null || uid <= 0) {

         tips = configService.get("tip_guide_new_user");

      } else {

         long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);

         long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);

         if (rebateOrder + shareOrInviteOrder >= 3) {

            // 熟客版

         } else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {

            // 新人版

            tips = configService.get("tip_guide_new_user");

         } else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {

            // 省钱版

            tips = configService.get("tip_guide_save_money");

         } else {

            // 赚钱版

            tips = configService.get("tip_guide_share_invite");

         } 
      }

		
      if (StringUtil.isNullOrEmpty(tips)) {

         out.print(JsonUtil.loadFalseResult("暂无提示"));

         return;

      }

		
      JSONObject data = JSONObject.fromObject(tips);

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

   }



}