From dc73adfa9d92d11d1a8512778deacc34fa877eef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 14:41:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 076deeb..3fab29c 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));
// 寮傛鎿嶄綔
@@ -167,7 +172,7 @@
public void run() {
shareGoodsService.addShareGoodsHistory(history);
try {
- userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, taoBaoLink.getGoods());
+ userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, null,taoBaoLink.getGoods());
} catch (UserShareGoodsRecordException e) {
e.printStackTrace();
}
@@ -203,6 +208,10 @@
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ }
+
+ if ("all".equals(source)) {
+ source = null;// 鏌ヨ鍏ㄩ儴
}
try {
@@ -242,7 +251,7 @@
}
try {
- JSONObject data = userShareGoodsGroupService.getGoodsGroup(recordId);
+ JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
--
Gitblit v1.8.0