From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 b9ce3a9..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
@@ -35,25 +35,24 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.entity.taobao.UserTLJBuyHistory;
-import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.impl.monitor.BusinessEmergent110ServiceImpl;
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;
@@ -205,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());
@@ -247,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 {
@@ -367,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;
@@ -572,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;
}
@@ -650,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());
@@ -834,7 +836,7 @@
TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppKeyCache(app.getAppKey());
businessEmergent110Service.tljNoMoney(config.getAccount());
} else if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {// 鍟嗗搧涓嶅厑璁稿垱寤烘窐绀奸噾
-
+ tljBuyGoodsService.removeGoods(auctionId);
}
LogHelper.errorDetailInfo(e1, e1.getMessage(), null);
} catch (TaoKeApiException e) {
--
Gitblit v1.8.0