From ac1e3863197a4a72784cd02335cb9b1f89026369 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 21 十月 2019 00:42:15 +0800
Subject: [PATCH] 双11红包修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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..58a383e 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
@@ -1442,7 +1442,7 @@
if (goodsBrief.getYsylCommissionRate() != null)
money = MoneyBigDecimalUtil.mul(
MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(new BigDecimal(goodsBrief.getPresaleDeposit()),
- goodsBrief.getYsylCommissionRate()), new BigDecimal("0.01")),
+ goodsBrief.getYsylCommissionRate()), new BigDecimal("0.0001")),
MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
else
money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(
@@ -2118,6 +2118,23 @@
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