专题加入版本信息

yujian

2019-09-03 3d50552f1910a5d30cc5bb322f0f7984bce51624

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

@@ -2185,6 +2185,8 @@
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         if ("taolijin".equalsIgnoreCase(from))

            proportion = manageService.getTLJShareRate(System.currentTimeMillis());

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goodsJson.put("hongBao", hongBao);

@@ -2273,7 +2275,7 @@
      // 推广红包

      if (from != null && from.equals("taolijin")) {

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);

         String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);



         // 推广红包 不能小于1

@@ -2332,7 +2334,7 @@
            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());

         }



         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link",null);

         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", null);



         if (Constant.IS_TEST) {

            fanliValid = true;

@@ -2554,23 +2556,12 @@
    */

   @RequestMapping(value = "getSpecialActivities")

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



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

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

         return;

      }



      try {



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

         List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",

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

		
         List<Special> list = new ArrayList<Special>();

         // 专题活动

         String specialCard = "special_activities";



         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

               system.getId());



         if (listSpecial != null) {

            list.addAll(listSpecial);

         }