From b80d3e8f0f3f739d160a7393b830515350344328 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 7 Apr 2020 15:26:32 +0800 Subject: [PATCH 1/2] fix incremental surcharge rate --- .../tradelog/templates/partner_settlement_dialog.html | 10 +++++++--- .../partner_settlement_merge_settle_dialog.html | 8 +++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index af3dcc95c..16f3195f7 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -186,10 +186,14 @@ - {{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}% + {{(((tr.surcharge_rate * 100) > tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):tr.surcharge_rate)| number : 2}} + % + {{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}} - {{tr.source}}:{{(tr.rate_value) | number : 2}}% - {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}} + {{tr.source}}:{{(tr.rate_value) | number : 2}}% + 0.00% + {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}} + {{0.00 | currency:tr.currency}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html index d3bb5a488..fdf8621c0 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html @@ -190,10 +190,12 @@ - {{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}% + {{(((tr.surcharge_rate * 100) > tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):tr.surcharge_rate)| number : 2}}% {{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}} - {{tr.source}}:{{(tr.rate_value) | number : 2}}% - {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}} + {{tr.source}}:{{(tr.rate_value) | number : 2}}% + 0.00% + {{tr.source}}:{{tr.incremental_surcharge | currency:tr.currency}}{{0.00 | currency:tr.currency}} + {{0.00 | currency:tr.currency}} From aef3a80bbabe6c55482984a2d08f43f87ea4f4cd Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 7 Apr 2020 15:32:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add=20=E6=8E=A8=E9=80=81=E9=80=9A=E7=9F=A5t?= =?UTF-8?q?est?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../app_index/core/AppActService.java | 2 + .../core/impls/AppActServiceImp.java | 43 ++++++++++++++++++- .../app_index/web/AppActController.java | 14 +++--- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c7269bb24..9f93f7ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.31 + 1.4.32 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java index 0c19c46fa..2788d7340 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java @@ -26,4 +26,6 @@ public interface AppActService { void published(JSONObject manager,String act_id,boolean is_valid); void sendAnnualBillMessage(JSONObject params); + + void sendTESTAnnualBillMessage(JSONObject params); } diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java index 5bd61fb08..d042b7d33 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java @@ -137,7 +137,6 @@ public class AppActServiceImp implements AppActService { @Override public void sendAnnualBillMessage(JSONObject params) { - logger.debug("sendAnnualMessage Begin"); List tokens = clientDeviceTokenMapper.listAllTokens(params); for (JSONObject devToken : tokens) { @@ -183,6 +182,48 @@ public class AppActServiceImp implements AppActService { } } + @Override + public void sendTESTAnnualBillMessage(JSONObject params) { + logger.debug("sendAnnualMessage Begin"); + JSONObject devToken = clientDeviceTokenMapper.findByDevId("cf90a252-1121-4bfd-a201-fb573b44ac11"); + Runnable task = () -> { + String token = devToken.getString("token"); + JSONObject log = saveAppMessageLog(devToken.getString("dev_id"), + devToken.getIntValue("client_id"), + "annual_bill" + devToken.getString("client_type"), + token, + "年度账单" + ); + try { + JSONObject type = new JSONObject(); + type.put("send_type", "annual_bill"); + type.put("id", devToken.getString("dev_token_id")); + AppMsgSender sender = senderMap.get((devToken.getString("client_type"))); + if (StringUtils.isBlank(token) || sender == null) { + return; + } + JSONObject managerMsg = new JSONObject(); + managerMsg.put("title", LocaleSupport.localeMessage("app.message.title.annual_bill")); + managerMsg.put("body", LocaleSupport.localeMessage("app.message.body.annual_bill")); + managerMsg.put("type", type); + JSONObject messageData = new JSONObject(); + messageData.put("url", PlatformEnvironment.getEnv().concatUrl("/annual_bill.html")); + System.out.println(PlatformEnvironment.getEnv().concatUrl("/annual_bill.html")); + managerMsg.put("data", messageData); + managerMsg.put("msgType", "annual_bill"); + AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage(); + sender.sendMessage(appMessage, devToken); + log.put("status", 2); + appMessageLogMapper.update(log); + } catch (Exception e) { + logger.error("出错了：" + e.getMessage()); + appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); + throw new ServerErrorException("Send App" + devToken.getString("client_type") + "Filed" + ",token" + token, e); + } + }; + sendingAppleMsgPool.execute(task); + } + private JSONObject saveAppMessageLog(String dev_id, int client_id, String messageType, String dev_token, String remark) { JSONObject log = new JSONObject(); log.put("dev_id", dev_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java index c104c4694..e42411c2f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java @@ -7,10 +7,8 @@ import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.utils.PageListUtils; - import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageList; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -50,13 +48,13 @@ public class AppActController { public String testSendAnnualBillMessage() { JSONObject params = new JSONObject(); params.put("client_id", 9); - appActService.sendAnnualBillMessage(params); + appActService.sendTESTAnnualBillMessage(params); return "success"; } - @GetMapping(value = "/annual/bill/all") - public String sendAnnualBillMessage() { - appActService.sendAnnualBillMessage(null); - return "success"; - } +// @GetMapping(value = "/annual/bill/all") +// public String sendAnnualBillMessage() { +// appActService.sendAnnualBillMessage(null); +// return "success"; +// } }