From 70ebe043e6b62756be9e257fe954c747d46568b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 九月 2022 19:00:59 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java |  154 +++++++++++++++++++++++++++------------------------
 1 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
index dda451e..a119ab0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import org.springframework.stereotype.Component;
 import org.yeshi.utils.BigDecimalUtil;
 
@@ -13,83 +14,90 @@
 @Component
 public class CommonGoodsUtil {
 
-	/**
-	 * 鍟嗗搧浣i噾鍖呭惈楼绗﹀彿
-	 * 
-	 * @param goods
-	 * @param rate
-	 * @return
-	 */
-	public static String getCommissionInfo(CommonGoods goods, BigDecimal rate) {
-		return "楼" + getCommission(goods, rate).toString();
-	}
+    /**
+     * 鍟嗗搧浣i噾鍖呭惈楼绗﹀彿
+     *
+     * @param goods
+     * @param rate
+     * @return
+     */
+    public static String getCommissionInfo(CommonGoods goods, BigDecimal rate) {
+        return "楼" + getCommission(goods, rate).toString();
+    }
 
-	/**
-	 * 鍟嗗搧浣i噾
-	 * 
-	 * @param goods
-	 * @param rate
-	 * @return
-	 */
-	public static BigDecimal getCommission(CommonGoods goods, BigDecimal rate) {
-		BigDecimal money = null;
+    /**
+     * 鍟嗗搧浣i噾
+     *
+     * @param goods
+     * @param rate
+     * @return
+     */
+    public static BigDecimal getCommission(CommonGoods goods, BigDecimal rate) {
+        BigDecimal money = null;
 
-		if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || goods.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
-			BigDecimal price = goods.getPrice();
-			money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
-					.mul(MoneyBigDecimalUtil.mul(price, goods.getRate()), new BigDecimal("0.01")),
-					MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+        if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || goods.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
+            BigDecimal price = goods.getPrice();
+            money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+                            .mul(MoneyBigDecimalUtil.mul(price, goods.getRate()), new BigDecimal("0.01")),
+                    MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
 
-		} else// 鏈夊埜
-		{
-			List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
-			BigDecimal startFee = list.get(0);
-			BigDecimal couponAccount = list.get(1);
-			if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
-				BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
-				money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
-						.mul(MoneyBigDecimalUtil.mul(finalPrice, goods.getRate()), new BigDecimal("0.01")),
-						MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+        } else// 鏈夊埜
+        {
+            List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
+            BigDecimal startFee = list.get(0);
+            BigDecimal couponAccount = list.get(1);
+            if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
+                BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
+                money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+                                .mul(MoneyBigDecimalUtil.mul(finalPrice, goods.getRate()), new BigDecimal("0.01")),
+                        MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
 
-			} else {// 涓嶈兘鐢ㄥ埜
-				money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
-						.mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()), new BigDecimal("0.01")),
-						MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
-			}
-		}
-		
-		if (goods.getGoodsType() == Constant.SOURCE_TYPE_VIP) {
-			money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
-					.mul(MoneyBigDecimalUtil.mul(goods.getCouponStartPrice(), goods.getRate()), new BigDecimal("0.01")),
-					MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
-		}
+            } else {// 涓嶈兘鐢ㄥ埜
+                money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+                                .mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()), new BigDecimal("0.01")),
+                        MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+            }
+        }
 
-		// 浜笢鍟嗗搧鐗规畩澶勭悊
-		if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD)
-			return BigDecimalUtil.getWithNoZera(MoneyBigDecimalUtil.mul(money, new BigDecimal("0.9")));
-		else
-			return BigDecimalUtil.getWithNoZera(money);
-	}
+        if (goods.getGoodsType() == Constant.SOURCE_TYPE_VIP) {
+            money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+                            .mul(MoneyBigDecimalUtil.mul(goods.getCouponStartPrice(), goods.getRate()), new BigDecimal("0.01")),
+                    MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+        }
 
-	/**
-	 * 璁$畻鍟嗗搧鍒稿悗浠凤紝娌℃湁鍒稿垯杩斿洖鍘熶环
-	 * 
-	 * @param goodsBrief
-	 * @return
-	 */
-	public static BigDecimal getAfterUseCouplePrice(CommonGoods goods) {
-		if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || "鏃�".equals(goods.getCouponInfo())) {
-			return goods.getPrice();
-		} else {
-			List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
-			BigDecimal startFee = list.get(0);
-			BigDecimal couponAccount = list.get(1);
-			if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
-				BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
-				return finalPrice;
-			} else {// 涓嶈兘鐢ㄥ埜
-				return goods.getPrice();
-			}
-		}
-	}
+        // 浜笢鍟嗗搧鐗规畩澶勭悊
+        if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD)
+            return BigDecimalUtil.getWithNoZera(MoneyBigDecimalUtil.mul(money, new BigDecimal("0.9")));
+        else
+            return BigDecimalUtil.getWithNoZera(money);
+    }
+
+    /**
+     * 璁$畻鍟嗗搧鍒稿悗浠凤紝娌℃湁鍒稿垯杩斿洖鍘熶环
+     *
+     * @param goodsBrief
+     * @return
+     */
+    public static BigDecimal getAfterUseCouplePrice(CommonGoods goods) {
+        if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || "鏃�".equals(goods.getCouponInfo())) {
+            return goods.getPrice();
+        } else {
+            List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
+            BigDecimal startFee = list.get(0);
+            BigDecimal couponAccount = list.get(1);
+            if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
+                BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
+                return finalPrice;
+            } else {// 涓嶈兘鐢ㄥ埜
+                return goods.getPrice();
+            }
+        }
+    }
+
+    public static String getGoodsId(String goodsId, int goodsType) {
+        if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+            return TaoBaoUtil.getAuctionId(goodsId);
+        }
+        return goodsId;
+    }
 }

--
Gitblit v1.8.0