From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 1790 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 892 insertions(+), 898 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 aaaee5b..65f82f4 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
@@ -47,1053 +47,1047 @@
 
 /**
  * 鍟嗗搧鍔犲伐
- * 
- * @author Administrator
  *
+ * @author Administrator
  */
 public class GoodsDetailVOFactory {
 
-	/**
-	 * 娣樺疂鍟嗗搧缁勭粐
-	 * 
-	 * @param goods
-	 *            娣樺疂鍟嗗搧
-	 * @param pid
-	 * @param fanLiRate
-	 *            杩斿埄姣斾緥
-	 * @return
-	 */
-	public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) {
-		GoodsDetailVO goodsInfo = new GoodsDetailVO();
-		goodsInfo.setGoodsId(goods.getGoodsId() + "");
-		goodsInfo.setTitle(goods.getTitle());
+    /**
+     * 娣樺疂鍟嗗搧缁勭粐
+     *
+     * @param goods     娣樺疂鍟嗗搧
+     * @param pid
+     * @param fanLiRate 杩斿埄姣斾緥
+     * @return
+     */
+    public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) {
+        GoodsDetailVO goodsInfo = new GoodsDetailVO();
+        goodsInfo.setGoodsId(goods.getGoodsId() + "");
+        goodsInfo.setTitle(goods.getTitle());
 
-		Integer shopType = goods.getShopType();
-		if (shopType == null) {
-			goodsInfo.setShopType(10); // 娣樺疂
-			goodsInfo.setPriceName("娣樺疂浠�");
-		} else if (shopType == 1) {
-			goodsInfo.setShopType(10); // 娣樺疂
-			goodsInfo.setPriceName("娣樺疂浠�");
-		} else if (shopType == 2) {
-			goodsInfo.setShopType(11); // 澶╃尗
-			goodsInfo.setPriceName("澶╃尗浠�");
-		} else {
-			goodsInfo.setShopType(goods.getShopType());
-		}
+        Integer shopType = goods.getShopType();
+        if (shopType == null) {
+            goodsInfo.setShopType(10); // 娣樺疂
+            goodsInfo.setPriceName("娣樺疂浠�");
+        } else if (shopType == 1) {
+            goodsInfo.setShopType(10); // 娣樺疂
+            goodsInfo.setPriceName("娣樺疂浠�");
+        } else if (shopType == 2) {
+            goodsInfo.setShopType(11); // 澶╃尗
+            goodsInfo.setPriceName("澶╃尗浠�");
+        } else {
+            goodsInfo.setShopType(goods.getShopType());
+        }
 
-		Integer goodsType = goods.getGoodsType();
-		if (goodsType == null) {
-			goodsType = Constant.SOURCE_TYPE_TAOBAO;
-		}
+        Integer goodsType = goods.getGoodsType();
+        if (goodsType == null) {
+            goodsType = Constant.SOURCE_TYPE_TAOBAO;
+        }
 
-		GoodsOtherInfoDTO otherDTO = null;
-		String otherInfo = goods.getOtherInfo();
-		if (!StringUtil.isNullOrEmpty(otherInfo)) {
-			JSONObject json = JSONObject.fromObject(otherInfo);
-			otherDTO = (GoodsOtherInfoDTO) JSONObject.toBean(json, GoodsOtherInfoDTO.class);
-		}
+        GoodsOtherInfoDTO otherDTO = null;
+        String otherInfo = goods.getOtherInfo();
+        if (!StringUtil.isNullOrEmpty(otherInfo)) {
+            JSONObject json = JSONObject.fromObject(otherInfo);
+            otherDTO = (GoodsOtherInfoDTO) JSONObject.toBean(json, GoodsOtherInfoDTO.class);
+        }
 
-		if (goodsType == Constant.SOURCE_TYPE_JD) {
-			// 鏈堥攢閲�
-			goodsInfo.setSalesType(1);
+        if (goodsType == Constant.SOURCE_TYPE_JD) {
+            // 鏈堥攢閲�
+            goodsInfo.setSalesType(1);
 
-			Integer isFreeShipping = otherDTO.getIsFreeShipping();
-			if (isFreeShipping != null && isFreeShipping == 1) {
-				goodsInfo.setBaoyou(true);
-			}
+            Integer isFreeShipping = otherDTO.getIsFreeShipping();
+            if (isFreeShipping != null && isFreeShipping == 1) {
+                goodsInfo.setBaoyou(true);
+            }
 
-			List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-			// 鑷惀
-			String owner = otherDTO.getOwner();
-			if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
-				if (labels == null) {
-					labels = new ArrayList<ClientTextStyleVO>();
-				}
-				ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
-				textStyleVO.setContent("浜笢鑷惀");
-				textStyleVO.setColor("#E42219");
-				labels.add(textStyleVO);
-			}
-			// 鎷煎洟浠�
-			JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
-			if (pinGouInfo != null) {
-				goods.setPrice(pinGouInfo.getPingouPrice());
-				goodsInfo.setPriceName("鎷艰喘浠�");
+            List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+            // 鑷惀
+            String owner = otherDTO.getOwner();
+            if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+                if (labels == null) {
+                    labels = new ArrayList<ClientTextStyleVO>();
+                }
+                ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+                textStyleVO.setContent("浜笢鑷惀");
+                textStyleVO.setColor("#E42219");
+                labels.add(textStyleVO);
+            }
+            // 鎷煎洟浠�
+            JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
+            if (pinGouInfo != null) {
+                goods.setPrice(pinGouInfo.getPingouPrice());
+                goodsInfo.setPriceName("鎷艰喘浠�");
 
-				if (labels == null) {
-					labels = new ArrayList<ClientTextStyleVO>();
-				}
-				ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
-				textStyleVO.setContent("鎷艰喘");
-				textStyleVO.setColor("#E42219");
-				labels.add(textStyleVO);
-			} else {
-				goodsInfo.setPriceName("浜笢浠�");
-			}
-			goodsInfo.setLabels(labels);
-		} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
-			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 (labels == null) {
+                    labels = new ArrayList<ClientTextStyleVO>();
+                }
+                ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+                textStyleVO.setContent("鎷艰喘");
+                textStyleVO.setColor("#E42219");
+                labels.add(textStyleVO);
+            } else {
+                goodsInfo.setPriceName("浜笢浠�");
+            }
+            goodsInfo.setLabels(labels);
+        } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+            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());
-		}
+        if (goodsType == Constant.SOURCE_TYPE_VIP) {
+            goodsInfo.setDiscount(goods.getCouponInfo());
+            goodsInfo.setPriceName("鎶樺悗浠�");
+            goodsInfo.setCouponPrice(goods.getCouponStartPrice());
+        }
 
-		goodsInfo.setGoodsType(goodsType);
-		goodsInfo.setZkPrice(goods.getPrice());
-		Integer state = goods.getState();
-		if (state == null) {
-			goodsInfo.setState(0);
-		} else {
-			goodsInfo.setState(goods.getState());
-		}
-		goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));
+        goodsInfo.setGoodsType(goodsType);
+        goodsInfo.setZkPrice(goods.getPrice());
+        Integer state = goods.getState();
+        if (state == null) {
+            goodsInfo.setState(0);
+        } else {
+            goodsInfo.setState(goods.getState());
+        }
+        goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));
 
-		if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
-			// 浣跨敤鐧藉簳鍥�
-			if (!StringUtil.isNullOrEmpty(goods.getPictureWhite())) {
-				goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictureWhite()));
-			} else {
-				goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPicture()));
-			}
-		} else {
-			goodsInfo.setPicUrl(goods.getPicture());
-		}
+        if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+            // 浣跨敤鐧藉簳鍥�
+            if (!StringUtil.isNullOrEmpty(goods.getPictureWhite())) {
+                goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictureWhite()));
+            } else {
+                goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPicture()));
+            }
+        } else {
+            goodsInfo.setPicUrl(goods.getPicture());
+        }
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
+        // 璧勯噾淇℃伅
+        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
+        moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
 
-		BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());
-		moneyInfoVO.setFanliMoney("楼" + commission);
+        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("楼" + maxCommission);
+        BigDecimal maxCommission = CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate());
+        if (params.getMaxRewardRate() != null)
+            moneyInfoVO
+                    .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+        else
+            moneyInfoVO.setMaxMoney("楼" + maxCommission);
 
-		moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));
+        moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));
 
-		moneyInfoVO.setRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),
-				CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
+        moneyInfoVO.setRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),
+                CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
 
-		moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),
-				CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
+        moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),
+                CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
 
-		goodsInfo.setMoneyInfo(moneyInfoVO);
+        goodsInfo.setMoneyInfo(moneyInfoVO);
 
-		// 鍒镐俊鎭�
-		if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
-			// 璁$畻鍒稿悗浠�
-			BigDecimal sub = goods.getPrice().subtract(goods.getCouponStartPrice());
-			if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
-				BigDecimal quanPrice = MoneyBigDecimalUtil.sub(goods.getPrice(), goods.getCouponAmount());
-				goodsInfo.setCouponPrice(quanPrice);
-			} else {
-				goodsInfo.setCouponPrice(goods.getPrice());
-			}
+        // 鍒镐俊鎭�
+        if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
+            // 璁$畻鍒稿悗浠�
+            BigDecimal sub = goods.getPrice().subtract(goods.getCouponStartPrice());
+            if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
+                BigDecimal quanPrice = MoneyBigDecimalUtil.sub(goods.getPrice(), goods.getCouponAmount());
+                goodsInfo.setCouponPrice(quanPrice);
+            } else {
+                goodsInfo.setCouponPrice(goods.getPrice());
+            }
 
-			CouponInfoVO coupon = new CouponInfoVO();
-			coupon.setAmount(goods.getCouponAmount());
-			coupon.setLeftCount(goods.getCouponLeftCount());
-			coupon.setTotalCount(goods.getCouponTotalCount());
-			coupon.setStartFee(goods.getCouponStartPrice());
-			goodsInfo.setHasCoupon(true);
-			goodsInfo.setCouponInfo(coupon);
-		}
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(goods.getCouponAmount());
+            coupon.setLeftCount(goods.getCouponLeftCount());
+            coupon.setTotalCount(goods.getCouponTotalCount());
+            coupon.setStartFee(goods.getCouponStartPrice());
+            goodsInfo.setHasCoupon(true);
+            goodsInfo.setCouponInfo(coupon);
+        }
 
-		// 搴楅摵淇℃伅
-		if (!StringUtil.isNullOrEmpty(goods.getSellerName())) {
-			ShopInfoVO shop = new ShopInfoVO();
-			shop.setShopName(goods.getSellerName());
+        // 搴楅摵淇℃伅
+        if (!StringUtil.isNullOrEmpty(goods.getSellerName())) {
+            ShopInfoVO shop = new ShopInfoVO();
+            shop.setShopName(goods.getSellerName());
 
-			if (goods.getSellerId() != null)
-				shop.setId(goods.getSellerId().toString());
+            if (goods.getSellerId() != null)
+                shop.setId(goods.getSellerId().toString());
 
-			if (shopType == null || shopType == 0) {
-				shop.setUserType(10);
-			} else if (shopType == 1) {
-				shop.setUserType(11);
-			} else {
-				shop.setUserType(goods.getShopType());
-			}
+            if (shopType == null || shopType == 0) {
+                shop.setUserType(10);
+            } else if (shopType == 1) {
+                shop.setUserType(11);
+            } else {
+                shop.setUserType(goods.getShopType());
+            }
 
-			goodsInfo.setShopInfo(shop);
-		}
+            goodsInfo.setShopInfo(shop);
+        }
 
-		if (goodsType == Constant.SOURCE_TYPE_VIP) {
-			goodsInfo.setShopInfo(null);
-		}
+        if (goodsType == Constant.SOURCE_TYPE_VIP) {
+            goodsInfo.setShopInfo(null);
+        }
 
-		// if (Constant.IS_TEST) {
-		// // 娣诲姞鏍囩
-		// List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-		// if (labels == null)
-		// labels = new ArrayList<>();
-		//
-		// labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
-		// goodsInfo.setLabels(labels);
-		// }
+        // if (Constant.IS_TEST) {
+        // // 娣诲姞鏍囩
+        // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+        // if (labels == null)
+        // labels = new ArrayList<>();
+        //
+        // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+        // goodsInfo.setLabels(labels);
+        // }
 
-		return goodsInfo;
-	}
+        return goodsInfo;
+    }
 
-	/**
-	 * 娣樺疂鍟嗗搧缁勭粐
-	 * 
-	 * @param goods
-	 *            娣樺疂鍟嗗搧
-	 * @param pid
-	 * @param fanLiRate
-	 *            杩斿埄姣斾緥
-	 * @return
-	 */
-	public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, ConfigParamsDTO params) {
-		GoodsDetailVO goodsInfo = new GoodsDetailVO();
-		goodsInfo.setBaoyou(true);
-		goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-		goodsInfo.setGoodsId(goods.getAuctionId() + "");
-		goodsInfo.setTitle(goods.getTitle());
-		goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
-		goodsInfo.setZkPrice(goods.getZkPrice());
-		goodsInfo.setImgList(goods.getImgList());
-		goodsInfo.setState(goods.getState() == null ? 0 : goods.getState());
-		goodsInfo.setSalesCount(goods.getSalesCount());
-		goodsInfo.setPicUrl(goods.getPictUrl());
-		goodsInfo.setDescription(goods.getDescription());
+    /**
+     * 娣樺疂鍟嗗搧缁勭粐
+     *
+     * @param goods     娣樺疂鍟嗗搧
+     * @param pid
+     * @param fanLiRate 杩斿埄姣斾緥
+     * @return
+     */
+    public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, ConfigParamsDTO params) {
+        GoodsDetailVO goodsInfo = new GoodsDetailVO();
+        goodsInfo.setBaoyou(true);
+        goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+        goodsInfo.setGoodsId(goods.getAuctionId() + "");
+        goodsInfo.setTitle(goods.getTitle());
+        goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
+        goodsInfo.setZkPrice(goods.getZkPrice());
+        goodsInfo.setImgList(goods.getImgList());
+        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) {
-			goodsInfo.setShopType(11); // 澶╃尗
-			goodsInfo.setPriceName("澶╃尗浠�");
-		} else {
-			goodsInfo.setShopType(10); // 娣樺疂
-			goodsInfo.setPriceName("娣樺疂浠�");
-		}
+        Integer shopType = goods.getUserType();
+        if (shopType != null && shopType == 1) {
+            goodsInfo.setShopType(11); // 澶╃尗
+            goodsInfo.setPriceName("澶╃尗浠�");
+        } else {
+            goodsInfo.setShopType(10); // 娣樺疂
+            goodsInfo.setPriceName("娣樺疂浠�");
+        }
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
+        // 璧勯噾淇℃伅
+        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
+        moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
 
-		if (goods.getTkRate() == null) {
-			TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
-			moneyInfoVO.setFanliMoney("楼" + taoBaoHongBaoInfo.getHongbao());
-			moneyInfoVO.setShareMoney("楼" + taoBaoHongBaoInfo.getHongbao());
-			if (params.getMaxRewardRate() != null)
-				moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
-						.add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
-			else
-				moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(), false));
-		} else {
-			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));
-		}
-		goodsInfo.setMoneyInfo(moneyInfoVO);
+        if (goods.getTkRate() == null) {
+            TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
+            moneyInfoVO.setFanliMoney("楼" + taoBaoHongBaoInfo.getHongbao());
+            moneyInfoVO.setShareMoney("楼" + taoBaoHongBaoInfo.getHongbao());
+            if (params.getMaxRewardRate() != null)
+                moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
+                        .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
+            else
+                moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(), false));
+        } else {
+            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));
+        }
+        goodsInfo.setMoneyInfo(moneyInfoVO);
 
-		TaoBaoQuanInfo taoBaoQuanInfo = goods.getTaoBaoQuanInfo();
-		if (taoBaoQuanInfo != null) {
-			goodsInfo.setCouponPrice(taoBaoQuanInfo.getCouponPrice());
-			CouponInfoVO coupon = new CouponInfoVO();
-			coupon.setAmount(taoBaoQuanInfo.getCouponAmount());
-			coupon.setLeftCount(taoBaoQuanInfo.getCouponLeftCount());
-			coupon.setTotalCount(taoBaoQuanInfo.getCouponTotalCount());
+        TaoBaoQuanInfo taoBaoQuanInfo = goods.getTaoBaoQuanInfo();
+        if (taoBaoQuanInfo != null) {
+            goodsInfo.setCouponPrice(taoBaoQuanInfo.getCouponPrice());
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(taoBaoQuanInfo.getCouponAmount());
+            coupon.setLeftCount(taoBaoQuanInfo.getCouponLeftCount());
+            coupon.setTotalCount(taoBaoQuanInfo.getCouponTotalCount());
 
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
-			String couponEffectiveEndTime = taoBaoQuanInfo.getCouponEffectiveEndTime();
-			String couponEffectiveStartTime = taoBaoQuanInfo.getCouponEffectiveStartTime();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+            String couponEffectiveEndTime = taoBaoQuanInfo.getCouponEffectiveEndTime();
+            String couponEffectiveStartTime = taoBaoQuanInfo.getCouponEffectiveStartTime();
 
-			coupon.setEndTime(sdf.format(new Date(Long.parseLong(couponEffectiveEndTime))));
-			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);
-		}
+            coupon.setEndTime(sdf.format(new Date(Long.parseLong(couponEffectiveEndTime))));
+            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);
+        }
 
-		// 搴楅摵淇℃伅
-		String shopTitle = goods.getShopTitle();
+        // 搴楅摵淇℃伅
+        String shopTitle = goods.getShopTitle();
 
-		if (!StringUtil.isNullOrEmpty(shopTitle)) {
-			ShopInfoVO shop = new ShopInfoVO();
-			shop.setShopName(shopTitle);
+        if (!StringUtil.isNullOrEmpty(shopTitle)) {
+            ShopInfoVO shop = new ShopInfoVO();
+            shop.setShopName(shopTitle);
 
-			Long sellerId = goods.getSellerId();
-			if (sellerId != null)
-				shop.setId(goods.getSellerId().toString());
+            Long sellerId = goods.getSellerId();
+            if (sellerId != null)
+                shop.setId(goods.getSellerId().toString());
 
-			if (shopType != null && shopType == 1) {
-				shop.setUserType(11);
-			} else {
-				shop.setUserType(10);
-			}
-			goodsInfo.setShopInfo(shop);
-		}
+            if (shopType != null && shopType == 1) {
+                shop.setUserType(11);
+            } else {
+                shop.setUserType(10);
+            }
+            goodsInfo.setShopInfo(shop);
+        }
 
-		// if (Constant.IS_TEST) {
-		// // 娣诲姞鏍囩
-		// List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-		// if (labels == null)
-		// labels = new ArrayList<>();
-		//
-		// labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
-		// goodsInfo.setLabels(labels);
-		// }
+        // if (Constant.IS_TEST) {
+        // // 娣诲姞鏍囩
+        // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+        // if (labels == null)
+        // labels = new ArrayList<>();
+        //
+        // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+        // goodsInfo.setLabels(labels);
+        // }
 
-		return goodsInfo;
-	}
+        return goodsInfo;
+    }
 
-	/**
-	 * 娣樺疂鍟嗗搧缁勭粐
-	 * 
-	 * @param goods
-	 *            娣樺疂鍟嗗搧
-	 * @param pid
-	 * @param fanLiRate
-	 *            杩斿埄姣斾緥
-	 * @return
-	 */
-	public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, ConfigParamsDTO params) {
-		GoodsDetailVO goodsInfo = new GoodsDetailVO();
-		goodsInfo.setBaoyou(true);
-		goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-		goodsInfo.setGoodsId(goods.getAuctionId() + "");
-		goodsInfo.setTitle(goods.getTitle());
-		goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
-		goodsInfo.setZkPrice(goods.getZkPrice());
-		goodsInfo.setDescription(goods.getDescription());
+    /**
+     * 娣樺疂鍟嗗搧缁勭粐
+     *
+     * @param goods     娣樺疂鍟嗗搧
+     * @param pid
+     * @param fanLiRate 杩斿埄姣斾緥
+     * @return
+     */
+    public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, ConfigParamsDTO params) {
+        GoodsDetailVO goodsInfo = new GoodsDetailVO();
+        goodsInfo.setBaoyou(true);
+        goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+        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)) {
-			String[] arr = provcity.split("\\s+");
-			goodsInfo.setProvcity(arr[arr.length - 1]);
-		}
+        String provcity = goods.getProvcity();
+        if (!StringUtil.isNullOrEmpty(provcity)) {
+            String[] arr = provcity.split("\\s+");
+            goodsInfo.setProvcity(arr[arr.length - 1]);
+        }
 
-		List<String> imgList = goods.getImgList();
-		if (imgList != null) {
-			goodsInfo.setImgList(imgList);
-		} else {
-			imgList = new ArrayList<String>();
-			imgList.add(goods.getPictUrl());
-			goodsInfo.setImgList(imgList);
-		}
+        List<String> imgList = goods.getImgList();
+        if (imgList != null) {
+            goodsInfo.setImgList(imgList);
+        } else {
+            imgList = new ArrayList<String>();
+            imgList.add(goods.getPictUrl());
+            goodsInfo.setImgList(imgList);
+        }
 
-		Integer state = goods.getState();
-		if (state == null) {
-			goodsInfo.setState(0);
-		} else {
-			goodsInfo.setState(state);
-		}
+        Integer state = goods.getState();
+        if (state == null) {
+            goodsInfo.setState(0);
+        } else {
+            goodsInfo.setState(state);
+        }
 
-		goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getBiz30day()));
+        goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getBiz30day()));
 
-		// 鐧藉簳鍥惧彲鑳芥湁閿欒
-		// https://img.alicdn.com/bao/uploaded/TB1LVqmVZbpK1RjSZFyXXX_qFXa.png
-		if (!StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
-			goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrlWhite()));
-		} else {
-			goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrl()));
-		}
+        // 鐧藉簳鍥惧彲鑳芥湁閿欒
+        // https://img.alicdn.com/bao/uploaded/TB1LVqmVZbpK1RjSZFyXXX_qFXa.png
+        if (!StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
+            goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrlWhite()));
+        } else {
+            goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrl()));
+        }
 
-		Integer shopType = goods.getUserType();
-		if (shopType != null && shopType == 1) {
-			goodsInfo.setShopType(11); // 澶╃尗
-			goodsInfo.setPriceName("澶╃尗浠�");
-		} else {
-			goodsInfo.setShopType(10); // 娣樺疂
-			goodsInfo.setPriceName("娣樺疂浠�");
-		}
+        Integer shopType = goods.getUserType();
+        if (shopType != null && shopType == 1) {
+            goodsInfo.setShopType(11); // 澶╃尗
+            goodsInfo.setPriceName("澶╃尗浠�");
+        } else {
+            goodsInfo.setShopType(10); // 娣樺疂
+            goodsInfo.setPriceName("娣樺疂浠�");
+        }
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
+        // 璧勯噾淇℃伅
+        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
+        moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
 
 
+        BigDecimal buyCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(), false);
 
-		BigDecimal buyCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(), false);
+        BigDecimal baseCommisstion = null;
+        if (params.getBaseFanliRate() != null)
+            baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(), false);
+        moneyInfoVO.setFanliMoney("楼" + buyCommission);
+        if (params.getMaxRewardRate() != null)
+            moneyInfoVO
+                    .setMaxMoney("楼" + buyCommission.add(MoneyBigDecimalUtil.mul(buyCommission, params.getMaxRewardRate())));
+        else {// 鍙湁鏈塚IP鍚庣殑鐗堟湰鎵嶄細鏄剧ず杩斿埄姣�
 
-		BigDecimal baseCommisstion = null;
-		if (params.getBaseFanliRate() != null)
-			baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(), false);
-		moneyInfoVO.setFanliMoney("楼" + buyCommission);
-		if (params.getMaxRewardRate() != null)
-			moneyInfoVO
-					.setMaxMoney("楼" + buyCommission.add(MoneyBigDecimalUtil.mul(buyCommission, params.getMaxRewardRate())));
-		else {// 鍙湁鏈塚IP鍚庣殑鐗堟湰鎵嶄細鏄剧ず杩斿埄姣�
+            BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);
+            BigDecimal rate = MoneyBigDecimalUtil.div(buyCommission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
 
-			BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);
-			BigDecimal rate = MoneyBigDecimalUtil.div(buyCommission.multiply(new BigDecimal(100)), price);
-			moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+            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(),
+                        buyCommission.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);
+            }
+        }
 
-			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(),
-						buyCommission.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(), true));
 
-		moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(), true));
+        goodsInfo.setMoneyInfo(moneyInfoVO);
 
-		goodsInfo.setMoneyInfo(moneyInfoVO);
+        // 鍒镐俊鎭�
+        if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
+            // 璁$畻鍒稿悗浠�
+            BigDecimal sub = goods.getZkPrice().subtract(goods.getCouponStartFee());
+            if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
+                BigDecimal quanPrice = MoneyBigDecimalUtil.sub(goods.getZkPrice(), goods.getCouponAmount());
+                goodsInfo.setCouponPrice(quanPrice);
+            } else {
+                goodsInfo.setCouponPrice(goods.getZkPrice());
+            }
 
-		// 鍒镐俊鎭�
-		if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
-			// 璁$畻鍒稿悗浠�
-			BigDecimal sub = goods.getZkPrice().subtract(goods.getCouponStartFee());
-			if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
-				BigDecimal quanPrice = MoneyBigDecimalUtil.sub(goods.getZkPrice(), goods.getCouponAmount());
-				goodsInfo.setCouponPrice(quanPrice);
-			} else {
-				goodsInfo.setCouponPrice(goods.getZkPrice());
-			}
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(goods.getCouponAmount());
+            coupon.setLeftCount(goods.getCouponLeftCount());
+            coupon.setTotalCount(goods.getCouponTotalCount());
+            if (goods.getCouponEffectiveEndTime() != null) {
+                coupon.setEndTime(goods.getCouponEffectiveEndTime().replace("-", "."));
+            }
 
-			CouponInfoVO coupon = new CouponInfoVO();
-			coupon.setAmount(goods.getCouponAmount());
-			coupon.setLeftCount(goods.getCouponLeftCount());
-			coupon.setTotalCount(goods.getCouponTotalCount());
-			if (goods.getCouponEffectiveEndTime() != null) {
-				coupon.setEndTime(goods.getCouponEffectiveEndTime().replace("-", "."));
-			}
+            if (goods.getCouponEffectiveStartTime() != null) {
+                coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));
+            }
 
-			if (goods.getCouponEffectiveStartTime() != null) {
-				coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));
-			}
+            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);
+        }
 
-			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);
-		}
+        // 搴楅摵淇℃伅
+        if (!StringUtil.isNullOrEmpty(goods.getShopTitle())) {
+            ShopInfoVO shop = new ShopInfoVO();
+            shop.setShopName(goods.getShopTitle());
 
-		// 搴楅摵淇℃伅
-		if (!StringUtil.isNullOrEmpty(goods.getShopTitle())) {
-			ShopInfoVO shop = new ShopInfoVO();
-			shop.setShopName(goods.getShopTitle());
+            if (goods.getSellerId() != null)
+                shop.setId(goods.getSellerId().toString());
 
-			if (goods.getSellerId() != null)
-				shop.setId(goods.getSellerId().toString());
+            if (shopType != null && shopType == 1) {
+                shop.setUserType(11);
+            } else {
+                shop.setUserType(10);
+            }
 
-			if (shopType != null && shopType == 1) {
-				shop.setUserType(11);
-			} else {
-				shop.setUserType(10);
-			}
+            goodsInfo.setShopInfo(shop);
+        }
 
-			goodsInfo.setShopInfo(shop);
-		}
+        if (TaoBaoUtil.isYUShou(goods)) {// 棰勫敭鍟嗗搧
+            goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());
+        }
 
-		if (TaoBaoUtil.isYUShou(goods)) {// 棰勫敭鍟嗗搧
-			goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());
-		}
+        if (Constant.IS_TEST) {
+            // 娣诲姞鏍囩
+            List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+            if (labels == null)
+                labels = new ArrayList<>();
 
-		if (Constant.IS_TEST) {
-			// 娣诲姞鏍囩
-			List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-			if (labels == null)
-				labels = new ArrayList<>();
+            labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+            labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+            labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+            goodsInfo.setLabels(labels);
+        }
 
-			labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-			labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
-			labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
-			goodsInfo.setLabels(labels);
-		}
+        return goodsInfo;
+    }
 
-		return goodsInfo;
-	}
+    private static GoodsDetailVO loadYuShouInfo(GoodsDetailVO goodsInfo, TaoBaoGoodsBrief goods, String pid,
+                                                BigDecimal fanLiRate, BigDecimal shareRate) {
 
-	private static GoodsDetailVO loadYuShouInfo(GoodsDetailVO goodsInfo, TaoBaoGoodsBrief goods, String pid,
-			BigDecimal fanLiRate, BigDecimal shareRate) {
+        if (goodsInfo != null && goods != null) {
+            // 娣诲姞鏍囩
+            if (goodsInfo.getLabels() == null)
+                goodsInfo.setLabels(new ArrayList<>());
+            goodsInfo.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+        }
+        return goodsInfo;
+    }
 
-		if (goodsInfo != null && goods != null) {
-			// 娣诲姞鏍囩
-			if (goodsInfo.getLabels() == null)
-				goodsInfo.setLabels(new ArrayList<>());
-			goodsInfo.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-		}
-		return goodsInfo;
-	}
+    private static CouponInfoVO convertJDCouponInfo(JDCouponInfo couponInfo) {
+        CouponInfoVO coupon = new CouponInfoVO();
+        coupon.setAmount(couponInfo.getDiscount());
+        coupon.setLink(couponInfo.getLink());
+        coupon.setStartFee(couponInfo.getQuota());
 
-	private static CouponInfoVO convertJDCouponInfo(JDCouponInfo couponInfo) {
-		CouponInfoVO coupon = new CouponInfoVO();
-		coupon.setAmount(couponInfo.getDiscount());
-		coupon.setLink(couponInfo.getLink());
-		coupon.setStartFee(couponInfo.getQuota());
+        if (couponInfo.getGetStartTime() != null) {
+            coupon.setStartTime(TimeUtil.getGernalTime(couponInfo.getGetStartTime(), "yyyy.MM.dd"));
+        }
 
-		if (couponInfo.getGetStartTime() != null) {
-			coupon.setStartTime(TimeUtil.getGernalTime(couponInfo.getGetStartTime(), "yyyy.MM.dd"));
-		}
+        if (couponInfo.getGetEndTime() != null) {
+            coupon.setEndTime(TimeUtil.getGernalTime(couponInfo.getGetEndTime(), "yyyy.MM.dd"));
+        }
 
-		if (couponInfo.getGetEndTime() != null) {
-			coupon.setEndTime(TimeUtil.getGernalTime(couponInfo.getGetEndTime(), "yyyy.MM.dd"));
-		}
+        return coupon;
+    }
 
-		return coupon;
-	}
+    private static List<CouponInfoVO> filterCouponInfo(List<CouponInfoVO> couponList) {
+        if (couponList == null)
+            return null;
+        long currentTime = System.currentTimeMillis();
+        Set<String> sets = new HashSet<>();
+        // 杩囨护鎺夎繃鏈熷埜
+        for (int i = 0; i < couponList.size(); i++) {
+            if (couponList.get(i).getStartTime() != null && couponList.get(i).getEndTime() != null) {
+                long startTime = TimeUtil.convertToTimeTemp(couponList.get(i).getStartTime(), "yyyy.MM.dd");
+                long endTime = TimeUtil.convertToTimeTemp(couponList.get(i).getEndTime(), "yyyy.MM.dd")
+                        + 1000 * 60 * 60 * 24L;
+                if (currentTime < startTime || currentTime >= endTime) {
+                    couponList.remove(i--);
+                    continue;
+                }
+            }
+            // 杩囨护鎺夐潰鍊肩浉鍚屼笌璧峰閲戦鐩稿悓鐨�
+            String key = couponList.get(i).getStartFee() + "-" + couponList.get(i).getAmount();
+            if (!sets.contains(key))
+                sets.add(key);
+            else {
+                couponList.remove(i--);
+                continue;
+            }
+        }
+        return couponList;
+    }
 
-	private static List<CouponInfoVO> filterCouponInfo(List<CouponInfoVO> couponList) {
-		if (couponList == null)
-			return null;
-		long currentTime = System.currentTimeMillis();
-		Set<String> sets = new HashSet<>();
-		// 杩囨护鎺夎繃鏈熷埜
-		for (int i = 0; i < couponList.size(); i++) {
-			if (couponList.get(i).getStartTime() != null && couponList.get(i).getEndTime() != null) {
-				long startTime = TimeUtil.convertToTimeTemp(couponList.get(i).getStartTime(), "yyyy.MM.dd");
-				long endTime = TimeUtil.convertToTimeTemp(couponList.get(i).getEndTime(), "yyyy.MM.dd")
-						+ 1000 * 60 * 60 * 24L;
-				if (currentTime < startTime || currentTime >= endTime) {
-					couponList.remove(i--);
-					continue;
-				}
-			}
-			// 杩囨护鎺夐潰鍊肩浉鍚屼笌璧峰閲戦鐩稿悓鐨�
-			String key = couponList.get(i).getStartFee() + "-" + couponList.get(i).getAmount();
-			if (!sets.contains(key))
-				sets.add(key);
-			else {
-				couponList.remove(i--);
-				continue;
-			}
-		}
-		return couponList;
-	}
+    /**
+     * 娣樺疂鍟嗗搧缁勭粐
+     *
+     * @param goods     娣樺疂鍟嗗搧
+     * @param pid
+     * @param fanLiRate 杩斿埄姣斾緥
+     * @return
+     */
+    public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {
+        GoodsDetailVO goodsInfo = new GoodsDetailVO();
+        goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);
+        goodsInfo.setGoodsId(goods.getSkuId() + "");
+        goodsInfo.setTitle(goods.getSkuName());
+        goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
+        goodsInfo.setPicUrl(goods.getPicUrl());
+        goodsInfo.setImgList(goods.getImageList());
+        goodsInfo.setState(0);
 
-	/**
-	 * 娣樺疂鍟嗗搧缁勭粐
-	 * 
-	 * @param goods
-	 *            娣樺疂鍟嗗搧
-	 * @param pid
-	 * @param fanLiRate
-	 *            杩斿埄姣斾緥
-	 * @return
-	 */
-	public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {
-		GoodsDetailVO goodsInfo = new GoodsDetailVO();
-		goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);
-		goodsInfo.setGoodsId(goods.getSkuId() + "");
-		goodsInfo.setTitle(goods.getSkuName());
-		goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
-		goodsInfo.setPicUrl(goods.getPicUrl());
-		goodsInfo.setImgList(goods.getImageList());
-		goodsInfo.setState(0);
+        String salesCountMidea = null;
+        Long count = goods.getInOrderCount30Days();
+        if (count < 10000) {
+            salesCountMidea = count + "";
+        } else {
+            double sales = count;
+            salesCountMidea = String.format("%.1f", sales / 10000);
+            salesCountMidea = salesCountMidea + "涓�";
+        }
+        goodsInfo.setSalesCount(salesCountMidea);
 
-		String salesCountMidea = null;
-		Long count = goods.getInOrderCount30Days();
-		if (count < 10000) {
-			salesCountMidea = count + "";
-		} else {
-			double sales = count;
-			salesCountMidea = String.format("%.1f", sales / 10000);
-			salesCountMidea = salesCountMidea + "涓�";
-		}
-		goodsInfo.setSalesCount(salesCountMidea);
+        // 璧勯噾淇℃伅
+        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
+        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());
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		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())));
+        else {
+            BigDecimal price = JDUtil.getQuanPrice(goods);
+            BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
 
-		if (params.getMaxRewardRate() != null)
-			moneyInfoVO
-					.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
-		else {
-			BigDecimal price = JDUtil.getQuanPrice(goods);
-			BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
-			moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+            BigDecimal maxCommission = JDUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+            BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
+            moneyInfoVO.setMaxMoney("楼" + maxCommission);
 
-			BigDecimal maxCommission = JDUtil.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);
+            }
+        }
+        moneyInfoVO.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));
+        goodsInfo.setMoneyInfo(moneyInfoVO);
 
-			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);
+        JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
+        if (couponInfo != null) {
+            BigDecimal discount = couponInfo.getDiscount();
+            // 璁$畻鍒稿悗浠�
+            goodsInfo.setCouponPrice(JDUtil.getQuanPrice(goods));
 
-		JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
-		if (couponInfo != null) {
-			BigDecimal discount = couponInfo.getDiscount();
-			// 璁$畻鍒稿悗浠�
-			goodsInfo.setCouponPrice(JDUtil.getQuanPrice(goods));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(discount);
+            coupon.setLink(couponInfo.getLink());
+            coupon.setStartFee(couponInfo.getQuota());
 
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
-			CouponInfoVO coupon = new CouponInfoVO();
-			coupon.setAmount(discount);
-			coupon.setLink(couponInfo.getLink());
-			coupon.setStartFee(couponInfo.getQuota());
+            if (couponInfo.getGetStartTime() != null) {
+                coupon.setStartTime(sdf.format(new Date(couponInfo.getGetStartTime())));
+            }
 
-			if (couponInfo.getGetStartTime() != null) {
-				coupon.setStartTime(sdf.format(new Date(couponInfo.getGetStartTime())));
-			}
+            if (couponInfo.getGetEndTime() != null) {
+                coupon.setEndTime(sdf.format(new Date(couponInfo.getGetEndTime())));
+            }
 
-			if (couponInfo.getGetEndTime() != null) {
-				coupon.setEndTime(sdf.format(new Date(couponInfo.getGetEndTime())));
-			}
+            goodsInfo.setHasCoupon(true);
+            goodsInfo.setCouponInfo(coupon);
+        }
 
-			goodsInfo.setHasCoupon(true);
-			goodsInfo.setCouponInfo(coupon);
-		}
+        if (goods.getCouponInfoList() != null && goods.getCouponInfoList().size() > 0) {
+            List<CouponInfoVO> couponList = new ArrayList<>();
+            for (JDCouponInfo jdCoupon : goods.getCouponInfoList()) {
+                couponList.add(convertJDCouponInfo(jdCoupon));
+            }
+            goodsInfo.setCouponInfoList(filterCouponInfo(couponList));
+        }
 
-		if (goods.getCouponInfoList() != null && goods.getCouponInfoList().size() > 0) {
-			List<CouponInfoVO> couponList = new ArrayList<>();
-			for (JDCouponInfo jdCoupon : goods.getCouponInfoList()) {
-				couponList.add(convertJDCouponInfo(jdCoupon));
-			}
-			goodsInfo.setCouponInfoList(filterCouponInfo(couponList));
-		}
+        List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+        // 浜笢鑷惀鏍囩
+        String owner = goods.getOwner();
+        if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+            goodsInfo.setShopType(21); // 浜笢鑷惀
+            if (labels == null) {
+                labels = new ArrayList<ClientTextStyleVO>();
+            }
+            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+            textStyleVO.setContent("浜笢鑷惀");
+            textStyleVO.setColor("#E42219");
+            labels.add(textStyleVO);
+        } else {
+            goodsInfo.setShopType(20); // 浜笢
+        }
 
-		List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-		// 浜笢鑷惀鏍囩
-		String owner = goods.getOwner();
-		if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
-			goodsInfo.setShopType(21); // 浜笢鑷惀
-			if (labels == null) {
-				labels = new ArrayList<ClientTextStyleVO>();
-			}
-			ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
-			textStyleVO.setContent("浜笢鑷惀");
-			textStyleVO.setColor("#E42219");
-			labels.add(textStyleVO);
-		} else {
-			goodsInfo.setShopType(20); // 浜笢
-		}
+        JDPingouInfo pinGouInfo = goods.getPinGouInfo();
+        if (pinGouInfo != null) {
+            goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());
+            goodsInfo.setPriceName("鎷艰喘浠�");
 
-		JDPingouInfo pinGouInfo = goods.getPinGouInfo();
-		if (pinGouInfo != null) {
-			goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());
-			goodsInfo.setPriceName("鎷艰喘浠�");
+            if (labels == null) {
+                labels = new ArrayList<ClientTextStyleVO>();
+            }
+            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+            textStyleVO.setContent("鎷艰喘");
+            textStyleVO.setColor("#E42219");
+            labels.add(textStyleVO);
+        } else {
+            goodsInfo.setZkPrice(goods.getPrice());
+            goodsInfo.setPriceName("浜笢浠�");
+        }
+        goodsInfo.setLabels(labels);
 
-			if (labels == null) {
-				labels = new ArrayList<ClientTextStyleVO>();
-			}
-			ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
-			textStyleVO.setContent("鎷艰喘");
-			textStyleVO.setColor("#E42219");
-			labels.add(textStyleVO);
-		} else {
-			goodsInfo.setZkPrice(goods.getPrice());
-			goodsInfo.setPriceName("浜笢浠�");
-		}
-		goodsInfo.setLabels(labels);
+        // 搴楅摵淇℃伅
+        JDShopInfo shopInfo = goods.getShopInfo();
+        if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {
+            ShopInfoVO shop = new ShopInfoVO();
+            shop.setShopName(shopInfo.getShopName());
+            shop.setId(shopInfo.getShopId().toString());
 
-		// 搴楅摵淇℃伅
-		JDShopInfo shopInfo = goods.getShopInfo();
-		if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {
-			ShopInfoVO shop = new ShopInfoVO();
-			shop.setShopName(shopInfo.getShopName());
-			shop.setId(shopInfo.getShopId().toString());
+            if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+                shop.setUserType(20);
+            } else {
+                shop.setUserType(21);
+            }
+            goodsInfo.setShopInfo(shop);
+        }
 
-			if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
-				shop.setUserType(20);
-			} else {
-				shop.setUserType(21);
-			}
-			goodsInfo.setShopInfo(shop);
-		}
+        // 鏄惁鍖呴偖
+        Integer isFreeShipping = goods.getIsFreeShipping();
+        if (isFreeShipping != null && isFreeShipping == 1) {
+            goodsInfo.setBaoyou(true);
+        }
 
-		// 鏄惁鍖呴偖
-		Integer isFreeShipping = goods.getIsFreeShipping();
-		if (isFreeShipping != null && isFreeShipping == 1) {
-			goodsInfo.setBaoyou(true);
-		}
+        return goodsInfo;
+    }
 
-		return goodsInfo;
-	}
+    /**
+     * 鎷煎澶氬晢鍝�
+     *
+     * @param goods     鎷煎澶氬晢鍝�
+     * @param pid
+     * @param fanLiRate 杩斿埄姣斾緥
+     * @return
+     */
+    public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, ConfigParamsDTO params) {
+        GoodsDetailVO goodsInfo = new GoodsDetailVO();
+        goodsInfo.setBaoyou(true);
+        goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD);
+        goodsInfo.setGoodsId(goods.getGoodsId() + "");
+        goodsInfo.setTitle(goods.getGoodsName());
+        goodsInfo.setSalesType(4); // 鎬婚攢閲�
+        goodsInfo.setPriceName("鎷煎洟浠�");
+        goodsInfo.setPicUrl(goods.getGoodsThumbnailUrl()); // 缂╃暐鍥�
+        goodsInfo.setZkPrice(
+                MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)).setScale(2));
+        goodsInfo.setShopType(30); // 鎷煎澶�
 
-	/**
-	 * 鎷煎澶氬晢鍝�
-	 * 
-	 * @param goods
-	 *            鎷煎澶氬晢鍝�
-	 * @param pid
-	 * @param fanLiRate
-	 *            杩斿埄姣斾緥
-	 * @return
-	 */
-	public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, ConfigParamsDTO params) {
-		GoodsDetailVO goodsInfo = new GoodsDetailVO();
-		goodsInfo.setBaoyou(true);
-		goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD);
-		goodsInfo.setGoodsId(goods.getGoodsId() + "");
-		goodsInfo.setTitle(goods.getGoodsName());
-		goodsInfo.setSalesType(4); // 鎬婚攢閲�
-		goodsInfo.setPriceName("鎷煎洟浠�");
-		goodsInfo.setPicUrl(goods.getGoodsThumbnailUrl()); // 缂╃暐鍥�
-		goodsInfo.setZkPrice(
-				MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)).setScale(2));
-		goodsInfo.setShopType(30); // 鎷煎澶�
+        String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
+        if (goodsGalleryUrls != null) {
+            goodsInfo.setImgList(Arrays.asList(goodsGalleryUrls));
+        }
 
-		String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
-		if (goodsGalleryUrls != null) {
-			goodsInfo.setImgList(Arrays.asList(goodsGalleryUrls));
-		}
+        Integer state = goods.getState();
+        if (state == null) {
+            goodsInfo.setState(0);
+        } else {
+            goodsInfo.setState(goods.getState());
+        }
 
-		Integer state = goods.getState();
-		if (state == null) {
-			goodsInfo.setState(0);
-		} else {
-			goodsInfo.setState(goods.getState());
-		}
+        // 鎬婚攢閲�
+        String salesTip = goods.getSalesTip();
+        if (StringUtil.isNullOrEmpty(salesTip)) {
+            salesTip = "0";
+        }
+        goodsInfo.setSalesCount(salesTip);
 
-		// 鎬婚攢閲�
-		String salesTip = goods.getSalesTip();
-		if (StringUtil.isNullOrEmpty(salesTip)) {
-			salesTip = "0";
-		}
-		goodsInfo.setSalesCount(salesTip);
+        // 璧勯噾淇℃伅
+        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
+        moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
+        BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
+        BigDecimal shareCommission = PinDuoDuoUtil.getGoodsShareMoney(goods, params.getFanLiRate());
+        moneyInfoVO.setFanliMoney("楼" + commission);
+        moneyInfoVO.setShareMoney("楼" + shareCommission);
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		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) {
+            BigDecimal hundred = new BigDecimal(100);
+            BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred).setScale(2);
+            BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred).setScale(2);
+            BigDecimal startFree = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponMinOrderAmount()), hundred)
+                    .setScale(2);
 
-		Boolean hasCoupon = goods.getHasCoupon();
-		if (hasCoupon != null && hasCoupon) {
-			BigDecimal hundred = new BigDecimal(100);
-			BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred).setScale(2);
-			BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred).setScale(2);
-			BigDecimal startFree = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponMinOrderAmount()), hundred)
-					.setScale(2);
+            // 璁$畻鍒稿悗浠�
+            if (startFree.compareTo(price) <= 0) {
+                BigDecimal quanPrice = MoneyBigDecimalUtil.sub(price, amount);
+                goodsInfo.setCouponPrice(quanPrice);
+            } else {
+                goodsInfo.setCouponPrice(price);
+            }
 
-			// 璁$畻鍒稿悗浠�
-			if (startFree.compareTo(price) <= 0) {
-				BigDecimal quanPrice = MoneyBigDecimalUtil.sub(price, amount);
-				goodsInfo.setCouponPrice(quanPrice);
-			} else {
-				goodsInfo.setCouponPrice(price);
-			}
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(amount);
+            coupon.setStartFee(startFree);
 
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
-			CouponInfoVO coupon = new CouponInfoVO();
-			coupon.setAmount(amount);
-			coupon.setStartFee(startFree);
+            if (goods.getCouponStartTime() != null) {
+                coupon.setStartTime(sdf.format(new Date(goods.getCouponStartTime() * 1000)));
+            }
 
-			if (goods.getCouponStartTime() != null) {
-				coupon.setStartTime(sdf.format(new Date(goods.getCouponStartTime() * 1000)));
-			}
+            if (goods.getCouponEndTime() != null) {
+                coupon.setEndTime(sdf.format(new Date(goods.getCouponEndTime() * 1000)));
+            }
 
-			if (goods.getCouponEndTime() != null) {
-				coupon.setEndTime(sdf.format(new Date(goods.getCouponEndTime() * 1000)));
-			}
+            if (goods.getCouponTotalQuantity() != null)
+                coupon.setTotalCount(Integer.parseInt(goods.getCouponTotalQuantity().toString()));
 
-			if (goods.getCouponTotalQuantity() != null)
-				coupon.setTotalCount(Integer.parseInt(goods.getCouponTotalQuantity().toString()));
+            if (goods.getCouponRemainQuantity() != null)
+                coupon.setLeftCount(Integer.parseInt(goods.getCouponRemainQuantity().toString()));
 
-			if (goods.getCouponRemainQuantity() != null)
-				coupon.setLeftCount(Integer.parseInt(goods.getCouponRemainQuantity().toString()));
+            goodsInfo.setHasCoupon(true);
+            goodsInfo.setCouponInfo(coupon);
+        }
 
-			goodsInfo.setHasCoupon(true);
-			goodsInfo.setCouponInfo(coupon);
-		}
+        BigDecimal baseCommisstion = null;
+        if (params.getBaseFanliRate() != null)
+            baseCommisstion = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());
 
-		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())));
+        else {
+            BigDecimal price = goodsInfo.getCouponPrice() != null ? goodsInfo.getCouponPrice() : goodsInfo.getZkPrice();
+            BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
 
-		if (params.getMaxRewardRate() != null)
-			moneyInfoVO
-					.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
-		else {
-			BigDecimal price = goodsInfo.getCouponPrice() != null ? goodsInfo.getCouponPrice() : goodsInfo.getZkPrice();
-			BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
-			moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+            BigDecimal maxCommission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+            BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
 
-			BigDecimal maxCommission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
-			BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
-			moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
+            moneyInfoVO.setMaxMoney("楼" + maxCommission);
 
-			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());
+                if (goods.getPromotionRate() > 0 && (goods.getPredictPromotionRate() != null && goods.getPredictPromotionRate().compareTo(new BigDecimal(0)) == 0)) {
+                    desc = "姣斾环鍟嗗搧鏃犺繑鍒�";
+                    maxDesc = "姣斾环鍟嗗搧鏃犺繑鍒�";
+                }
 
-			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);
+                moneyInfoVO.setCompositionInfo(desc);
+                moneyInfoVO.setMaxCompositionInfo(maxDesc);
+            }
+        }
+        goodsInfo.setMoneyInfo(moneyInfoVO);
 
-		// 搴楅摵淇℃伅
-		String mallName = goods.getMallName();
-		if (!StringUtil.isMobile(mallName)) {
-			ShopInfoVO shop = new ShopInfoVO();
-			shop.setShopName(mallName);
-			if (goods.getMallId() != null) {
-				shop.setId(goods.getMallId().toString());
-			}
-			shop.setUserType(30);
-			goodsInfo.setShopInfo(shop);
-		}
+        // 搴楅摵淇℃伅
+        String mallName = goods.getMallName();
+        if (!StringUtil.isMobile(mallName)) {
+            ShopInfoVO shop = new ShopInfoVO();
+            shop.setShopName(mallName);
+            if (goods.getMallId() != null) {
+                shop.setId(goods.getMallId().toString());
+            }
+            shop.setUserType(30);
+            goodsInfo.setShopInfo(shop);
+        }
 
-		// if (Constant.IS_TEST) {
-		// // 娣诲姞鏍囩
-		// List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-		// if (labels == null)
-		// labels = new ArrayList<>();
-		//
-		// labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
-		// labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
-		// goodsInfo.setLabels(labels);
-		// }
-		return goodsInfo;
-	}
+        // if (Constant.IS_TEST) {
+        // // 娣诲姞鏍囩
+        // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+        // if (labels == null)
+        // labels = new ArrayList<>();
+        //
+        // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+        // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+        // goodsInfo.setLabels(labels);
+        // }
+        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);
+    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());
+        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);
-		}
+        Integer state = goods.getStatus();
+        if (state == null) {
+            goodsInfo.setState(0);
+        } else {
+            goodsInfo.setState(goods.getStatus() == 1 ? CommonGoods.STATE_OFFLINE : CommonGoods.STATE_NORMAL);
+        }
 
-		goodsInfo.setSalesCount("");
+        goodsInfo.setSalesCount("");
 
-		// 璧勯噾淇℃伅
-		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
-		moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
-		BigDecimal commission = VipShopUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
-		moneyInfoVO.setFanliMoney("楼" + commission);
-		moneyInfoVO.setShareMoney("楼" + commission);
+        // 璧勯噾淇℃伅
+        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());
+        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 + "%");
+        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 + "%");
+            BigDecimal maxCommission = VipShopUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+            BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
 
-			moneyInfoVO.setMaxMoney("楼" + maxCommission);
+            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);
+            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);
-		}
+        // 搴楅摵淇℃伅
+        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;
-	}
+        // 鎶樻墸淇℃伅
+        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()); // 缂╃暐鍥�
+    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);
+        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());
-		}
+        List<String> imgList = new ArrayList<>();
+        for (SuningGoodsImg img : goods.getCommodityInfo().getPictureUrl()) {
+            imgList.add(img.getPicUrl());
+        }
 
-		goodsInfo.setImgList(imgList);
-		goodsInfo.setState(0);
+        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);
+        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()));
-			if (StringUtil.isNullOrEmpty(goods.getCouponInfo().getBounsLimit())) {
-				coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getCouponValue()));
-			} else
-				coupon.setStartFee(new BigDecimal(goods.getCouponInfo().getBounsLimit()));
+        // 鍒镐俊鎭�
+        if (goods.getCouponInfo() != null && !StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl())) {// 鏈夊埜
+            CouponInfoVO coupon = new CouponInfoVO();
+            coupon.setAmount(new BigDecimal(goods.getCouponInfo().getCouponValue()));
+            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());
-			}
+            if (goods.getCouponInfo().getCouponStartTime() != null) {
+                coupon.setStartTime(goods.getCouponInfo().getCouponStartTime());
+            }
 
-			if (goods.getCouponInfo().getCouponEndTime() != null) {
-				coupon.setEndTime(goods.getCouponInfo().getCouponEndTime());
-			}
+            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.setTotalCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
 
-			if (goods.getCouponInfo().getCouponCount() != null)
-				coupon.setLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
+            if (goods.getCouponInfo().getCouponCount() != null)
+                coupon.setLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
 
-			goodsInfo.setHasCoupon(true);
-			goodsInfo.setCouponInfo(coupon);
+            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());
-			}
+            if (goodsInfo.getZkPrice().compareTo(coupon.getStartFee()) >= 0) {
+                goodsInfo.setCouponPrice(goodsInfo.getZkPrice().subtract(coupon.getAmount()));
+            } else {
+                goodsInfo.setCouponPrice(goodsInfo.getZkPrice());
+            }
 
-		} else {
-			goodsInfo.setHasCoupon(false);
-		}
+        } 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);
+        // 璧勯噾淇℃伅
+        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());
+        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 + "%");
+        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 + "%");
+            BigDecimal maxCommission = SuningUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+            BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+            moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
 
-			moneyInfoVO.setMaxMoney("楼" + maxCommission);
+            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);
+            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);
-		}
+        // 搴楅摵淇℃伅
+        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;
-	}
+        return goodsInfo;
+    }
 
 }

--
Gitblit v1.8.0