From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index edfd68d..60f510a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -137,7 +137,7 @@
goodsInfo.setPriceName("鎷煎洟浠�");
goodsInfo.setBaoyou(true);
} else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
- goodsInfo.setSalesType(1);
+ goodsInfo.setSalesType(1);
goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(SuningUtil.getFullSupplierCode(goods.getSellerId() + ""),
goods.getGoodsId() + ""));
} else {
@@ -299,16 +299,16 @@
moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
.add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
else
- moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));
+ moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(), false));
} else {
- BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);
+ BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(), false);
moneyInfoVO.setFanliMoney("楼" + commission);
if (params.getMaxRewardRate() != null)
moneyInfoVO.setMaxMoney(
"楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
else
- moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));
+ moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(), false));
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(), true));
}
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -432,10 +432,10 @@
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);
+ BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(), false);
BigDecimal baseCommisstion = null;
if (params.getBaseFanliRate() != null)
- baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(),false);
+ baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(), false);
moneyInfoVO.setFanliMoney("楼" + commission);
if (params.getMaxRewardRate() != null)
moneyInfoVO
@@ -446,7 +446,7 @@
BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
- BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false);
+ BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(), false);
BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
moneyInfoVO.setMaxMoney("楼" + maxCommission);
@@ -460,7 +460,7 @@
}
}
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(), true));
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -979,8 +979,7 @@
goodsInfo.setPriceName("鍘熶环");
if (goods.getCommodityInfo().getPictureUrl().size() > 0)
goodsInfo.setPicUrl(goods.getCommodityInfo().getPictureUrl().get(0).getPicUrl()); // 缂╃暐鍥�
-
-
+
String commodityPrice = goods.getCommodityInfo().getCommodityPrice();
if (StringUtil.isNullOrEmpty(commodityPrice)) {
commodityPrice = goods.getCommodityInfo().getSnPrice();
@@ -1011,7 +1010,10 @@
if (goods.getCouponInfo() != null && !StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl())) {// 鏈夊埜
CouponInfoVO coupon = new CouponInfoVO();
coupon.setAmount(new BigDecimal(goods.getCouponInfo().getCouponValue()));
- coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getBounsLimit()));
+ if (StringUtil.isNullOrEmpty(goods.getCouponInfo().getBounsLimit())) {
+ coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getCouponValue()));
+ } else
+ coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getBounsLimit()));
if (goods.getCouponInfo().getCouponStartTime() != null) {
coupon.setStartTime(goods.getCouponInfo().getCouponStartTime());
@@ -1032,7 +1034,7 @@
if (goodsInfo.getZkPrice().compareTo(coupon.getStartFee()) >= 0) {
goodsInfo.setCouponPrice(goodsInfo.getZkPrice().subtract(coupon.getAmount()));
- }else{
+ } else {
goodsInfo.setCouponPrice(goodsInfo.getZkPrice());
}
--
Gitblit v1.8.0