From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 7c282c9..2cdc138 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -789,14 +789,11 @@
private static TaoBaoGoodsBriefExtra loadYuShouInfo(TaoBaoGoodsBriefExtra extra, TaoBaoGoodsBrief goods) {
if (goods != null && extra != null) {
if (isYUShou(goods)) {// 棰勫敭鍟嗗搧
- extra.setZkPrice(new BigDecimal(goods.getPresaleDeposit()));
+// extra.setZkPrice(new BigDecimal(goods.getPresaleDeposit()));
// 棰勫敭
if (extra.getLabels() == null)
extra.setLabels(new ArrayList<>());
extra.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
- if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {// 鍦ㄦ爣棰樻坊鍔犱紭鎯犱俊鎭�
- extra.setTitle(String.format("銆�%s銆�", goods.getPresaleDiscountFeeText()) + extra.getTitle());
- }
}
}
return extra;
@@ -1436,22 +1433,6 @@
*/
public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
BigDecimal money = null;
-
- // 棰勫敭鍟嗗搧
- if (isYUShou(goodsBrief)) {
- if (goodsBrief.getYsylCommissionRate() != null)
- money = MoneyBigDecimalUtil.mul(
- MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(new BigDecimal(goodsBrief.getPresaleDeposit()),
- goodsBrief.getYsylCommissionRate()), new BigDecimal("0.01")),
- MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
- else
- money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(
- MoneyBigDecimalUtil.mul(goodsBrief.getZkPrice(), goodsBrief.getTkRate()),
- new BigDecimal("0.01")), MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
-
- return money;
- }
-
if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())
|| goodsBrief.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
money = MoneyBigDecimalUtil.mul(
@@ -2118,6 +2099,24 @@
return token;
}
+ /**
+ * 鎻愬彇鑷湁鏍煎紡鐨勬窐鍙ｄ护
+ *
+ * @param str
+ * @return
+ */
+ public static String parseSystemTaoToken(String str) {
+ String pattern = "(\\({1}[A-Za-z0-9]+\\){1})";
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
+ while (m.find()) {
+ String group = m.group(0);
+ if (!StringUtil.isNullOrEmpty(group))
+ return group;
+ }
+ return null;
+ }
+
public static boolean isSpecialGoods(Integer materialLibType) {
if (materialLibType != null && materialLibType == 1)
return true;
--
Gitblit v1.8.0