admin
2019-03-01 c1b1fdb9e7169c5b5b1b600b0c247f765c4f45ac
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));
@@ -2258,40 +2258,14 @@
         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);
               }
               // 邀请登陆验证
               if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()
                     && uid != null) {
                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
                  if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
                        && userInfoExtra.getInviteCode().trim().length() > 0) {
                     JSONObject params = new JSONObject();
                     params.put("url", configService.get("invite_activation_success_url"));
                     special.setParams(params.toString());
                  }
               }
            }
         if (listSpecial == null) {
            listSpecial = new ArrayList<Special>();
         }
         JSONObject root = new JSONObject();
         root.put("special", listSpecial);
         root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
         out.print(JsonUtil.loadTrueResult(root));
      } catch (Exception e) {
         e.printStackTrace();
      }