流水加source

master
dalong306 3 years ago
parent 8a1aea2905
commit b204b90473

@ -268,7 +268,14 @@ public class TradeLogServiceImpl implements TradeLogService {
add(query.getGatewayChild());
}});
}
PageList<JSONObject> logs = orderMapper.listIncrementalOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
PageList<JSONObject> 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);

@ -144,6 +144,7 @@
</sql>
<sql id="gateway_keys_2">
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,

@ -150,7 +150,13 @@
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='RP跨境商城'}"
ng-click="params.source='RP跨境商城';loadTradeLogs(1)">RP跨境商城</a>
ng-click="params.source='RP跨境商城';loadTradeLogs(1)">RP跨境商城</a>|
<a role="button" ng-class="{'bg-primary':params.source=='Shopify'}"
ng-click="params.source='Shopify';loadTradeLogs(1)">Shopify</a>|
<a role="button" ng-class="{'bg-primary':params.source=='商服拼团'}"
ng-click="params.source='商服拼团';loadTradeLogs(1)">商服拼团</a>|
<a role="button" ng-class="{'bg-primary':params.source=='商服接龙'}"
ng-click="params.source='商服接龙';loadTradeLogs(1)">商服接龙</a>
</p>
</div>
</div>

Loading…
Cancel
Save