From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 999bc6a..f1230e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -842,9 +842,12 @@
}
}
+ String rule = configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule");
+ rule = rule.replace("{閾炬帴}", configService.get("customer_service_link"));
+
data.put("state", state);
data.put("balance","鏂颁汉绾㈠寘锛�" + balance.setScale(2) + "鍏�");
- data.put("rule", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));
+ data.put("rule", rule);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0