blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yujian
2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c 
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java


@@ -253,7 +253,7 @@






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



         try {



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



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



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



         } catch (Exception e) {



            try {



@@ -320,7 +320,7 @@


         TaoBaoGoodsBrief goods = taoBaoLink.getGoods();







         // 计算推广红包



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



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



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







         // 推广红包 不能小于1



@@ -387,7 +387,7 @@


         {



            String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);



            if (StringUtil.isNullOrEmpty(text))



               text = configTaoLiJinService.getValueByKey("goods_share_text");



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







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



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



@@ -419,7 +419,7 @@






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



         try {



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



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



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



         } catch (Exception e) {



            try {



@@ -585,7 +585,7 @@


   @RequestMapping(value = "sharedetail", method = RequestMethod.POST)



   public void shareDetail(AcceptData acceptData, Long uid, Long auctionId, String type, PrintWriter out) {



      try {



         userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId);



         userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);



         out.print(JsonUtil.loadTrueResult("分享成功"));



      } catch (UserShareGoodsRecordException e) {



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



@@ -614,7 +614,7 @@


         @Override



         public void run() {



            try {



               userShareGoodsRecordService.takeEffectShareRecord(shareId);



               userShareGoodsRecordService.takeEffectShareRecord(acceptData, shareId);



            } catch (UserShareGoodsRecordException eu) {



               try {



                  LogHelper.errorDetailInfo(eu);



@@ -834,7 +834,7 @@


         if (tljId != null) {



            String template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);



            if (StringUtil.isNullOrEmpty(template))



               template = configTaoLiJinService.getValueByKey("goods_share_text");



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



            return template;



         } else {



            String template = shareGoodsTextTemplateService.geteCouponTemplate(uid);



@@ -885,7 +885,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")));



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



      } else {



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



      }



@@ -926,19 +926,40 @@


         if (cid == 1 || cid == 2) { // 1 热销单品 2 推荐好货



            if (cid == 1) {



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



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



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



                  return;



               }



					


               GoodsPicture goodsPicture = imgs.get(0);



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



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



                  return;



               } else {



                  TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();



                  try {



                     TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());



                  } catch (TaobaoGoodsDownException e) {



                     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;



               }



					


            }







            // 分享文字