From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 05fb1c2..271eb13 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
@@ -2,6 +2,8 @@
import java.math.BigDecimal;
+import com.alibaba.fastjson.JSONObject;
+import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;
import com.yeshi.fanli.dto.jd.JDCommissionInfo;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.jd.JDShopInfo;
@@ -11,6 +13,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
public class CommonGoodsFactory {
@@ -65,7 +68,7 @@
return null;
CommonGoods cg = new CommonGoods();
- JDCouponInfo couponInfo = goods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
if (couponInfo != null) {
cg.setCouponStartPrice(couponInfo.getQuota());
BigDecimal discount = couponInfo.getDiscount();
@@ -78,6 +81,8 @@
} else {
cg.setCouponAmount(new BigDecimal(0));
}
+ cg.setCouponLeftCount(1);
+ cg.setCouponTotalCount(1);
}
JDCommissionInfo commissionInfo = goods.getCommissionInfo();
@@ -108,6 +113,13 @@
}
cg.setState(CommonGoods.STATE_NORMAL);
+
+ // 鍏朵粬淇℃伅
+ GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();
+ other.setOwner(owner); // 鏄惁鑷惀
+ other.setPinGouInfo( goods.getPinGouInfo()); // 鎷艰喘淇℃伅
+ other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
+ cg.setOtherInfo(JSONObject.toJSON(other).toString());
// 淇濈暀瀛楁
cg.setVideoCover(null);
@@ -147,8 +159,26 @@
cg.setGoodsType(CommonGoods.GOODS_TYPE_PDD);
cg.setPicture(goods.getGoodsThumbnailUrl());
cg.setPictureWhite(null);
- cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinNormalPrice()), new BigDecimal(100)));
- cg.setSales(Integer.parseInt(goods.getSoldQuantity() + ""));
+ cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)));
+
+ 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.substring(0, salesTip.indexOf("涓�"));
+ totalSales= (int) (Float.parseFloat(salesTip) * 10000);
+ } else {
+ totalSales = 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