From feee16c2fe842ef452823d3f8ed95a39ad191ee6 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 10 十二月 2018 16:11:20 +0800
Subject: [PATCH] 分享记录来源查询
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 4f69a9a..18fc9c4 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
@@ -138,7 +138,7 @@
data.put("notifyDesc", configService.get("goods_share_notify"));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));
+ BigDecimal rate =hongBaoManageService.getFanLiRate();
UserShareGoodsHistory history = new UserShareGoodsHistory();
history.setTkCode(taoBaoLink.getTaoToken());
history.setLink(taoBaoLink.getClickUrl());
@@ -195,6 +195,10 @@
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
}
+
+ if ("all".equals(source)) {
+ source = null;// 鏌ヨ鍏ㄩ儴
+ }
try {
int pageSize = Constant.PAGE_SIZE;
--
Gitblit v1.8.0