商品详情对象修改

yujian

2019-07-02 6367f20b7a8fe23d7a547b83f1e30321b84d09f2

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java

@@ -152,17 +152,14 @@
         page = 1;

      }



      long count = 0;

		
      int pageSize = Constant.PAGE_SIZE;



      List<UserTaoLiJinRecordVO> list = userTaoLiJinRecordService.getRecordByUid((page - 1) * pageSize, pageSize,   uid);



      if (list == null) {

         list = new ArrayList<UserTaoLiJinRecordVO>();

      } else if (list.size() > 0) {

         count = userTaoLiJinRecordService.countRecordByUid(uid);

      }

      } 
      

      long count = userTaoLiJinRecordService.countShareRecordByUid(uid);

      

      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

@@ -394,7 +391,7 @@
         data.put("jumpName", "去使用");

         data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

         data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

         

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

         return;

@@ -403,7 +400,6 @@
      

      // 登录用户

      JSONObject data = new JSONObject();

      data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));

      data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));

      

      if (type.equals(TaoLiJinOriginEnum.newbiesWin.name())) {

@@ -429,6 +425,7 @@
         data.put("jumpName", "去使用");

         data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

         data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

         data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

         

      } else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) {

         boolean isRank = false;

@@ -464,6 +461,7 @@
            data.put("jumpName", "去查看");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

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

            return;

         } else {

@@ -475,6 +473,7 @@
            data.put("jumpName", "去使用");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

         }

         

      } else {