From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 d308746..06ef3ea 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
@@ -44,15 +44,15 @@
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.hongbao.HongBaoManageService;
+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.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.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
@@ -204,10 +204,10 @@
}
UserShareGoodsHistory history = new UserShareGoodsHistory();
- history.setTkCode(tbLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
history.setLink(tbLink.getClickUrl());
history.setQuanLink(tbLink.getCouponLink());
- history.setTkCode(tbLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
history.setCreateTime(new Date());
history.setGoodsId(goods.getAuctionId());
@@ -246,7 +246,7 @@
// throw new ShareGoodsException(4, "鐢熸垚浜岀淮鐮佸け璐�");
// }
// 鑾峰彇鍒扮敤鎴风殑澶村儚
- UserInfo user = userinfoMapper.selectByPrimaryKey(uid);
+ UserInfo user = userinfoMapper.selectAvailableByPrimaryKey(uid);
InputStream portrait = null;
if (!StringUtil.isNullOrEmpty(user.getPortrait())) {
try {
@@ -366,16 +366,16 @@
UserShareGoodsHistory history = new UserShareGoodsHistory();
history.setId(userShareGoodsHistory.getId());
- history.setTkCode(tbLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
history.setLink(tbLink.getClickUrl());
history.setQuanLink(tbLink.getCouponLink());
- history.setTkCode(tbLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
userShareGoodsHistoryMapper.updateByPrimaryKeySelective(history);
- userShareGoodsHistory.setTkCode(tbLink.getTaoToken());
+ userShareGoodsHistory.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
userShareGoodsHistory.setLink(tbLink.getClickUrl());
userShareGoodsHistory.setQuanLink(tbLink.getCouponLink());
- userShareGoodsHistory.setTkCode(tbLink.getTaoToken());
+ userShareGoodsHistory.setTkCode(TaoBaoUtil.filterTaoToken(tbLink.getTaoToken()));
}
return userShareGoodsHistory;
@@ -571,8 +571,9 @@
taoBaoLink.setAuctionId(auctionId);
taoBaoLink.setClickUrl(goods.getAuctionUrl());
taoBaoLink.setCouponLink(goods.getCouponLink());
+ if (!StringUtil.isNullOrEmpty(goods.getYsylClickUrl()))
+ taoBaoLink.setCouponLink(goods.getYsylClickUrl());
taoBaoLink.setGoods(goods);
-
return taoBaoLink;
}
@@ -649,6 +650,8 @@
tbLink.setAuctionId(goods.getAuctionId());
tbLink.setClickUrl(goods.getAuctionUrl());
tbLink.setCouponLink(goods.getCouponLink());
+ if (!StringUtil.isNullOrEmpty(goods.getYsylClickUrl()))
+ tbLink.setCouponLink(goods.getYsylClickUrl());
if (!StringUtil.isNullOrEmpty(tbLink.getCouponLink())) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), tbLink.getCouponLink());
--
Gitblit v1.8.0