订单bug，分享爆款自购修改

admin

2019-07-11 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9

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

@@ -19,6 +19,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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

import com.yeshi.fanli.exception.ShareGoodsException;

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

import com.yeshi.fanli.log.LogHelper;

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

@@ -27,8 +28,10 @@
import com.yeshi.fanli.service.inter.monitor.MonitorService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -69,6 +72,30 @@
   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;



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

      JSONObject data = new JSONObject();

      TaoBaoLink taoBaoLink;

      try {

         taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuyWithOutFanLi(uid, auctionId);

      } catch (ShareGoodsException e) {

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

         return;

      }

      data.put("native", true);

      JSONObject link = new JSONObject();

      link.put("clickUrl", taoBaoLink.getClickUrl());

      link.put("couponUrl", taoBaoLink.getCouponLink());

      data.put("type", 1);

      data.put("link", link);

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

   }



   /**

    * 获取淘宝的分享链接

    * 

@@ -79,8 +106,8 @@
    * @param out

    */

   @RequestMapping(value = "gettaobaolink")

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,

         PrintWriter out) {

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, String source,

         HttpServletRequest request, PrintWriter out) {

      if (uid == null || uid <= 0) {

         out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

         return;

@@ -110,6 +137,11 @@
         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }



      if ("taolijin_buy".equalsIgnoreCase(source)) {

         doTaoLiJinBuy(uid, auctionId, out);

         return;

      }



      JSONObject data = new JSONObject();

@@ -150,10 +182,26 @@
         pidType = PidUser.TYPE_FANLI_IOS;

      try {

         TaoBaoLink taoBaoLink = null;



         // 是返利商品库的商品

         if (specialConvert) {

            if (!StringUtil.isNullOrEmpty(specialId)) {

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

               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 (taoBaoLink == null) {

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

               }



               data.put("native", true);

            } else {

               if (!specialConvert && !isNative) {

@@ -175,8 +223,22 @@
               LogHelper.errorDetailInfo(e, "uid:" + uid, null);

            }

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

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

                     TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);

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

                     }

                  }

               } else {

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

                        TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);

               }



               data.put("native", true);

            } else {

               if (pidType == PidUser.TYPE_FANLI_ANDROID)

@@ -197,6 +259,9 @@
         out.print(JsonUtil.loadTrueResult(data));



      } catch (Exception e) {



         LogHelper.errorDetailInfo(e);



         isNative = false;

         try {

            monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "购买淘宝商品转链出错"));

@@ -250,7 +315,6 @@


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

      }



   }



   /**