Merge branch 'div'

yujian

2019-02-28 f39b8e15df0c267e8a5b6135ab4ee44766acb7cd

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

@@ -1988,7 +1988,7 @@
         

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

            // 免单商品

            hongBao = quanPrice.toString();

            hongBao = "¥" + quanPrice.toString();

         }

         

         

@@ -2064,16 +2064,20 @@
      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);



      JSONObject shareActivity = new JSONObject();

      shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

            new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

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

		


      if (!StringUtil.isNullOrEmpty(uid)

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

      } else

      } else if(!"miandan".equals(from)) {

         // 非免单商品

         JSONObject shareActivity = new JSONObject();

         shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

               new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

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

			
         data.put("shareActivity", shareActivity);



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



      final String tempUid = uid;