冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

@@ -251,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 {

@@ -316,7 +316,6 @@
         

         TaoBaoGoodsBrief goods = taoBaoLink.getGoods();

         

			
         // 计算推广红包

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

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

@@ -328,7 +327,7 @@
         }

         

         JSONObject data = new JSONObject();

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

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

         

         String taoLiJinLink = null;

         Long tljId = null;

@@ -345,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;

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