系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

 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;

@@ -25,6 +26,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.TaoKeLogHelper;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

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

@@ -32,9 +34,7 @@
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

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;

@@ -79,17 +79,15 @@
   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;



   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private TaoBaoLinkManager taoBaoLinkManager;



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

      JSONObject data = new JSONObject();

@@ -239,20 +237,14 @@
         // 是返利商品库的商品

         if (specialConvert) {

            if (!StringUtil.isNullOrEmpty(specialId)) {

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

                  boolean isNewUser = userInfoExtraService.isNewUser(uid);

                  if (isNewUser) {

                     // 判定为老用户：

                     // 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。

                     long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

                     if (countRecord == 0) {

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

                     }

                  }

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

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

               }



               if (taoBaoLink == null) {

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

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

                  if(taoBaoLink!=null)

                     clientTBPid=null;

               }



               data.put("native", true);

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

                     taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                           tbPidService.getIOSDefault().getPid());



               } else

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

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

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

            }

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

@@ -276,19 +267,11 @@
               LogHelper.errorDetailInfo(e, "uid:" + uid, null);

            }

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

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

                  boolean isNewUser = userInfoExtraService.isNewUser(uid);

                  if (isNewUser) {

                     // 判定为老用户：

                     // 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。

                     long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

                     if (countRecord == 0) {

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

                              TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);

                     }

                  }

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

                  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);

               }



@@ -313,9 +296,18 @@
            data.put("tbPidInfo", clientTBPid);

         out.print(JsonUtil.loadTrueResult(data));



         TaoKeLogHelper.convertLinkInfo(

               String.format("uid:%s  auctionId:%s 输出结果:", uid, auctionId + "") + data.toString());



         // 获得金币

         integralGetService.addCouponRebate(uid);



      } catch (ShareGoodsException e) {

         if (e.getCode() == 1001 || e.getCode() == 1002) {

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

         } else {

            out.print(JsonUtil.loadFalseResult(1, e.getMsg()));

         }

      } catch (Exception e) {



         LogHelper.errorDetailInfo(e);

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

         }



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

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

      }

   }