From d174ab82cbe0a18dbca6a5956a90f73c8aca54bb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 09:44:08 +0800
Subject: [PATCH] 动态分享修改返回参数

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 1735dd6..7021951 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/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());
@@ -158,6 +161,8 @@
 			history.setUser(new UserInfo(uid));
 			history.setPostPicture(taoBaoLink.getGoods().getPictUrl());
 
+			data.put("shareMoney","楼"+ history.getHongbao().toString());
+
 			out.print(JsonUtil.loadTrueResult(data));
 
 			// 寮傛鎿嶄綔
@@ -166,11 +171,6 @@
 				@Override
 				public void run() {
 					shareGoodsService.addShareGoodsHistory(history);
-					try {
-						userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, null,taoBaoLink.getGoods());
-					} catch (UserShareGoodsRecordException e) {
-						e.printStackTrace();
-					}
 				}
 			});
 			return;
@@ -204,7 +204,7 @@
 		if (uid == null) {
 			out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
 		}
-		
+
 		if ("all".equals(source)) {
 			source = null;// 鏌ヨ鍏ㄩ儴
 		}

--
Gitblit v1.8.0