From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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 799c50a..f7a7430 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
@@ -46,6 +46,7 @@
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -170,6 +171,9 @@
@Resource
private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
+ @Resource
+ private IntegralGetService integralGetService;
+
/**
* 娣樺疂鍟嗗搧璇︽儏
*
@@ -467,6 +471,15 @@
otherInfo.setSpreadHongBao(spreadHongBao);
goodsDetail.setOtherInfo(otherInfo);
+ // 1.6.5鍚庢敼涓虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (goodsDetail.getCouponPrice() != null
+ && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(spreadMoney));
+ else
+ goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(spreadMoney));
+ }
+
goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,
hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));
goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,
@@ -495,11 +508,11 @@
shareValid = false;
helpLink = configService.get("zigoulijian_nofanli_help");
- String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
ReduceHongBao reduceHongBao = new ReduceHongBao();
reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());
- reduceHongBao.setMoney(tljHongBao);
+ reduceHongBao.setMoney(tljHongBao.toString());
reduceHongBao.setName("浠樻绔嬪噺 ");
reduceHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());
@@ -507,6 +520,16 @@
OtherInfo otherInfo = new OtherInfo();
otherInfo.setReduceHongBao(reduceHongBao);
goodsDetail.setOtherInfo(otherInfo);
+
+ // 1.6.5鍚庢敼涓虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (goodsDetail.getCouponPrice() != null
+ && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));
+ else
+ goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));
+ }
+
}
extraVO.setFanliValid(fanliValid);
extraVO.setShareValid(shareValid);
@@ -1046,6 +1069,9 @@
data.put("native", true);
data.put("jumpLink", jumpLink);
out.print(JsonUtil.loadTrueResult(data));
+
+ // 鑾峰緱閲戝竵
+ integralGetService.addCouponRebate(uid);
}
/**
@@ -1088,6 +1114,9 @@
data.put("jumpLink", convertUrl.getUrl());
data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
out.print(JsonUtil.loadTrueResult(data));
+
+ // 鑾峰緱閲戝竵
+ integralGetService.addCouponRebate(uid);
}
/**
--
Gitblit v1.8.0