From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index 56d4f46..3f23d1e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -19,10 +19,8 @@
import org.yeshi.utils.exception.HttpException;
import org.yeshi.utils.tencentcloud.COSManager;
-import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.UserShareGoodsHistoryMapper;
-import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -39,20 +37,19 @@
import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinNewbiesException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.LogManager;
+import com.yeshi.fanli.log.LogType;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
-import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.UserTLJBuyHistoryService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
-import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FilePathEnum;
@@ -68,8 +65,7 @@
@Service
public class ShareGoodsServiceImpl implements ShareGoodsService {
- @Resource
- private PidUserMapper pidUserMapper;
+
@Resource
private TBPidService tbPidService;
@@ -77,8 +73,6 @@
@Resource
private UserShareGoodsHistoryMapper userShareGoodsHistoryMapper;
- @Resource
- private HongBaoManageMapper hongBaoManageMapper;
@Resource
private UserInfoMapper userinfoMapper;
@@ -98,17 +92,6 @@
@Resource
private HongBaoManageService hongBaoManageService;
- @Resource
- private UserShareGoodsRecordService userShareGoodsRecordService;
-
- @Resource
- private CommonGoodsService commonGoodsService;
-
- @Resource
- private UserMoneyExtraService userMoneyExtraService;
-
- @Resource
- private UserTaoLiJinRecordService userTaoLiJinRecordService;
@Resource
private UserTLJBuyHistoryService userTLJBuyHistoryService;
@@ -122,6 +105,9 @@
@Resource
private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;
+ @Resource
+ private ConvertLinkManager convertLinkManager;
+
@Override
public void addShareGoodsHistory(UserShareGoodsHistory history) {
UserShareGoodsHistory userShareGoodsHistory = userShareGoodsHistoryMapper
@@ -305,7 +291,8 @@
}
FileUploadResult shareImgResult = COSManager.getInstance().uploadInputStream(shareImgInputStream,
- FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + goods.getAuctionId() + "_" + System.currentTimeMillis() + ".png");
+ FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + goods.getAuctionId() + "_"
+ + System.currentTimeMillis() + ".png");
if (shareImgResult == null || StringUtil.isNullOrEmpty(shareImgResult.getUrl())) {
throw new ShareGoodsException(6, "鍒嗕韩鍥剧墖淇濆瓨澶辫触");
@@ -421,8 +408,6 @@
}
TaoBaoGoodsBrief goods = null;
try {
- // 娴嬭瘯
- // info.setAdzoneId("123");
goods = TaoKeApiUtil.searchGoodsDetail(auctionId, info);
} catch (TaobaoGoodsDownException e) {
throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�");
@@ -433,8 +418,6 @@
}
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
- TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService
- .getConfigByAppIdCache(info.getPid().split("_")[2]);
TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info);
if (taoBaoLink == null) {
throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触");
@@ -459,12 +442,12 @@
tbLink.setCouponLink(goods.getCouponLink());
if (!StringUtil.isNullOrEmpty(tbLink.getCouponLink())) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
- String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), tbLink.getCouponLink());
+ String quanToken = convertLinkManager.createTaoBaoToken(uid, goods.getPictUrl(), goods.getTitle(), tbLink.getCouponLink());
if (!StringUtil.isNullOrEmpty(quanToken)) {
tbLink.setTaoToken(quanToken);
}
} else if (!StringUtil.isNullOrEmpty(tbLink.getClickUrl())) {
- String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), tbLink.getClickUrl());
+ String quanToken = convertLinkManager.createTaoBaoToken(uid,goods.getPictUrl(), goods.getTitle(), tbLink.getClickUrl());
if (!StringUtil.isNullOrEmpty(quanToken)) {
tbLink.setTaoToken(quanToken);
}
@@ -475,6 +458,10 @@
// 瀛樺偍鍒嗕韩鍟嗗搧鐨勪俊鎭紝鐢ㄤ簬鍔犲揩鍒嗕韩缃戦〉鎺ュ彛璇锋眰閫熷害
if (Constant.IS_OUTNET)
redisManager.saveTaoBaoGoodsBriefTemp(goods);
+
+ LogManager.getLogger(LogType.taobaoTrade)
+ .info(String.format("娣樺疂鍟嗗搧鍒嗕韩\n UID:%s \n 鍟嗗搧ID:%s \n 鍒搁摼鎺�%s \n鍟嗗搧閾炬帴:%s \n 鍙ｄ护:%s ", uid, auctionId,
+ tbLink.getCouponLink(), tbLink.getClickUrl(), tbLink.getTaoToken()));
return tbLink;
}
@@ -680,22 +667,22 @@
@Override
public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId, String pid)
throws ShareGoodsException {
- if (uid == null || uid <= 0)
+ if (uid == null || uid <= 0)
throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
- if (auctionId == null || auctionId <= 0)
+ if (auctionId == null || auctionId <= 0)
throw new ShareGoodsException(1, "鍟嗗搧ID涓嶈兘涓虹┖");
-
+
TaoBaoGoodsBrief goods = null;
try {
goods = TaoKeApiUtil.searchGoodsDetail(auctionId);
} catch (TaobaoGoodsDownException e) {
throw new ShareGoodsException(1, "璇ュ晢鍝佸凡涓嬫灦");
}
-
- if (goods == null)
+
+ if (goods == null)
throw new ShareGoodsException(1, "璇ュ晢鍝佸凡涓嬫灦");
-
+
String taoLiJinLink = null;
try {
goods.setAuctionId(auctionId);
--
Gitblit v1.8.0