Merge remote-tracking branch 'origin/master'

6 years ago · ee1568cb7a
parent 02687a1263 b9398f2cfa
commit ee1568cb7a
3 changed files with 10 additions and 8 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@ -479,12 +479,14 @@ public class TradeLogServiceImpl implements TradeLogService {
        clientManager.validateClients(client_id, params);
        params.put("client_id", client_id);
        List<JSONObject> logs = transactionMapper.listTransFlow(params);
-        logs.stream().forEach(p -> {
-            String login_id = p.getString("login_id");
-            if (StringUtils.isNotEmpty(login_id)) {
-                p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")");
-            }
-        });
+        if (client_id!=1563){
+            logs.stream().forEach(p -> {
+                String login_id = p.getString("login_id");
+                if (StringUtils.isNotEmpty(login_id)) {
+                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")");
+                }
+            });
+        }
        TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time"));

        final JSONObject analysis = analysisTransLogs(logs);
--- a/src/main/ui/all_locations.html
+++ b/src/main/ui/all_locations.html
@ -22,7 +22,7 @@
 <!--<script async defer src="http://maps.google.cn/maps/api/js?key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&callback=initMap"-->
        <!--type="text/javascript"></script>-->
 <script async defer
-src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&region=aus&language=zh-CN&callback=initMap"
+src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDUu6qXRV-j24rSdbPOMfVdTN1-2OfC2o8&region=aus&language=zh-CN&callback=initMap"
 type="text/javascript"></script>
 <script>
    var industryLabel = {
--- a/src/main/ui/one_locations.html
+++ b/src/main/ui/one_locations.html
@ -42,7 +42,7 @@
 <body>
 <input id="pac-input" hidden class="controls" type="text" placeholder="Search Merchant Location">
 <div id="map"></div>
-<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&libraries=places"
+<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDUu6qXRV-j24rSdbPOMfVdTN1-2OfC2o8&libraries=places"
        type="text/javascript"></script>

 <!--<script src="http://maps.google.cn/maps/api/js?sensor=true&key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&region=aus&language=zh-CN"-->