From 5f13dcc8eaac7cd26c0ec41bd1b3efbb70a08180 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 六月 2020 17:45:09 +0800
Subject: [PATCH] 云发单金额修改，增加获取电话号码接口
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index bf824c5..6448a3f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -661,7 +661,7 @@
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(acceptData, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -883,7 +883,7 @@
extraVO.setShare(shareInfoVO);
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(acceptData, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -1072,7 +1072,7 @@
}
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(acceptData, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
JSONObject object = new JSONObject();
@@ -1211,7 +1211,7 @@
extraVO.setShare(shareInfoVO);
// 浜戝彂鍗曟枃妗堜俊鎭�
- getCloudInfo(acceptData, goodsDetail, extraVO);
+ getCloudInfo(acceptData, uid, goodsDetail, extraVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -1345,7 +1345,7 @@
extraVO.setShare(shareInfoVO);
// 浜戝彂鍗曟枃妗堜俊鎭�
- getCloudInfo(acceptData, goodsDetail, extraVO);
+ getCloudInfo(acceptData, uid, goodsDetail, extraVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -1374,14 +1374,16 @@
* // 浜戝彂鍗曟枃妗堜俊鎭�
* @param goodsDetail
*/
- private void getCloudInfo(AcceptData acceptData, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
+ private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
// 浜戝彂鍗曟槸鍚﹀紑鍚�
- String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
- if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {
- extraVO.setCloudOpen(true);
+ boolean cloudOpen = configService.isRobotCloudOpen();
+ if (!cloudOpen && uid != null) {
+ List<String> testUsers = configService.getTestUsers();
+ if (testUsers != null && testUsers.contains(uid+"")) {
+ cloudOpen = true;
+ }
}
-
+ extraVO.setCloudOpen(cloudOpen);
if (!goodsDetail.isHasCoupon()) {
return;
@@ -1407,6 +1409,16 @@
}
if (!StringUtil.isNullOrEmpty(cloudText) && !StringUtil.isNullOrEmpty(cloudPic)) {
+
+ cloudText = cloudText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goodsDetail.getZkPrice()) + "");
+ if (!goodsDetail.isHasCoupon()) {
+ cloudText = cloudText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
+ cloudText = cloudText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+ } else {
+ cloudText = cloudText.replace("[鍒稿悗浠穄", MoneyBigDecimalUtil.getWithNoZera(goodsDetail.getCouponPrice()) + "");
+ }
+ cloudText = cloudText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+
extraVO.setCloudPic(cloudPic);
extraVO.setCloudText(cloudText);
}
--
Gitblit v1.8.0