智能推荐修改

admin

2019-07-31 784af16411d97c3e14f81dd4ebf1380c8b9effb0

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

@@ -72,6 +72,7 @@
import com.yeshi.fanli.vo.goods.OtherInfo;

import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.ReduceHongBao;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO;

import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO;

@@ -211,8 +212,8 @@
         return;

      }



      // 过期

      userTaoLiJinOriginService.overdueHongBao(uid);

      // 过期 -取消收回

      // userTaoLiJinOriginService.overdueHongBao(uid);



      // 我的淘礼金

      BigDecimal tlj = null;

@@ -579,13 +580,12 @@
         array.add(gson.toJson(extra));

      }



      executor.execute(new Runnable() {

         @Override

         public void run() {

            // 过期

            userTaoLiJinOriginService.overdueHongBao(uid);

         }

      });

      /*// 过期 -取消收回

       * executor.execute(new Runnable() {

       * 
       * @Override public void run() {

       * userTaoLiJinOriginService.overdueHongBao(uid); } });

       */



      JSONObject data = new JSONObject();

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

@@ -759,5 +759,85 @@
      }

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

   }

	
	
   /**

    * 分享爆款商品-限于淘礼金

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getBuyGoodsV2", method = RequestMethod.POST)

   public void getBuyGoodsV2(AcceptData acceptData, int page, PrintWriter out) {



      String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());

      List<TLJBuyGoods> listHot = tljBuyGoodsService.listByDay(day);

      if (listHot == null) {

         listHot = new ArrayList<TLJBuyGoods>();

      }



      JSONArray array = new JSONArray();

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

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



      BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

      for (TLJBuyGoods hotGoods : listHot) {

         TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

         if (taoBaoGoodsBrief == null) {

            continue;

         }



         // 计算推广红包

         BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion);



         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0) {

            continue;

         }





         GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, proportion, proportion);

         // 去掉标签

         detailVO.setLabels(null);

			


         MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();

         moneyInfo.setMoneyType(2);

         detailVO.setMoneyInfo(moneyInfo);

			
         String hongBao = spreadMoney.toString();

         ReduceHongBao vo = new ReduceHongBao();

         vo.setLeft(hotGoods.getLeftHongBaoCount());

         vo.setMoney(" ¥" + hongBao);

         vo.setName("付款立减 ");

         vo.setTip("");

         vo.setTotal(hotGoods.getTotalHongBaoCount());

			
         OtherInfo otherInfo = new OtherInfo();

         otherInfo.setReduceHongBao(vo);

         detailVO.setOtherInfo(otherInfo);

			
         array.add(gson.toJson(detailVO));

      }



      if (page > 1)

         array.clear();



      JSONObject data = new JSONObject();

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

      data.put("list", array);

      if (page == 1) {

         List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");

			
         if (bannerList != null && bannerList.size() > 0)

            data.put("topPicture", bannerList.get(0).getSrc());

         else

            data.put("topPicture", "");

			
         data.put("ruleUrl", configService.get("zigoulijian_rule"));

      }

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

   }



}