比价相关的bug修复

admin

2020-07-22 73a3d86a47d8da711b609cd224c63526f7d00f9b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java

@@ -5,6 +5,7 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



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

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -17,10 +18,10 @@
import com.yeshi.fanli.entity.taobao.PidUser;

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

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

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.exception.share.ShareGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;

@@ -31,19 +32,16 @@
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

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

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

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.factory.MonitorFactory;

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

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

@@ -81,11 +79,6 @@
   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;



   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;

@@ -94,7 +87,7 @@
   private IntegralGetService integralGetService;



   @Resource

   private TLJFreeBuyGoodsService tljFreeBuyGoodsService;

   private TaoBaoLinkManager taoBaoLinkManager;



   private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

      JSONObject data = new JSONObject();

@@ -245,11 +238,13 @@
         if (specialConvert) {

            if (!StringUtil.isNullOrEmpty(specialId)) {

               if (source != null && "taolijin_free_buy".equals(source)) {

                  taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId, null);

                  taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId, null);

               }



               if (taoBaoLink == null) {

                  taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);

                  taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid,  auctionId,specialId,null);

                  if(taoBaoLink!=null)

                     clientTBPid=null;

               }



               data.put("native", true);

@@ -261,9 +256,8 @@
                  else

                     taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                           tbPidService.getIOSDefault().getPid());



               } else

                  taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

                  taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId, specialId,null);

               LogHelper.test("购买转链:默认PID转链-" + uid + "：" + auctionId);

            }

         } else {// 不是返利库的商品，用特殊PID替代

@@ -274,10 +268,10 @@
            }

            if (!StringUtil.isNullOrEmpty(relationId)) {//

               if (source != null && "taolijin_free_buy".equals(source)) {

                  taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId,

                  taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId,

                        TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);

               } else {

                  taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId,

                  taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(uid, auctionId, relationId,

                        TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);

               }



@@ -368,7 +362,7 @@
            out.print(JsonUtil.loadFalseResult(1, "请求失败"));

         }



         businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));

         businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""),acceptData.getSystem());

      }

   }