From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 e436a63..78bb3d1 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
@@ -1376,7 +1376,7 @@
*/
private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
// 浜戝彂鍗曟槸鍚﹀紑鍚�
- boolean cloudOpen = configService.isRobotCloudOpen();
+ boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey());
if (!cloudOpen && uid != null) {
List<String> testUsers = configService.getTestUsers();
if (testUsers != null && testUsers.contains(uid+"")) {
@@ -1385,7 +1385,8 @@
}
extraVO.setCloudOpen(cloudOpen);
- if (!goodsDetail.isHasCoupon()) {
+ // 鏃犲埜鎴栬�呮湭寮�鍚彂鍦�
+ if (!goodsDetail.isHasCoupon() || !cloudOpen) {
return;
}
@@ -1409,6 +1410,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