diff --git 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 index 79fa5cc5f..c5bfc7afb 100644 --- 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 @@ -268,7 +268,14 @@ public class TradeLogServiceImpl implements TradeLogService { add(query.getGatewayChild()); }}); } - PageList logs = orderMapper.listIncrementalOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc"))); + PageList logs = orderMapper.listIncrementalOrdersNew(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc"))); + logs.stream().forEach(log->{ + JSONObject client= clientManager.getClientInfo(log.getInteger("client_id")); + if(client!=null){ + log.put("short_name",client.getString("short_name")); + log.put("client_moniker",client.getString("client_moniker")); + }; + }); JSONObject result = PageListUtils.buildPageListResult(logs); JSONObject analysis = orderMapper.analysisOrders(params); result.put("analysis", analysis); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 3b8b093d4..68d95eb60 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -144,6 +144,7 @@ SELECT + o.client_id, o.order_id order_id, format(o.total_amount * 100, 0) total_fee, format(o.customer_payment_amount * 100, 0) real_fee, diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 615e759db..1059dc790 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -150,7 +150,13 @@ System | RP跨境商城 + ng-click="params.source='RP跨境商城';loadTradeLogs(1)">RP跨境商城| + Shopify| + 商服拼团| + 商服接龙