Merge remote-tracking branch 'origin/div' into div

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -17,6 +17,7 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.yeshi.fanli.controller.client.v2.ShareControllerV2;

import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

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

@@ -204,13 +205,14 @@
         }



         data.put("clickUrl", url);

         data.put("token",TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         data.put("rule", configService.get("share_single_goods_rule"));

         data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         String shareText = "";

         // 无券

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM;

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO

               : TaoBaoConstant.SHARE_PRICE_TM;



         if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

            String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

@@ -253,7 +255,8 @@


         data.put("shareMoney", "¥" + shareMoney.toString());

         try {

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, false);

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,

                  Constant.SOURCE_TYPE_TAOBAO, false);

            data.put("shareId", shareRecord.getRedisKey());

         } catch (Exception e) {

            try {

@@ -320,7 +323,7 @@
         TaoBaoGoodsBrief goods = taoBaoLink.getGoods();



         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);

         String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);



         // 推广红包 不能小于1

@@ -374,7 +377,8 @@
         data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         // 无券

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM;

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO

               : TaoBaoConstant.SHARE_PRICE_TM;

         String shareText = "";



         if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

@@ -387,7 +391,7 @@
         {

            String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);

            if (StringUtil.isNullOrEmpty(text))

               text = configTaoLiJinService.getValueByKey("goods_share_text",new Date());

               text = configTaoLiJinService.getValueByKey("goods_share_text", new Date());



            shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle())

                  .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")

@@ -419,7 +423,8 @@


         data.put("shareMoney", "¥" + shareMoney.toString());

         try {

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, true);

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,

                  Constant.SOURCE_TYPE_TAOBAO, true);

            data.put("shareId", shareRecord.getRedisKey());

         } catch (Exception e) {

            try {

@@ -617,7 +622,7 @@
            try {

               userShareGoodsRecordService.takeEffectShareRecord(acceptData, shareId);

            } catch (UserShareGoodsRecordException eu) {

				


            } catch (Exception e) {

               try {

                  LogHelper.errorDetailInfo(e);

@@ -831,7 +836,7 @@
         if (tljId != null) {

            String template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);

            if (StringUtil.isNullOrEmpty(template))

               template = configTaoLiJinService.getValueByKey("goods_share_text",new Date());

               template = configTaoLiJinService.getValueByKey("goods_share_text", new Date());

            return template;

         } else {

            String template = shareGoodsTextTemplateService.geteCouponTemplate(uid);

@@ -882,7 +887,7 @@
   @RequestMapping(value = "getShareTextTemplateRules", method = RequestMethod.POST)

   public void getShareTextTemplateRules(AcceptData acceptData, Long tljId, PrintWriter out) {

      if (tljId != null) {

         out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules",new Date())));

         out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules", new Date())));

      } else {

         out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules")));

      }

@@ -927,67 +932,67 @@
                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					


               GoodsPicture goodsPicture = imgs.get(0);

               if (goodsPicture.getGoodState() == 1) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               } 
					
               }



               TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();

               if (goods == null) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					


               if (goods.getState() != null && goods.getState() == 1) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					


               if (!goods.isCoupon()) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					


               try {

                  TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					
            }  else {



            } else {

               List<GoodsPicture> imgs = dynamicInfo.getImgs();

               if (imgs == null || imgs.size() == 0) {

                  out.print(JsonUtil.loadFalseResult("所有商品已抢光"));

                  return;

               }

					


               int count = 0;

               for (GoodsPicture goodsPicture: imgs) {

               for (GoodsPicture goodsPicture : imgs) {

                  if (goodsPicture.getGoodState() == 1) {

                     count ++;

                     count++;

                     continue;

                  } 
						
                  }



                  TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();

                  if (goods == null) {

                     count ++;

                     count++;

                     continue;

                  }

						


                  if (goods.getState() != null && goods.getState() == 1) {

                     count ++;

                     count++;

                     continue;

                  }

						


                  if (!goods.isCoupon()) {

                     count ++;

                     count++;

                     continue;

                  }

               }

					


               if (count >= imgs.size()) {

                  out.print(JsonUtil.loadFalseResult("所有商品已抢光"));

                  return;

@@ -1008,7 +1013,8 @@
               title = "给你推荐精选好物优惠券，购物前先领券，别错过优惠哦~";

            }

            data.put("title", title);

            data.put("content",String.format("我在%s发现了一个很好的商品，快来看看~",Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));

            data.put("content", String.format("我在%s发现了一个很好的商品，快来看看~",

                  Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));



            // 分享奖金

            ClientTextStyleVO desc = dynamicInfo.getDesc();

@@ -1055,6 +1061,7 @@
               if (!StringUtil.isNullOrEmpty(shortLink)) {

                  url = shortLink;

               }



               data.put("clickUrl", url);



               // 淘宝口令

@@ -1065,6 +1072,10 @@
                  relationId = extraInfo.getRelationId();

               }

               TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);

               TaoBaoGoodsBrief goods = taoBaoLink.getGoods();

					
               data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));



               data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

            }