From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
index 71c1eee..a8d4646 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
@@ -267,10 +267,10 @@
}
try {
previewInfoService.saveExtractRecord(uid, dayTime, money);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (PreviewInfoException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
@RequestMapping(value = "getExtractRecord")
@@ -286,7 +286,6 @@
list = new ArrayList<>();
JSONArray JSONArray = new JSONArray();
-
if (list.size() > 0) {
for (Extract extract : list) {
Date receiveTime = extract.getReceiveTime();
@@ -408,13 +407,8 @@
@RequestMapping(value = "saveMoneyArrival")
public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String dayTime,
String orderNo, PrintWriter out) {
- if (uid == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
try {
- String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo);
+ String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo, acceptData.getPlatform());
JSONObject object = new JSONObject();
object.put("link", link);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
@@ -422,7 +416,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("棰勮澶辫触"));
}
}
--
Gitblit v1.8.0