From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 七月 2020 17:52:07 +0800 Subject: [PATCH] 多APP优化 --- fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 458 +------------------------------------------------------- 1 files changed, 11 insertions(+), 447 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 ba8dfa0..1ec2af6 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 @@ -11,6 +11,8 @@ import javax.annotation.Resource; +import com.yeshi.fanli.entity.SystemEnum; +import com.yeshi.fanli.service.inter.user.UserInfoService; import org.springframework.stereotype.Service; import org.yeshi.utils.HttpUtil; import org.yeshi.utils.JsonUtil; @@ -78,7 +80,7 @@ private UserShareGoodsHistoryMapper userShareGoodsHistoryMapper; @Resource - private UserInfoMapper userinfoMapper; + private UserInfoService userInfoService; @Resource private RedisManager redisManager; @@ -220,7 +222,10 @@ // 鐢熸垚浜岀淮鐮佷俊鎭� // 鍖呭惈鐢ㄦ埛ID涓庡晢鍝両D // 鏂扮増鍟嗗搧鍒嗕韩 - String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(), + + SystemEnum system= userInfoService.getUserSystem(uid); + + String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(system), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), goods.getAuctionId() + ""); @@ -243,7 +248,7 @@ // throw new ShareGoodsException(4, "鐢熸垚浜岀淮鐮佸け璐�"); // } // 鑾峰彇鍒扮敤鎴风殑澶村儚 - UserInfo user = userinfoMapper.selectAvailableByPrimaryKey(uid); + UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid); InputStream portrait = null; if (!StringUtil.isNullOrEmpty(user.getPortrait())) { try { @@ -380,131 +385,6 @@ } @Override - public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId) throws ShareGoodsException { - - if (uid == null || uid <= 0) { - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - - if (auctionId == null || auctionId <= 0) { - throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - - TaoKeAppInfo info = new TaoKeAppInfo(); - - if (!StringUtil.isNullOrEmpty(relationId)) { - String pid = TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT; - String appId = pid.split("_")[2]; - String adzoneId = pid.split("_")[3]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(pid); - } else { - TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_SHARE_GOODS); - if (tbPid == null) { - throw new ShareGoodsException(3, "鑾峰彇鎺ㄥ箍浣嶅け璐�"); - } - String appId = tbPid.getPid().split("_")[2]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - String adzoneId = tbPid.getPid().split("_")[3]; - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(tbPid.getPid()); - } - TaoBaoGoodsBrief goods = null; - try { - goods = TaoKeApiUtil.searchGoodsDetail(auctionId, info); - } catch (TaobaoGoodsDownException e) { - throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�"); - } finally { - } - if (goods == null) { - throw new ShareGoodsException(5, "鑾峰彇鍟嗗搧璇︽儏澶辫触"); - } - - if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) { - - TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); - if (taoBaoLink == null) { - throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触"); - } - goods.setCouponLink(taoBaoLink.getCouponLink()); - goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); - } - - String link = taoBaoGoodsCacheUtil.getBaseConvertLink(auctionId, info.getPid()); - if (link != null) { - goods.setCouponLink(link); - } else {// 缂撳瓨 - DaTaoKeFilterResult result = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods); - if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON - || result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON) { - link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid()); - } else if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {// 鏈夊埜 - link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid()); - } - - if (!StringUtil.isNullOrEmpty(link)) { - goods.setCouponLink(link); - taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, info.getPid(), link); - } - - if (StringUtil.isNullOrEmpty(link)) { - TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); - if (taoBaoLink == null) { - throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触"); - } - goods.setCouponLink(taoBaoLink.getCouponLink()); - goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); - } - } - - if (!StringUtil.isNullOrEmpty(relationId)) { - if (!StringUtil.isNullOrEmpty(goods.getAuctionUrl())) - goods.setAuctionUrl(goods.getAuctionUrl() + "&relationId=" + relationId); - if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) - goods.setCouponLink(goods.getCouponLink() + "&relationId=" + relationId); - } - - // 淇濆瓨鍟嗗搧璇︽儏 - - // 鍒涘缓娣樺彛浠� - TaoBaoLink tbLink = new TaoBaoLink(); - tbLink.setAuctionId(goods.getAuctionId()); - tbLink.setClickUrl(goods.getAuctionUrl()); - tbLink.setCouponLink(goods.getCouponLink()); - - if (!StringUtil.isNullOrEmpty(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 = convertLinkManager.createTaoBaoToken(uid, goods.getPictUrl(), goods.getTitle(), - tbLink.getClickUrl()); - if (!StringUtil.isNullOrEmpty(quanToken)) { - tbLink.setTaoToken(quanToken); - } - } - - tbLink.setGoods(goods); - - // 瀛樺偍鍒嗕韩鍟嗗搧鐨勪俊鎭紝鐢ㄤ簬鍔犲揩鍒嗕韩缃戦〉鎺ュ彛璇锋眰閫熷害 - 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 鍙d护:%s ", uid, auctionId, - tbLink.getCouponLink(), tbLink.getClickUrl(), tbLink.getTaoToken())); - - return tbLink; - } - - @Override public String createTaoBaoToken(Long uid, TaoBaoGoodsBrief goods) { String quanToken = ""; if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔� @@ -515,24 +395,6 @@ goods.getAuctionUrl()); } return quanToken; - } - - @Override - public TaoBaoLink getTaoBaoLinkForBuy(Long uid, Long auctionId, int pidType) throws ShareGoodsException { - - if (uid == null || uid <= 0) { - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - - if (auctionId == null || auctionId <= 0) { - throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - - TBPid tbPid = tbPidService.getTBPid(uid, pidType); - if (tbPid == null) { - throw new ShareGoodsException(3, "鑾峰彇鎺ㄥ箍浣嶅け璐�"); - } - return getTaoBaoLink(uid, auctionId, tbPid.getPid()); } @Override @@ -589,308 +451,8 @@ } @Override - public TaoBaoLink getTaoBaoLinkForBuyWithSpecial(Long uid, String specialId, Long auctionId) - throws ShareGoodsException { - if (uid == null || uid <= 0) { - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - - if (auctionId == null || auctionId <= 0) { - throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - - TaoKeAppInfo app = new TaoKeAppInfo(); - app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY); - app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET); - app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT); - - TaoBaoLink taoBaoLink = new TaoBaoLink(); - taoBaoLink.setAuctionId(auctionId); - - String baseUrl = taoBaoGoodsCacheUtil.getBaseConvertLink(auctionId, app.getPid()); - if (!StringUtil.isNullOrEmpty(baseUrl)) { - taoBaoLink.setClickUrl(baseUrl); - taoBaoLink.setCouponLink(baseUrl); - return taoBaoLink; - } - - // 鏌ヨ鏄惁涓哄ぇ娣樺鍟嗗搧 - - String link = null; - try { - link = DaTaoKeApiUtil.convertLink(auctionId, app.getPid()); - } catch (Exception e) { - } - DaTaoKeDetailV2 v2 = daTaoKeGoodsDetailV2Service.selectByAuctionId(auctionId); - if (v2 != null) { - try { - TaoBaoGoodsBrief goods = redisManager.getTaoBaoGoodsBrief(auctionId); - if (goods != null) { - if (DaTaoKeUtil.canFilterCouponInfo(goods, v2)) { - // link = DaTaoKeApiUtil.convertLink(auctionId, - // app.getPid()); - - } - } - } catch (TaobaoGoodsDownException e) { - throw new ShareGoodsException(4, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - } - - if (!StringUtil.isNullOrEmpty(link)) { - taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, app.getPid(), link); - } - - if (!StringUtil.isNullOrEmpty(link)) { - taoBaoLink.setCouponLink(link); - return taoBaoLink; - } - - TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId, app); - if (goods == null) { - throw new ShareGoodsException(1, ""); - } - - taoBaoLink.setClickUrl(goods.getAuctionUrl()); - taoBaoLink.setCouponLink(goods.getCouponLink()); - - if (!StringUtil.isNullOrEmpty(goods.getYsylClickUrl())) - taoBaoLink.setCouponLink(goods.getYsylClickUrl()); - taoBaoLink.setGoods(goods); - return taoBaoLink; - } - - @Override public UserShareGoodsHistory getShareGoodsHistory(Long uid, Long auctionId) { return userShareGoodsHistoryMapper.selectByUidAndAuctionId(uid, auctionId); - } - - @Override - public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId, String pid) - throws ShareGoodsException { - if (uid == null || uid <= 0) { - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - - if (auctionId == null || auctionId <= 0) { - throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - - TaoKeAppInfo info = new TaoKeAppInfo(); - - if (!StringUtil.isNullOrEmpty(relationId)) { - String appId = pid.split("_")[2]; - String adzoneId = pid.split("_")[3]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(pid); - } else { - TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_SHARE_GOODS); - if (tbPid == null) { - throw new ShareGoodsException(3, "鑾峰彇鎺ㄥ箍浣嶅け璐�"); - } - String appId = tbPid.getPid().split("_")[2]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - String adzoneId = tbPid.getPid().split("_")[3]; - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(tbPid.getPid()); - } - TaoBaoGoodsBrief goods = null; - try { - goods = TaoKeApiUtil.searchGoodsDetail(auctionId, info); - } catch (TaobaoGoodsDownException e) { - throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�"); - } finally { - } - if (goods == null) { - throw new ShareGoodsException(5, "鑾峰彇鍟嗗搧璇︽儏澶辫触"); - } - - if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) { - TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); - if (taoBaoLink == null) { - throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触"); - } - goods.setCouponLink(taoBaoLink.getCouponLink()); - goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); - } - - String link = taoBaoGoodsCacheUtil.getBaseConvertLink(auctionId, info.getPid()); - if (link != null) { - goods.setCouponLink(link); - } else {// 缂撳瓨 - DaTaoKeFilterResult result = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods); - if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON - || result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON) { - link = DaTaoKeApiUtil.convertLink(auctionId, info.getPid()); - if (!StringUtil.isNullOrEmpty(link)) { - goods.setCouponLink(link); - taoBaoGoodsCacheUtil.cacheBaseConvertLink(auctionId, info.getPid(), link); - } - } - if (StringUtil.isNullOrEmpty(link)) { - TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); - if (taoBaoLink == null) { - throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触"); - } - goods.setCouponLink(taoBaoLink.getCouponLink()); - goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); - } - } - - if (!StringUtil.isNullOrEmpty(relationId)) { - if (!StringUtil.isNullOrEmpty(goods.getAuctionUrl())) - goods.setAuctionUrl(goods.getAuctionUrl() + "&relationId=" + relationId); - if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) - goods.setCouponLink(goods.getCouponLink() + "&relationId=" + relationId); - } - - // 淇濆瓨鍟嗗搧璇︽儏 - - // 鍒涘缓娣樺彛浠� - TaoBaoLink tbLink = new TaoBaoLink(); - 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()); - if (!StringUtil.isNullOrEmpty(quanToken)) { - tbLink.setTaoToken(quanToken); - } - } else if (!StringUtil.isNullOrEmpty(tbLink.getClickUrl())) { - String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), tbLink.getClickUrl()); - if (!StringUtil.isNullOrEmpty(quanToken)) { - tbLink.setTaoToken(quanToken); - } - } - - tbLink.setGoods(goods); - - // 瀛樺偍鍒嗕韩鍟嗗搧鐨勪俊鎭紝鐢ㄤ簬鍔犲揩鍒嗕韩缃戦〉鎺ュ彛璇锋眰閫熷害 - if (Constant.IS_OUTNET) - redisManager.saveTaoBaoGoodsBriefTemp(goods); - - return tbLink; - } - - @Override - public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId, String pid) - throws ShareGoodsException { - if (uid == null || uid <= 0) - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - - 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) - throw new ShareGoodsException(1, "璇ュ晢鍝佸凡涓嬫灦"); - - String taoLiJinLink = null; - try { - goods.setAuctionId(auctionId); - taoLiJinLink = userTaoLiJinNewbiesService.createTaoLiJinForBuy(goods, uid); - } catch (UserTaoLiJinNewbiesException e1) { - throw new ShareGoodsException(e1.getCode(), e1.getMsg()); - } - - TaoBaoLink taoBaoLink = new TaoBaoLink(); - taoBaoLink.setAuctionId(auctionId); - taoBaoLink.setClickUrl(goods.getAuctionUrl()); - taoBaoLink.setCouponLink(taoLiJinLink); - taoBaoLink.setGoods(goods); - return taoBaoLink; - } - - @Override - public TaoBaoLink getTaoLiJinLinkForShare(Long uid, Long auctionId, String relationId) throws ShareGoodsException { - - if (uid == null || uid <= 0) { - throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - - if (auctionId == null || auctionId <= 0) { - throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖"); - } - - TaoKeAppInfo info = new TaoKeAppInfo(); - - if (!StringUtil.isNullOrEmpty(relationId)) { - String pid = TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT; - String appId = pid.split("_")[2]; - String adzoneId = pid.split("_")[3]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(pid); - } else { - TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_SHARE_GOODS); - if (tbPid == null) { - throw new ShareGoodsException(3, "鑾峰彇鎺ㄥ箍浣嶅け璐�"); - } - String appId = tbPid.getPid().split("_")[2]; - TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId); - String adzoneId = tbPid.getPid().split("_")[3]; - info.setAdzoneId(adzoneId); - info.setAppKey(taoBaoUnionConfig.getAppKey()); - info.setAppSecret(taoBaoUnionConfig.getAppSecret()); - info.setPid(tbPid.getPid()); - } - TaoBaoGoodsBrief goods = null; - try { - goods = TaoKeApiUtil.searchGoodsDetail(auctionId, info); - } catch (TaobaoGoodsDownException e) { - throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�"); - } finally { - } - if (goods == null) { - throw new ShareGoodsException(5, "鑾峰彇鍟嗗搧璇︽儏澶辫触"); - } - - 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, "鍟嗗搧杞摼澶辫触"); - } - goods.setCouponLink(taoBaoLink.getCouponLink()); - goods.setAuctionUrl(taoBaoLink.getAuctionUrl()); - } - - if (!StringUtil.isNullOrEmpty(relationId)) { - if (!StringUtil.isNullOrEmpty(goods.getAuctionUrl())) - goods.setAuctionUrl(goods.getAuctionUrl() + "&relationId=" + relationId); - if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) - goods.setCouponLink(goods.getCouponLink() + "&relationId=" + relationId); - } - - // 鍒涘缓娣樺彛浠� - TaoBaoLink tbLink = new TaoBaoLink(); - tbLink.setAuctionId(goods.getAuctionId()); - tbLink.setClickUrl(goods.getAuctionUrl()); - tbLink.setCouponLink(goods.getCouponLink()); - tbLink.setGoods(goods); - - // 瀛樺偍鍒嗕韩鍟嗗搧鐨勪俊鎭紝鐢ㄤ簬鍔犲揩鍒嗕韩缃戦〉鎺ュ彛璇锋眰閫熷害 - if (Constant.IS_OUTNET) - redisManager.saveTaoBaoGoodsBriefTemp(goods); - - return tbLink; } @Override @@ -908,6 +470,8 @@ if (!canBuy) { throw new ShareGoodsException(3, "绔嬪噺绾㈠寘宸叉姠鍏夛紝璇风◢鍚庡啀璇�"); } + + SystemEnum system= userInfoService.getUserSystem(uid); long currentTime = System.currentTimeMillis(); Date sendEndTime = new Date(TimeUtil.convertToTimeTemp( @@ -928,7 +492,7 @@ } catch (TaoLiJinCreateException e1) { if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_NO_MONEY) {// 璧勯噾涓嶈冻 TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppKeyCache(app.getAppKey()); - businessEmergent110Service.tljNoMoney(config.getAccount()); + businessEmergent110Service.tljNoMoney(config.getAccount(),system); } else if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {// 鍟嗗搧涓嶅厑璁稿垱寤烘窐绀奸噾 tljBuyGoodsService.removeGoods(auctionId); } -- Gitblit v1.8.0