From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 e6ac7aa..f320f20 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
@@ -57,15 +57,15 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TaoBaoHttpUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -705,6 +705,8 @@
tg.setReservePrice(tb.getReservePrice());
tg.setUserType(tb.getUserType());
tg.setShopTitle(tb.getShopTitle());
+ tg.setTkRate(tb.getTkRate());
+ tg.setSellerId(tb.getSellerId());
tg.setState(tb.getState()); // 鐘舵�侊細2018-12-03
if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
@@ -1688,7 +1690,8 @@
MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));
taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());
taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));
- taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus());
+ if (detail.getQuanReceive() != null)
+ taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive());
taoBaoGoods.setPictUrl(detail.getPic());
taoBaoGoods.setPictUrlWhite(detail.getPic());
taoBaoGoods.setSellerId(detail.getSellerId());
@@ -1896,6 +1899,25 @@
return "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
}
+ /**
+ * 鏄惁鍙互鍔犲叆娣樼ぜ閲戠殑棰勯�夊晢鍝佸簱
+ *
+ * @param v2
+ * @return
+ */
+ public static boolean canAddToTLJBuyGoods(TaoBaoGoodsBrief goods) {
+ BigDecimal tljMoney = getShareGoodsHongBaoInfo(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ // 涓嶈兘灏忎簬1鍧�
+ if (tljMoney.compareTo(new BigDecimal(1)) < 0 || tljMoney.compareTo(new BigDecimal(10)) > 0)
+ return false;
+
+ // 鍒稿悗浠蜂笉鑳藉ぇ浜�150
+ if (getAfterUseCouplePrice(goods).compareTo(new BigDecimal(150)) > 0)
+ return false;
+
+ return true;
+ }
+
public static void main(String[] args) {
String s = channelMap.get("3");
System.out.println(s);
--
Gitblit v1.8.0