From 12af83285ddf90cca4f5ef637a15adc1a7e0efa2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 17:07:51 +0800
Subject: [PATCH] 拼多多兼容免单
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 78bb3d1..73f07cb 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
@@ -480,15 +480,15 @@
goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop));
}
- // 鏈夊埜澶勭悊
- if (goodsDetail.isHasCoupon()) {
- if (!StringUtil.isNullOrEmpty(from)) {
- if ("miandan".equals(from)) { // 鍏嶅崟鍟嗗搧
- MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
- moneyInfo.setFanliMoney("楼" + goodsDetail.getCouponPrice());
- goodsDetail.setMoneyInfo(moneyInfo);
- }
+ // 鍏嶅崟鍟嗗搧
+ if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {
+ MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
+ if (goodsDetail.isHasCoupon()) {
+ moneyInfo.setFanliMoney("楼" + goodsDetail.getCouponPrice());
+ } else {
+ moneyInfo.setFanliMoney("楼" + goodsDetail.getZkPrice());
}
+ goodsDetail.setMoneyInfo(moneyInfo);
}
extraVO.setTbPidInfo(clientTBPid);
@@ -1074,6 +1074,17 @@
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
}
+
+ // 鍏嶅崟鍟嗗搧
+ if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {
+ MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
+ if (goodsDetail.isHasCoupon()) {
+ moneyInfo.setFanliMoney("楼" + goodsDetail.getCouponPrice());
+ } else {
+ moneyInfo.setFanliMoney("楼" + goodsDetail.getZkPrice());
+ }
+ goodsDetail.setMoneyInfo(moneyInfo);
+ }
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
--
Gitblit v1.8.0