Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java

@@ -304,7 +304,7 @@
         // 分享id

         try {

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

                  Constant.SOURCE_TYPE_TAOBAO);

                  Constant.SOURCE_TYPE_TAOBAO, false);

            shareInfo.setShareId(shareRecord.getRedisKey());

         } catch (Exception e) {

            try {

@@ -479,7 +479,7 @@
         shareInfo.setShareMoney("¥" + shareMoney.toString());

         try {

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,

                  Constant.SOURCE_TYPE_TAOBAO);

                  Constant.SOURCE_TYPE_TAOBAO, true);

            shareInfo.setShareId(shareRecord.getRedisKey());

         } catch (Exception e) {

            try {

@@ -604,7 +604,7 @@
      shareInfo.setShareMoney("¥" + shareMoney.toString());

      try {

         ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

               Constant.SOURCE_TYPE_JD);

               Constant.SOURCE_TYPE_JD, false);

         shareInfo.setShareId(shareRecord.getRedisKey());

      } catch (Exception e) {

         try {

@@ -719,7 +719,7 @@


      try {

         ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

               Constant.SOURCE_TYPE_PDD);

               Constant.SOURCE_TYPE_PDD, false);

         shareInfo.setShareId(shareRecord.getRedisKey());

      } catch (Exception e) {

         try {