From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index b1b0c94..84858fc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -9,7 +9,9 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
@@ -161,6 +163,10 @@
@Resource
private TaoBaoLinkManager taoBaoLinkManager;
+
+
+ @Resource
+ private PIDManager pidManager;
@Override
public UserCloud getValidByUid(Long uid) {
@@ -485,7 +491,7 @@
for (CommentInfo commentInfo : comments) {
String comment = null;
try {
- comment = convertLinkManager.convertLinkFromText(commentInfo.getContent(), uid, true,false);
+ comment = convertLinkManager.convertLinkFromText(user.getSystem(), commentInfo.getContent(), uid, true, false);
hasToken = true;
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
@@ -865,7 +871,7 @@
List<UserCloudGroup> listOpen, String pid) throws UserCloudException {
TaoBaoLink taoBaoLink = null;
try {
- taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(user.getId(), goodsId, relationId, null);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(user.getSystem(), user.getId(), goodsId, relationId, null);
} catch (TaoBaoConvertLinkException e) {
LogHelper.errorDetailInfo(e);
throw new UserCloudException(1, "璇ュ晢鍝佸凡涓嬫灦");
@@ -884,7 +890,7 @@
String couponAmount = "";
if (coupon) {
description = goods.getDescription();
- quanPrice = TaoBaoUtil.getAfterUseCouplePrice(goods) + "";
+ quanPrice = TaoBaoUtil.getCouponPrice(goods) + "";
couponAmount = MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString();
}
String sales = TaoBaoUtil.getSaleCount(goods.getBiz30day());
@@ -930,7 +936,7 @@
couponUrl = couponInfo.getLink();
}
String materialId = "https://item.jd.com/" + goodsId + ".html";
- String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_SHARE + "",
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pidManager.getPidCache(user.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.share),
user.getId() + "");
boolean coupon = false;
@@ -941,7 +947,7 @@
String quanPrice = "";
String couponAmount = "";
if (coupon) {
- quanPrice = BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(jdGoods)).toString() + "";
+ quanPrice = BigDecimalUtil.getWithNoZera(JDUtil.getCouponPrice(jdGoods)).toString() + "";
couponAmount = BigDecimalUtil.getWithNoZera(couponInfo.getDiscount()).toString();
}
@@ -990,7 +996,7 @@
if (goods == null)
throw new UserCloudException(1, "璇ュ晢鍝佸凡涓嬫灦");
- String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", user.getId() + "");
+ String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goods.getGoodsSign(), pidManager.getPidCache(user.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.share), user.getId() + "");
boolean coupon = true;
if (goods.getHasCoupon() == null || !goods.getHasCoupon()) {
@@ -1003,7 +1009,7 @@
BigDecimal hundred = new BigDecimal(100);
BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred);
quanPrice = BigDecimalUtil.getWithNoZera(amount).toString();
- couponAmount = BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString();
+ couponAmount = BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getCouponPrice(goods)).toString();
}
String sales = goods.getSalesTip();
@@ -1102,7 +1108,7 @@
String couponLink = goods.getCouponInfo().getCouponUrl();
String jumpLink = SuningApiUtil.convertLink(SuningUtil.getProductUrl(sellerId + "", goodsId + ""),
- StringUtil.isNullOrEmpty(couponLink) ? null : couponLink, SuningApiUtil.PID_SHARE, user.getId() + "");
+ StringUtil.isNullOrEmpty(couponLink) ? null : couponLink, pidManager.getPidCache(user.getSystem(), Constant.SOURCE_TYPE_SUNING, SystemPIDInfo.PidType.share), user.getId() + "");
boolean coupon = false;
String couponAmount = "";
--
Gitblit v1.8.0