Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

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

@@ -57,7 +57,6 @@
import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

@@ -328,7 +327,21 @@
               return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy.MM.dd HH:mm"));

            }

         }

      }).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();



      JSONObject data = new JSONObject();

@@ -381,7 +394,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;

@@ -390,7 +403,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())) {

@@ -416,6 +428,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;

@@ -451,6 +464,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 {

@@ -462,6 +476,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 {