From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 09 六月 2020 17:34:30 +0800 Subject: [PATCH] 订单 --- fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 308 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 291 insertions(+), 17 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 c34aab1..edfd68d 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 @@ -17,6 +17,9 @@ import com.yeshi.fanli.dto.jd.JDPingouInfo; import com.yeshi.fanli.dto.jd.JDShopInfo; import com.yeshi.fanli.dto.pdd.PDDGoodsDetail; +import com.yeshi.fanli.dto.suning.SuningGoodsImg; +import com.yeshi.fanli.dto.suning.SuningGoodsInfo; +import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.jd.JDGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -29,10 +32,11 @@ import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.jd.JDUtil; -import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil; import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil; +import com.yeshi.fanli.util.suning.SuningUtil; import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; +import com.yeshi.fanli.util.vipshop.VipShopUtil; import com.yeshi.fanli.vo.goods.CouponInfoVO; import com.yeshi.fanli.vo.goods.GoodsDetailVO; import com.yeshi.fanli.vo.goods.MoneyInfoVO; @@ -61,7 +65,7 @@ */ public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) { GoodsDetailVO goodsInfo = new GoodsDetailVO(); - goodsInfo.setGoodsId(goods.getGoodsId()); + goodsInfo.setGoodsId(goods.getGoodsId() + ""); goodsInfo.setTitle(goods.getTitle()); Integer shopType = goods.getShopType(); @@ -132,9 +136,19 @@ goodsInfo.setSalesType(4); // 鎬婚攢閲� goodsInfo.setPriceName("鎷煎洟浠�"); goodsInfo.setBaoyou(true); + } else if (goodsType == Constant.SOURCE_TYPE_SUNING) { + goodsInfo.setSalesType(1); + goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(SuningUtil.getFullSupplierCode(goods.getSellerId() + ""), + goods.getGoodsId() + "")); } else { goodsInfo.setSalesType(1); // 鏈堥攢閲� goodsInfo.setBaoyou(true); + } + + if (goodsType == Constant.SOURCE_TYPE_VIP) { + goodsInfo.setDiscount(goods.getCouponInfo()); + goodsInfo.setPriceName("鎶樺悗浠�"); + goodsInfo.setCouponPrice(goods.getCouponStartPrice()); } goodsInfo.setGoodsType(goodsType); @@ -165,13 +179,21 @@ BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate()); moneyInfoVO.setFanliMoney("楼" + commission); + BigDecimal maxCommission = CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate()); if (params.getMaxRewardRate() != null) moneyInfoVO .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate()))); else - moneyInfoVO.setMaxMoney("楼" + CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate())); + moneyInfoVO.setMaxMoney("楼" + maxCommission); moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate())); + + moneyInfoVO.setRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), + CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%"); + + moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), + CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%"); + goodsInfo.setMoneyInfo(moneyInfoVO); // 鍒镐俊鎭� @@ -213,6 +235,10 @@ goodsInfo.setShopInfo(shop); } + if (goodsType == Constant.SOURCE_TYPE_VIP) { + goodsInfo.setShopInfo(null); + } + // if (Constant.IS_TEST) { // // 娣诲姞鏍囩 // List<ClientTextStyleVO> labels = goodsInfo.getLabels(); @@ -242,7 +268,7 @@ GoodsDetailVO goodsInfo = new GoodsDetailVO(); goodsInfo.setBaoyou(true); goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO); - goodsInfo.setGoodsId(goods.getAuctionId()); + goodsInfo.setGoodsId(goods.getAuctionId() + ""); goodsInfo.setTitle(goods.getTitle()); goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲� goodsInfo.setZkPrice(goods.getZkPrice()); @@ -250,6 +276,7 @@ goodsInfo.setState(goods.getState() == null ? 0 : goods.getState()); goodsInfo.setSalesCount(goods.getSalesCount()); goodsInfo.setPicUrl(goods.getPictUrl()); + goodsInfo.setDescription(goods.getDescription()); Integer shopType = goods.getUserType(); if (shopType != null && shopType == 1) { @@ -272,16 +299,16 @@ moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao() .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate()))); else - moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate())); + moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false)); } else { - BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate()); + 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())); - moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate())); + moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false)); + moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true)); } goodsInfo.setMoneyInfo(moneyInfoVO); @@ -301,6 +328,7 @@ coupon.setStartTime(sdf.format(new Date(Long.parseLong(couponEffectiveStartTime)))); coupon.setLink(taoBaoQuanInfo.getCouponLink()); coupon.setStartFee(taoBaoQuanInfo.getCouponStartFee()); + coupon.setShopCoupon(goods.isShopCoupon()); goodsInfo.setHasCoupon(true); goodsInfo.setCouponInfo(coupon); } @@ -353,10 +381,11 @@ GoodsDetailVO goodsInfo = new GoodsDetailVO(); goodsInfo.setBaoyou(true); goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO); - goodsInfo.setGoodsId(goods.getAuctionId()); + goodsInfo.setGoodsId(goods.getAuctionId() + ""); goodsInfo.setTitle(goods.getTitle()); goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲� goodsInfo.setZkPrice(goods.getZkPrice()); + goodsInfo.setDescription(goods.getDescription()); String provcity = goods.getProvcity(); if (!StringUtil.isNullOrEmpty(provcity)) { @@ -403,8 +432,10 @@ MoneyInfoVO moneyInfoVO = new MoneyInfoVO(); moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6 - BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate()); - + BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false); + BigDecimal baseCommisstion = null; + if (params.getBaseFanliRate() != null) + baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(),false); moneyInfoVO.setFanliMoney("楼" + commission); if (params.getMaxRewardRate() != null) moneyInfoVO @@ -415,12 +446,22 @@ BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price); moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%"); - BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()); + BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false); BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price); moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%"); moneyInfoVO.setMaxMoney("楼" + maxCommission); + if (baseCommisstion != null) { + String desc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + commission.subtract(baseCommisstion).setScale(2).toString()); + String maxDesc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + maxCommission.subtract(baseCommisstion).setScale(2).toString()); + moneyInfoVO.setCompositionInfo(desc); + moneyInfoVO.setMaxCompositionInfo(maxDesc); + } } - moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate())); + + moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true)); + goodsInfo.setMoneyInfo(moneyInfoVO); // 鍒镐俊鎭� @@ -446,9 +487,13 @@ coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", ".")); } - coupon.setLink(TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + "")); + if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) + coupon.setLink(goods.getCouponLink()); + else + coupon.setLink( + TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + "")); coupon.setStartFee(goods.getCouponStartFee()); - + coupon.setShopCoupon(goods.isShopCoupon()); goodsInfo.setHasCoupon(true); goodsInfo.setCouponInfo(coupon); } @@ -559,7 +604,7 @@ public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) { GoodsDetailVO goodsInfo = new GoodsDetailVO(); goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD); - goodsInfo.setGoodsId(goods.getSkuId()); + goodsInfo.setGoodsId(goods.getSkuId() + ""); goodsInfo.setTitle(goods.getSkuName()); goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲� goodsInfo.setPicUrl(goods.getPicUrl()); @@ -582,6 +627,10 @@ moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6 BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate()); moneyInfoVO.setFanliMoney("楼" + commission); + BigDecimal baseCommisstion = null; + if (params.getBaseFanliRate() != null) + baseCommisstion = JDUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate()); + if (params.getMaxRewardRate() != null) moneyInfoVO .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate()))); @@ -594,6 +643,15 @@ BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price); moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%"); moneyInfoVO.setMaxMoney("楼" + maxCommission); + + if (baseCommisstion != null) { + String desc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + commission.subtract(baseCommisstion).setScale(2).toString()); + String maxDesc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + maxCommission.subtract(baseCommisstion).setScale(2).toString()); + moneyInfoVO.setCompositionInfo(desc); + moneyInfoVO.setMaxCompositionInfo(maxDesc); + } } moneyInfoVO.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate())); goodsInfo.setMoneyInfo(moneyInfoVO); @@ -702,7 +760,7 @@ GoodsDetailVO goodsInfo = new GoodsDetailVO(); goodsInfo.setBaoyou(true); goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD); - goodsInfo.setGoodsId(goods.getGoodsId()); + goodsInfo.setGoodsId(goods.getGoodsId() + ""); goodsInfo.setTitle(goods.getGoodsName()); goodsInfo.setSalesType(4); // 鎬婚攢閲� goodsInfo.setPriceName("鎷煎洟浠�"); @@ -735,6 +793,7 @@ moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6 BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate()); moneyInfoVO.setFanliMoney("楼" + commission); + moneyInfoVO.setShareMoney("楼" + commission); Boolean hasCoupon = goods.getHasCoupon(); if (hasCoupon != null && hasCoupon) { @@ -775,6 +834,10 @@ goodsInfo.setCouponInfo(coupon); } + BigDecimal baseCommisstion = null; + if (params.getBaseFanliRate() != null) + baseCommisstion = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate()); + if (params.getMaxRewardRate() != null) moneyInfoVO .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate()))); @@ -788,6 +851,15 @@ moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%"); moneyInfoVO.setMaxMoney("楼" + maxCommission); + + if (baseCommisstion != null) { + String desc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + commission.subtract(baseCommisstion).setScale(2).toString()); + String maxDesc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + maxCommission.subtract(baseCommisstion).setScale(2).toString()); + moneyInfoVO.setCompositionInfo(desc); + moneyInfoVO.setMaxCompositionInfo(maxDesc); + } } goodsInfo.setMoneyInfo(moneyInfoVO); @@ -817,4 +889,206 @@ return goodsInfo; } + public static GoodsDetailVO convertVIPGoods(VIPGoodsInfo goods, ConfigParamsDTO params) { + GoodsDetailVO goodsInfo = new GoodsDetailVO(); + goodsInfo.setBaoyou(true); + goodsInfo.setGoodsType(Constant.SOURCE_TYPE_VIP); + goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()) + ""); + goodsInfo.setTitle(goods.getGoodsName()); + goodsInfo.setSalesType(5); // 鏃犻攢閲� + goodsInfo.setPriceName("鍘熶环"); + goodsInfo.setPicUrl(goods.getGoodsThumbUrl()); // 缂╃暐鍥� + goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMarketPrice()))); + goodsInfo.setCouponPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getVipPrice()))); + goodsInfo.setShopType(CommonGoods.SHOP_TYPE_VIP); + + goodsInfo.setImgList(goods.getGoodsDetailPictures()); + + Integer state = goods.getStatus(); + if (state == null) { + goodsInfo.setState(0); + } else { + goodsInfo.setState(goods.getStatus() == 1 ? CommonGoods.STATE_OFFLINE : CommonGoods.STATE_NORMAL); + } + + goodsInfo.setSalesCount(""); + + // 璧勯噾淇℃伅 + MoneyInfoVO moneyInfoVO = new MoneyInfoVO(); + moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6 + BigDecimal commission = VipShopUtil.getGoodsFanLiMoney(goods, params.getFanLiRate()); + moneyInfoVO.setFanliMoney("楼" + commission); + moneyInfoVO.setShareMoney("楼" + commission); + + BigDecimal baseCommisstion = null; + if (params.getBaseFanliRate() != null) + baseCommisstion = VipShopUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate()); + + if (params.getMaxRewardRate() != null) + moneyInfoVO + .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate()))); + else { + BigDecimal price = new BigDecimal(goods.getVipPrice()); + BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price); + moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%"); + + BigDecimal maxCommission = VipShopUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate()); + BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price); + moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%"); + + moneyInfoVO.setMaxMoney("楼" + maxCommission); + + if (baseCommisstion != null) { + String desc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + commission.subtract(baseCommisstion).setScale(2).toString()); + String maxDesc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + maxCommission.subtract(baseCommisstion).setScale(2).toString()); + moneyInfoVO.setCompositionInfo(desc); + moneyInfoVO.setMaxCompositionInfo(maxDesc); + } + } + goodsInfo.setMoneyInfo(moneyInfoVO); + + // 搴楅摵淇℃伅 + String mallName = goods.getBrandName(); + if (!StringUtil.isNullOrEmpty(mallName)) { + ShopInfoVO shop = new ShopInfoVO(); + shop.setShopName(mallName); + if (goods.getBrandId() != null) { + shop.setId(goods.getBrandId().toString()); + } + shop.setUserType(30); + goodsInfo.setShopInfo(shop); + } + + // 鎶樻墸淇℃伅 + goodsInfo.setDiscount(MoneyBigDecimalUtil + .getWithNoZera(MoneyBigDecimalUtil.mul(new BigDecimal(goods.getDiscount()), new BigDecimal(10))) + "鎶�"); + goodsInfo.setShopInfo(null); + return goodsInfo; + } + + public static GoodsDetailVO convertSuningGoods(SuningGoodsInfo goods, ConfigParamsDTO params) { + GoodsDetailVO goodsInfo = new GoodsDetailVO(); + goodsInfo.setBaoyou(true); + goodsInfo.setGoodsType(Constant.SOURCE_TYPE_SUNING); + goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(goods.getCommodityInfo().getSupplierCode(), + goods.getCommodityInfo().getCommodityCode())); + goodsInfo.setTitle(goods.getCommodityInfo().getCommodityName()); + goodsInfo.setSalesType(1); // 鏈堥攢 + 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(); + } + goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(commodityPrice))); + goodsInfo.setShopType(CommonGoods.SHOP_TYPE_SUNING); + + List<String> imgList = new ArrayList<>(); + for (SuningGoodsImg img : goods.getCommodityInfo().getPictureUrl()) { + imgList.add(img.getPicUrl()); + } + + goodsInfo.setImgList(imgList); + goodsInfo.setState(0); + + String salesCountMidea = ""; + Integer count = Integer.parseInt(goods.getCommodityInfo().getMonthSales()); + if (count < 10000) { + salesCountMidea = count + ""; + } else { + double sales = count; + salesCountMidea = String.format("%.1f", sales / 10000); + salesCountMidea = salesCountMidea + "涓�"; + } + goodsInfo.setSalesCount(salesCountMidea); + + // 鍒镐俊鎭� + 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 (goods.getCouponInfo().getCouponStartTime() != null) { + coupon.setStartTime(goods.getCouponInfo().getCouponStartTime()); + } + + if (goods.getCouponInfo().getCouponEndTime() != null) { + coupon.setEndTime(goods.getCouponInfo().getCouponEndTime()); + } + + if (goods.getCouponInfo().getCouponCount() != null) + coupon.setTotalCount(Integer.parseInt(goods.getCouponInfo().getCouponCount())); + + if (goods.getCouponInfo().getCouponCount() != null) + coupon.setLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount())); + + goodsInfo.setHasCoupon(true); + goodsInfo.setCouponInfo(coupon); + + if (goodsInfo.getZkPrice().compareTo(coupon.getStartFee()) >= 0) { + goodsInfo.setCouponPrice(goodsInfo.getZkPrice().subtract(coupon.getAmount())); + }else{ + goodsInfo.setCouponPrice(goodsInfo.getZkPrice()); + } + + } else { + goodsInfo.setHasCoupon(false); + } + + // 璧勯噾淇℃伅 + MoneyInfoVO moneyInfoVO = new MoneyInfoVO(); + moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6 + BigDecimal commission = SuningUtil.getGoodsFanLiMoney(goods, params.getFanLiRate()); + moneyInfoVO.setFanliMoney("楼" + commission); + moneyInfoVO.setShareMoney("楼" + commission); + + BigDecimal baseCommisstion = null; + if (params.getBaseFanliRate() != null) + baseCommisstion = SuningUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate()); + + if (params.getMaxRewardRate() != null) + moneyInfoVO + .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate()))); + else { + BigDecimal price = new BigDecimal(commodityPrice); + BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price); + moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%"); + + BigDecimal maxCommission = SuningUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate()); + BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price); + moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%"); + + moneyInfoVO.setMaxMoney("楼" + maxCommission); + + if (baseCommisstion != null) { + String desc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + commission.subtract(baseCommisstion).setScale(2).toString()); + String maxDesc = String.format("浣i噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(), + maxCommission.subtract(baseCommisstion).setScale(2).toString()); + moneyInfoVO.setCompositionInfo(desc); + moneyInfoVO.setMaxCompositionInfo(maxDesc); + } + } + goodsInfo.setMoneyInfo(moneyInfoVO); + + // 搴楅摵淇℃伅 + String mallName = goods.getCommodityInfo().getSupplierName(); + if (!StringUtil.isMobile(mallName)) { + ShopInfoVO shop = new ShopInfoVO(); + shop.setShopName(mallName); + if (goods.getCommodityInfo().getSupplierCode() != null) { + shop.setId(goods.getCommodityInfo().getSupplierCode()); + } + shop.setUserType(30); + goodsInfo.setShopInfo(shop); + } + + return goodsInfo; + } + } -- Gitblit v1.8.0