From afc74060eabb050c028f6e991170331b1d71da0b Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 11:21:04 +0800 Subject: [PATCH 1/3] add bd_leader <- clearing modules --- src/main/ui/manage.html | 4 ++-- src/main/ui/static/menu/templates/main_menu.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index a9fa07fc1..58b2a0e7b 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -465,7 +465,7 @@ margin-bottom: 10%;"/> -
  • +

  • 清算管理|Settlement @@ -489,7 +489,7 @@ margin-bottom: 10%;"/>

    • -
  • +
  • 清算预估|Estimate diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index f5688bc29..01360cbd5 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -741,7 +741,7 @@ -
    +
    @@ -786,7 +786,7 @@
    -
    +
    From b9d02da2cb4199cb06b76dd36de10dfce53cb97d Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 31 Oct 2018 13:52:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=94=B6=E5=8F=96?= =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/templates/alipay/v1/payment.js | 3 ++- src/main/ui/static/templates/payment/payment.css | 7 ++++++- src/main/ui/static/templates/payment/v1/payment.css | 7 ++++++- src/main/ui/static/templates/payment/v2/payment.css | 7 ++++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/templates/alipay/v1/payment.js b/src/main/ui/static/templates/alipay/v1/payment.js index 9c78ea26e..f9597c703 100644 --- a/src/main/ui/static/templates/alipay/v1/payment.js +++ b/src/main/ui/static/templates/alipay/v1/payment.js @@ -104,7 +104,7 @@ $(function () { $(window.coupons).each(function () { price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons); }); - dataCache.customSurcharge = new Decimal(price).sub(realPrice).toFixed(2,Decimal.ROUND_HALF_UP); + dataCache.customSurcharge = new Decimal(price).sub(realPrice).toFixed(2, Decimal.ROUND_HALF_UP); dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR); var rate = 'CNY' == window.currency ? 1 : exchangeRate; var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_HALF_UP); @@ -205,6 +205,7 @@ $(function () { $('

    ').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd); if (parseFloat(dataCache.customSurcharge) > 0) { $('

    ').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.customSurcharge).appendTo(bd); + $('

    ').addClass('warning-sm').html('温馨提示：商户将向您收取本次消费手续费' + window.rateValue + '%').appendTo(bd); } $(dataCache.discounts).each(function () { $('

    ').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); diff --git a/src/main/ui/static/templates/payment/payment.css b/src/main/ui/static/templates/payment/payment.css index 9d13e26d0..ad4a54769 100644 --- a/src/main/ui/static/templates/payment/payment.css +++ b/src/main/ui/static/templates/payment/payment.css @@ -12,7 +12,12 @@ body { div, span, p, ul, li { box-sizing: border-box; } - +.warning-sm{ + color:red; + font-size:10px; + transform-origin: left; + transform: scale(0.8); +} .ff.key { position: relative; } diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css index 73c482eed..cfd6a7e78 100644 --- a/src/main/ui/static/templates/payment/v1/payment.css +++ b/src/main/ui/static/templates/payment/v1/payment.css @@ -13,7 +13,12 @@ body { div, span, p, ul, li { box-sizing: border-box; } - +.warning-sm{ + color:red; + font-size:10px; + transform-origin: left; + transform: scale(0.8); +} .weui_grid { padding: 7px; height: 53px; diff --git a/src/main/ui/static/templates/payment/v2/payment.css b/src/main/ui/static/templates/payment/v2/payment.css index 9564c3027..96b4cd7d4 100644 --- a/src/main/ui/static/templates/payment/v2/payment.css +++ b/src/main/ui/static/templates/payment/v2/payment.css @@ -13,7 +13,12 @@ body { div, span, p, ul, li { box-sizing: border-box; } - +.warning-sm{ + color:red; + font-size:10px; + transform-origin: left; + transform: scale(0.8); +} .ff.key { position: relative; } From 108557b00c85b05418120e1f0eafbc321cae953e Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Wed, 31 Oct 2018 14:07:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=85=E7=AE=97=E9=A2=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impls/EstimateAnalysisServiceImpl.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java index 9521c1680..c12c98bcb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java @@ -167,42 +167,6 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { dayInfo.put("t1", 0); } - List hfSettle = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "hf"); - if (hfSettle !=null && hfSettle.size()>0) { - for (JSONObject logs : hfSettle) { - dayInfo.put("hfSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); - dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("hfSettleFee_" + logs.getString("merchants"))); - } - }else { - dayInfo.put("platformGetSettleFee",BigDecimal.ZERO); - } - - List alipaySettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "Alipay"); - for (JSONObject logs : alipaySettleLogs) { - dayInfo.put("aliSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); - dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants")))); - } - - List alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline"); - logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString()); - for (JSONObject logs : alipayOnlineSettleLogs) { - dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); - dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); - } - cleanDays.clear(); - - //T2 - maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1); - end_date = maxDays.getString("date_str"); - cleanDays = estimateAnalysisMapper.findLastCleanDays(start_date, 1); - start_date = cleanDays.getString("date_str"); - JSONObject totalAmountT2 = estimateAnalysisMapper.findAllTransactionByDate(start_date, end_date, t2client); - if (totalAmountT2 != null) { - dayInfo.put("t2", totalAmountT2.getBigDecimal("total_amount")); - } else { - dayInfo.put("t2", 0); - } - List tencentSettle = platformSettlementMapper.findBySettleDate(new Date(maxDays.getDate("date_str").getTime() - 86400000L), "Wechat"); if (tencentSettle != null && tencentSettle.size()>0) { for (JSONObject logs : tencentSettle) { @@ -239,6 +203,42 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { } + List hfSettle = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "hf"); + if (hfSettle !=null && hfSettle.size()>0) { + for (JSONObject logs : hfSettle) { + dayInfo.put("hfSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); + dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("hfSettleFee_" + logs.getString("merchants"))); + } + }else { + dayInfo.put("platformGetSettleFee",BigDecimal.ZERO); + } + + List alipaySettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "Alipay"); + for (JSONObject logs : alipaySettleLogs) { + dayInfo.put("aliSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); + dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants")))); + } + + List alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline"); + logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString()); + for (JSONObject logs : alipayOnlineSettleLogs) { + dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); + dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); + } + cleanDays.clear(); + + //T2 + maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1); + end_date = maxDays.getString("date_str"); + cleanDays = estimateAnalysisMapper.findLastCleanDays(start_date, 1); + start_date = cleanDays.getString("date_str"); + JSONObject totalAmountT2 = estimateAnalysisMapper.findAllTransactionByDate(start_date, end_date, t2client); + if (totalAmountT2 != null) { + dayInfo.put("t2", totalAmountT2.getBigDecimal("total_amount")); + } else { + dayInfo.put("t2", 0); + } + //T3 maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1); end_date = maxDays.getString("date_str");