From d51d32310cc9c410c7a6827ce317188716a7953b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 02 七月 2019 09:42:06 +0800
Subject: [PATCH] 修改淘礼金提示语
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index c885a65..2c5b6b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1181,7 +1181,7 @@
// 鑾峰彇娴忚璁板綍
@RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
- public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) {
+ public void getScanHistory(AcceptData acceptData, String uid, int page, Integer source, PrintWriter out) {
if (page < 0) {
out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�0"));
return;
@@ -1193,10 +1193,13 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
+
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, source);
+
long count = scanHistoryV2Service.getCountByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), source);
+
JSONObject data = new JSONObject();
data.put("count", count);
JSONArray array = new JSONArray();
@@ -2234,7 +2237,7 @@
data.put("listTip", listText);
}
- spreadHongBao.setTip("褰撴棩棰嗗彇锛屼袱澶╁唴浣跨敤锛岃繃鏃舵棤鏁�");
+ spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁堛��");
goodsJson.put("spreadHongBao", spreadHongBao);
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
--
Gitblit v1.8.0