Merge branch 'div'

yujian

2019-03-01 56e258fa6c23469ea825f6b11d458df9ba577e9f

 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();

         }

         

         

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



      



      if (!StringUtil.isNullOrEmpty(uid)

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

      } 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);

      } 
//      取消分享活动

//      if (!StringUtil.isNullOrEmpty(uid)

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

//      } 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));



@@ -2286,12 +2286,16 @@
                  }

               }

            }

         } 
			
         if (listSpecial == null) {

            listSpecial = new ArrayList<Special>();

         }



         JSONObject root = new JSONObject();

         root.put("special", listSpecial);



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

			
      } catch (Exception e) {

         e.printStackTrace();

      }