yujian
2020-06-16 e7920b14a9baab97035a1a529da85d124a2bcacd
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1515,11 +1515,11 @@
   public void collectionGoodsList(AcceptData acceptData, long uid, int page, PrintWriter out) {
      List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page + 1,
            Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO);
            Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO, true);
      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO);
      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO, true);
      JSONObject data = new JSONObject();
      List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -2228,7 +2228,7 @@
         if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
            UserInviteLevelEnum level = null;
            // VIP预览信息
            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
            if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
               String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);
               if (!StringUtil.isNullOrEmpty(redisContent)) {
                  MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);
@@ -2303,6 +2303,8 @@
               data.put("vipAction", vipAction);
         }
         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
         out.print(JsonUtil.loadTrueResult(data));