yujian
2019-09-27 c1f208bb47427f36f556e27373f72f8e6f2587a8
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -38,7 +38,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.exception.ShareGoodsException;
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
@@ -51,12 +51,12 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -149,42 +149,18 @@
      return "coupon";
   }
   //该方法以及废弃
   @Deprecated
   @RequestMapping("findThreeFriendsCount")
   public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
      int count1 = userInfoService.findFriendsCount(id, 1);
      int count2 = userInfoService.findFriendsCount(id, 2);
      JSONObject data = new JSONObject();
      data.put("count1", count1);
      data.put("count2", count2);
      if (!StringUtil.isNullOrEmpty(callback)) {
         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
      } else {
         out.print(JsonUtil.loadTrueResult(data));
      }
   }
   //该方法以及废弃
   @Deprecated
   @RequestMapping("findThreeFriends")
   public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
      int pageSize = 30;
      List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);
      JSONArray array = new JSONArray();
      for (InviteUser user : list) {
         JSONObject item = JSONObject.fromObject(new GsonBuilder().create().toJson(user.getUserInfo()));
         item.put("valid", user.isValid());
         array.add(item);
      }
      long count = userInfoService.getFriendsListCount(id, type);
      JSONObject data = new JSONObject();
      data.put("list", array);
      data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
      if (!StringUtil.isNullOrEmpty(callback)) {
         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
      } else {
         out.print(JsonUtil.loadTrueResult(data));
      }
   }
   @RequestMapping(value = "getConpon", method = RequestMethod.POST)
@@ -337,8 +313,6 @@
   @RequestMapping("threeShareNew")
   public String threeShareNew(HttpServletRequest request, HttpSession session, HttpServletResponse response,
         long uid) {
      String serverName = request.getServerName();
      String contextPath = request.getContextPath();
      UserInfo userInfo = userInfoService.getUserById(uid);
      if (userInfo == null) {
         return "share/error";