冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

@@ -50,7 +50,6 @@
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

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

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

@@ -69,6 +68,7 @@
import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.taobao.TaoLiJinUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;



import net.sf.json.JSONArray;

@@ -134,9 +134,6 @@
   

   @Resource

   private ConfigTaoLiJinService configTaoLiJinService;

	
   @Resource

   private GoodsTaoLiJinRateService goodsTaoLiJinRateService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;

@@ -254,7 +251,7 @@


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

         try {

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

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

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

         } catch (Exception e) {

            try {

@@ -319,15 +316,18 @@
         

         TaoBaoGoodsBrief goods = taoBaoLink.getGoods();

         

         BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);

         // 计算推广红包

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

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

			
         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {

            out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足1元"));

         if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {

            out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足"));

            return;

         }

         

         JSONObject data = new JSONObject();

         data.put("spreadMoney", "淘礼金 ¥" + spreadMoney.toString());

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

         

         String taoLiJinLink = null;

         Long tljId = null;

@@ -344,7 +344,7 @@
         

         String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(),

               Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

               auctionId + "", tljId);

               auctionId + "",AESUtil.encrypt(tljId + "", Constant.UIDAESKEY));

         String shortLink = HttpUtil.getShortLink(url);

         if (!StringUtil.isNullOrEmpty(shortLink)) {

            url = shortLink;

@@ -353,19 +353,18 @@
         

         

         // 创建淘口令

         String taoToken = null;

         if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 通过立即推广方式获取淘口令成功

            String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);

            if (!StringUtil.isNullOrEmpty(quanToken)) {

               taoToken = quanToken;

               taoBaoLink.setTaoToken(quanToken);

            }

         } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {

            String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl());

            if (!StringUtil.isNullOrEmpty(quanToken)) {

               taoToken = quanToken;

               taoBaoLink.setTaoToken(quanToken);

            }

         }

         data.put("token", taoToken);

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

         

         data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

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

@@ -390,7 +389,7 @@
                  .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")

                  .replace("{优惠券面额}",

                        MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())

                  .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods())).toString())

                  .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(spreadMoney).toString())

                  .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");

         }

         

@@ -416,7 +415,7 @@


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

         try {

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

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

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

         } catch (Exception e) {

            try {

@@ -586,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()));