|
|
@ -290,11 +290,11 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId));
|
|
|
|
res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
params.put("channel", "system");
|
|
|
|
params.put("channel", "system");
|
|
|
|
res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
|
|
|
|
res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
|
|
|
|
params.put("channel", "rpaypmt_card");
|
|
|
|
params.put("channel", "rpaypmt_card");
|
|
|
|
res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
|
|
|
|
res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
|
|
|
|
params.put("channel", "rpaypmt_dd");
|
|
|
|
params.put("channel", "rpaypmt_dd");
|
|
|
|
res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
|
|
|
|
res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
|
|
|
|
return res;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -870,7 +870,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
String clientType = device.getString("client_type");
|
|
|
|
String clientType = device.getString("client_type");
|
|
|
|
deviceSupport.findRegister(clientType);
|
|
|
|
deviceSupport.findRegister(clientType);
|
|
|
|
int clientId = device.getIntValue("client_id");
|
|
|
|
int clientId = device.getIntValue("client_id");
|
|
|
|
JSONObject client = clientManager.getClientInfo(9);
|
|
|
|
JSONObject client = clientManager.getClientInfo(clientId);
|
|
|
|
String timezoneClient = client.getString("timezone");
|
|
|
|
String timezoneClient = client.getString("timezone");
|
|
|
|
if (timezoneClient != null && !timezone.isEmpty()) {
|
|
|
|
if (timezoneClient != null && !timezone.isEmpty()) {
|
|
|
|
timezone = timezoneClient;
|
|
|
|
timezone = timezoneClient;
|
|
|
|