1.5.1 奖励券、免单券

yujian

2019-02-25 8b37d2f16d4aa7c7ce19829b74307ae0072b127f

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -94,6 +94,7 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

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

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

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

import com.yeshi.fanli.service.inter.user.ShamUserService;

@@ -229,6 +230,9 @@


   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -2047,7 +2051,10 @@
            new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

      shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");



      data.put("shareActivity", shareActivity);

      if (!StringUtil.isNullOrEmpty(uid)

            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

      } else

         data.put("shareActivity", shareActivity);



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



@@ -2207,4 +2214,52 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



	
   /**

    *  活动列表

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getSpecialActivities")

   public void getSpecialActivities(AcceptData acceptData, PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }

		
      try {

         // 专题活动

         String specialCard = "special_activities";

			
         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, 
               specialCard, system.getId());



         if (listSpecial != null && listSpecial.size() > 0) {

            for (Special special : listSpecial) {

               special.setCreatetime(null);

               special.setUpdatetime(null);

               special.setState(null);

               special.setRemark(null);

               special.setCard(null);

               special.setCardId(null);

					
               JumpDetailV2 jumpDetail = special.getJumpDetail();

               if (jumpDetail != null) {

                  jumpDetail.setId(null);

                  jumpDetail.setName(null);

               }

            }

         }



         JSONObject root = new JSONObject();

         root.put("special", listSpecial);



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

      } catch (Exception e) {

         e.printStackTrace();

      }

   }

}