eason.qian 7 years ago
parent e6e4ced9a0
commit ece7015c13

@ -245,9 +245,9 @@ public class RetailAppServiceImp implements RetailAppService {
String clientType = device.getString("client_type");
deviceSupport.findRegister(clientType);
JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id")));
res.put("is_skip_clearing",res.getBoolean("skip_clearing"));
res.put("is_skip_clearing", res.getBoolean("skip_clearing"));
if (clientType.equals("iphone")) {
res.put("skip_clearing",!res.getBoolean("skip_clearing"));
res.put("skip_clearing", !res.getBoolean("skip_clearing"));
}
return res;
}
@ -309,6 +309,7 @@ public class RetailAppServiceImp implements RetailAppService {
params.put("client_id", client_id);
PageList<JSONObject> logs = clearingDetailMapper.listClientSettlementLog(params,
new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("report_date.desc")));
logs.forEach(log -> log.put("total_charge",log.getBigDecimal("total_charge").add(log.getBigDecimal("tax_amount"))));
return PageListUtils.buildPageListResult(logs);
}
@ -329,6 +330,7 @@ public class RetailAppServiceImp implements RetailAppService {
List<JSONObject> channels = clearingDetailAnalysisMapper.listReportChannels(String.valueOf(clearing_detail_id));
JSONObject channelsObj = new JSONObject();
for (JSONObject channel : channels) {
channel.put("total_charge",channel.getBigDecimal("total_charge").add(channel.getBigDecimal("tax_amount")));
channelsObj.put(channel.getString("channel"), channel);
}
List<JSONObject> credit = new ArrayList<>();
@ -459,8 +461,8 @@ public class RetailAppServiceImp implements RetailAppService {
break;
}
Calendar calendar = (Calendar) order.get("transaction_time");
String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd",calendar.getTimeZone());
String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss",calendar.getTimeZone());
String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone());
String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone());
order.put("trade_date", trade_date);
order.put("trade_time", trade_time);
// todo
@ -1407,8 +1409,8 @@ public class RetailAppServiceImp implements RetailAppService {
}
@Override
public void changeManualSettle(JSONObject device,boolean manual_settle) {
clientManager.changeManualSettle(device.getIntValue("client_id"),manual_settle,device.getString("account_id"),1,"商户修改手动清算配置");
public void changeManualSettle(JSONObject device, boolean manual_settle) {
clientManager.changeManualSettle(device.getIntValue("client_id"), manual_settle, device.getString("account_id"), 1, "商户修改手动清算配置");
}

Loading…
Cancel
Save