diff --git a/pom.xml b/pom.xml index f050b2b8f..0d662731f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.56 + 2.3.57 UTF-8 2.4.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index c0cee2321..310aaacc6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -31,6 +31,7 @@ import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; +import au.com.royalpay.payment.tools.exceptions.ServerErrorException; import au.com.royalpay.payment.tools.locale.LocaleSupport; import au.com.royalpay.payment.tools.lock.Locker; import au.com.royalpay.payment.tools.merchants.beans.BalanceGroup; @@ -1469,9 +1470,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider } } } catch (IOException e) { - logger.error("生成excel字节数组发生错误"); + logger.error("生成excel字节数组发生错误", e); + throw new ServerErrorException("IOError", e); } catch (URISyntaxException e) { - logger.error("调用服务发送邮件时错误"); + logger.error("调用服务发送邮件时错误", e); + throw new ServerErrorException("IOError", e); } result.put("result", 0); result.put("msg", "已发送"); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 9fc3bf234..b6d1437a9 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -938,11 +938,11 @@ t.channel, t.surcharge_rate, t.transaction_time, - if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount) clearing_amount, - if(t.transaction_type = 'Credit', t.total_surcharge, -t.total_surcharge) total_surcharge, - if(t.transaction_type = 'Credit', t.transaction_fee, -t.transaction_fee) transaction_fee, - if(t.transaction_type = 'Credit', t.channel_surcharge, -t.channel_surcharge) channel_surcharge, - if(t.transaction_type = 'Credit', t.settle_amount, -t.settle_amount) settle_amount, + IF( t.transaction_type = 'Credit', t.clearing_amount,-(if(t.clearing_amount>=0,t.clearing_amount, - t.clearing_amount))) clearing_amount, + IF( t.transaction_type = 'Credit', t.total_surcharge, -(if(t.total_surcharge>=0,t.total_surcharge, - t.total_surcharge))) total_surcharge, + IF( t.transaction_type = 'Credit', t.transaction_fee, -(if(t.transaction_fee>=0,t.transaction_fee, - t.transaction_fee))) transaction_fee, + IF( t.transaction_type = 'Credit', t.channel_surcharge, - (if(t.channel_surcharge>=0,t.channel_surcharge, - t.channel_surcharge))) channel_surcharge, + IF( t.transaction_type = 'Credit', t.settle_amount, - (if(t.settle_amount>=0,t.settle_amount, - t.settle_amount)) ) settle_amount, t.order_id, t.org_rate, t.surcharge_cashback,