yujian
2019-11-06 bef0ef19d792a16a31a59ec7beafc7b0885529fa
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;
@@ -210,7 +211,8 @@
         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 {
@@ -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())) {
@@ -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 {
@@ -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,7 +1072,21 @@
                  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()));
               // 测试
               List<String> commentTexts = new ArrayList<>();
               commentTexts.add("口令1");
               commentTexts.add("口令2口令口令淘口令口令口令淘口令");
               commentTexts.add("口令3");
               commentTexts.add("口令口令淘口令口令口令淘口令口令口令淘口令口令口令淘口令口令口令淘口令口令口令淘口令");
               data.put("commentTexts", commentTexts);
               data.put("wxErCode", "这是微信分享二维码内容");
            }
         } else if (cid == 4) { // 邀请分享