yujian
2019-06-26 8298cce13665e0974ab5eaddf16a8e563b2095fd
活动列表版本区分  + 资金明细金额设置2位数
2个文件已修改
18 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2491,7 +2491,8 @@
                list.addAll(listSpecial);
            }
            
            for (Special special: list) {
            for (int i = 0; i < list.size(); i++) {
                Special special = list.get(i);
                
                JumpDetailV2 jumpDetail = special.getJumpDetail();
                if (jumpDetail != null) {
@@ -2508,7 +2509,8 @@
                // 是否需要弹出框
                if (name.equals("账户等级特权")) { 
                    if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
                        list.remove(special);
                        list.remove(i);
                        i--;
                    } else {
                        if (uid != null) {
                            special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
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,6 +327,17 @@
                    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();