From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 30 六月 2020 15:52:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 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..e7be381 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)); @@ -1376,7 +1387,7 @@ */ private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) { // 浜戝彂鍗曟槸鍚﹀紑鍚� - boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey()); + boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey(),acceptData.getPlatform(),acceptData.getVersion()); if (!cloudOpen && uid != null) { List<String> testUsers = configService.getTestUsers(); if (testUsers != null && testUsers.contains(uid+"")) { -- Gitblit v1.8.0