Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

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

@@ -15,6 +15,7 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.BigDecimalUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;

@@ -123,6 +124,8 @@
            String text = configService.get("goods_share_text_coupon");

            shareText = text.replace("[标题]", taoBaoLink.getGoods().getTitle())

                  .replace("[在售价]", "¥" + taoBaoLink.getGoods().getZkPrice())

                  .replace("[优惠券金额]",

                        "¥"+BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())

                  .replace("[券后价]", "¥" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()));

         }

         shareText = shareText.replace("[价格类型]", shopType);

@@ -140,7 +143,7 @@
         data.put("notifyDesc", configService.get("goods_share_notify"));



         // 添加分享记录

         BigDecimal rate = hongBaoManageService.getFanLiRate();

         BigDecimal rate = hongBaoManageService.getShareRate();

         UserShareGoodsHistory history = new UserShareGoodsHistory();

         history.setTkCode(taoBaoLink.getTaoToken());

         history.setLink(taoBaoLink.getClickUrl());

@@ -157,6 +160,8 @@
         history.setPictures(JsonUtil.getGson().toJson(imgList));

         history.setUser(new UserInfo(uid));

         history.setPostPicture(taoBaoLink.getGoods().getPictUrl());



         data.put("shareMoney", history.getHongbao().toString());



         out.print(JsonUtil.loadTrueResult(data));



@@ -204,7 +209,7 @@
      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

      }

		


      if ("all".equals(source)) {

         source = null;// 查询全部

      }