From 9b4ac7970d5694fb39dfc616b623ee121d58ae27 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 15:39:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
index c2bc6ef..ad88ebb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
@@ -115,6 +115,7 @@
GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();
other.setOwner(owner); // 鏄惁鑷惀
other.setPinGouInfo( goods.getPinGouInfo()); // 鎷艰喘淇℃伅
+ other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
cg.setOtherInfo(JSONObject.toJSON(other).toString());
// 淇濈暀瀛楁
@@ -160,12 +161,21 @@
String salesTip = goods.getSalesTip();
if (StringUtil.isNullOrEmpty(salesTip)) {
salesTip = "0";
+ } else {
+ int indexOf = salesTip.indexOf("+");
+ if (indexOf > 0) {
+ salesTip = salesTip.substring(0, indexOf);
+ }
}
+ int totalSales = 0;
if (salesTip.contains("涓�")) {
- salesTip = salesTip.replace("涓�", "") + "0000";
+ salesTip = salesTip.substring(0, salesTip.indexOf("涓�"));
+ totalSales= (int) (Float.parseFloat(salesTip) * 10000);
+ } else {
+ totalSales = Integer.parseInt(salesTip);
}
- cg.setSales(Integer.parseInt(salesTip));
+ cg.setSales(totalSales);
cg.setRate(MoneyBigDecimalUtil.div(new BigDecimal(goods.getPromotionRate()), new BigDecimal(10)));
cg.setSellerId(goods.getMallId());
cg.setSellerName(goods.getMallName());
--
Gitblit v1.8.0