Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v1;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

@@ -18,7 +19,12 @@
import org.yeshi.utils.taobao.TbImgUtil;



import com.fasterxml.jackson.core.util.VersionUtil;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.controller.client.v2.ShareControllerV2;

import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

@@ -507,16 +513,28 @@
         List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();



         long count = userShareGoodsRecordService.countQueryByUid(uid, source);



         if (count > 0) {

            list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);

         }



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

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

            @Override

            public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

               if (value == null) {

                  return new JsonPrimitive("");

               } else {

                  // 保留2位小数

                  value = value.setScale(2);

                  return new JsonPrimitive(value.toString());

               }

            }

         });

         Gson gson = gsonBuilder.create();

			
         data.put("count", count);

         data.put("result_list",

               JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create().toJson(list));

         data.put("result_list", gson.toJson(list));

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



      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("加载失败"));

         e.printStackTrace();