dubbo集成修改

admin

2020-07-16 be67478cae6bf9308f15949a21e7d0a57a3f0ecb

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java

@@ -21,28 +21,22 @@
import org.yeshi.utils.exception.HttpException;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.UserShareGoodsHistoryMapper;

import com.yeshi.fanli.dto.taobao.DaTaoKeFilterResult;

import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.common.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.entity.taobao.UserTLJBuyHistory;

import com.yeshi.goods.facade.entity.taobao.DaTaoKeDetailV2;

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.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.ShareGoodsService;

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

@@ -51,7 +45,7 @@
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.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;

@@ -62,11 +56,8 @@
import com.yeshi.fanli.util.ImageUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

import org.yeshi.utils.TimeUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

import com.yeshi.fanli.util.taobao.DaTaoKeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



@@ -81,9 +72,6 @@


    @Resource

    private UserInfoService userInfoService;



    @Resource

    private RedisManager redisManager;



    @Resource

    private ConfigService configService;

@@ -107,16 +95,7 @@
    private BusinessEmergent110Service businessEmergent110Service;



    @Resource

    private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;



    @Resource

    private ConvertLinkManager convertLinkManager;



    @Resource

    private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



    @Resource

    private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



    @Override

    public void addShareGoodsHistory(UserShareGoodsHistory history) {

@@ -162,7 +141,7 @@


        // 没有获取到转过链的商品详情

        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {

            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info); // TaoBaoUtil.getTbLinkForShare(auctionId,

            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info,null,null); // TaoBaoUtil.getTbLinkForShare(auctionId,

            // tbPid.getPid(),

            // taoBaoUnionConfig);

            if (taoBaoLink == null) {

@@ -422,7 +401,7 @@
        info.setPid(pid);

        TaoBaoGoodsBrief goods = null;

        try {

            goods = TaoKeApiUtil.searchGoodsDetailForConvert(auctionId, info);

            goods = TaoKeApiUtil.searchGoodsDetailForConvert(auctionId, info,null,null);

        } catch (TaobaoGoodsDownException e) {

            throw new ShareGoodsException(4, "商品已下架");

        } finally {

@@ -433,7 +412,7 @@
        }



        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {

            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info);

            TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info,null,null);

            if (taoBaoLink == null) {

                throw new ShareGoodsException(201, "商品转链失败");

            }