Merge branch 'develop'

master
taylor.dang 6 years ago
commit 267c2526d2

@ -167,42 +167,6 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
dayInfo.put("t1", 0); dayInfo.put("t1", 0);
} }
List<JSONObject> 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<JSONObject> 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<JSONObject> 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<JSONObject> tencentSettle = platformSettlementMapper.findBySettleDate(new Date(maxDays.getDate("date_str").getTime() - 86400000L), "Wechat"); List<JSONObject> tencentSettle = platformSettlementMapper.findBySettleDate(new Date(maxDays.getDate("date_str").getTime() - 86400000L), "Wechat");
if (tencentSettle != null && tencentSettle.size()>0) { if (tencentSettle != null && tencentSettle.size()>0) {
for (JSONObject logs : tencentSettle) { for (JSONObject logs : tencentSettle) {
@ -239,6 +203,42 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
} }
List<JSONObject> 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<JSONObject> 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<JSONObject> 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 //T3
maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1); maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1);
end_date = maxDays.getString("date_str"); end_date = maxDays.getString("date_str");

@ -104,7 +104,7 @@ $(function () {
$(window.coupons).each(function () { $(window.coupons).each(function () {
price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons); 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); dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR);
var rate = 'CNY' == window.currency ? 1 : exchangeRate; var rate = 'CNY' == window.currency ? 1 : exchangeRate;
var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_HALF_UP); var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_HALF_UP);
@ -205,6 +205,7 @@ $(function () {
$('<p></p>').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd); $('<p></p>').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd);
if (parseFloat(dataCache.customSurcharge) > 0) { if (parseFloat(dataCache.customSurcharge) > 0) {
$('<p></p>').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.customSurcharge).appendTo(bd); $('<p></p>').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.customSurcharge).appendTo(bd);
$('<p></p>').addClass('warning-sm').html('温馨提示:商户将向您收取本次消费手续费' + window.rateValue + '%').appendTo(bd);
} }
$(dataCache.discounts).each(function () { $(dataCache.discounts).each(function () {
$('<p></p>').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); $('<p></p>').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd);

@ -12,7 +12,12 @@ body {
div, span, p, ul, li { div, span, p, ul, li {
box-sizing: border-box; box-sizing: border-box;
} }
.warning-sm{
color:red;
font-size:10px;
transform-origin: left;
transform: scale(0.8);
}
.ff.key { .ff.key {
position: relative; position: relative;
} }

@ -13,7 +13,12 @@ body {
div, span, p, ul, li { div, span, p, ul, li {
box-sizing: border-box; box-sizing: border-box;
} }
.warning-sm{
color:red;
font-size:10px;
transform-origin: left;
transform: scale(0.8);
}
.weui_grid { .weui_grid {
padding: 7px; padding: 7px;
height: 53px; height: 53px;

@ -13,7 +13,12 @@ body {
div, span, p, ul, li { div, span, p, ul, li {
box-sizing: border-box; box-sizing: border-box;
} }
.warning-sm{
color:red;
font-size:10px;
transform-origin: left;
transform: scale(0.8);
}
.ff.key { .ff.key {
position: relative; position: relative;
} }

Loading…
Cancel
Save