|
|
@ -1001,6 +1001,12 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
if ("CNY".equals(order.getString("currency"))) {
|
|
|
|
if ("CNY".equals(order.getString("currency"))) {
|
|
|
|
order.put("clearing_amount", order.getBigDecimal("total_amount"));
|
|
|
|
order.put("clearing_amount", order.getBigDecimal("total_amount"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if("ApsInStore".equalsIgnoreCase(order.getString("channel"))){
|
|
|
|
|
|
|
|
order.put("channel", "Alipay+");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if("ApsCashier".equalsIgnoreCase(order.getString("channel"))){
|
|
|
|
|
|
|
|
order.put("channel", "Alipay+(Online)");
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!dateContains.contains(tradeDate)) {
|
|
|
|
if (!dateContains.contains(tradeDate)) {
|
|
|
|
String reDate = tradeDate.replace("-", "");
|
|
|
|
String reDate = tradeDate.replace("-", "");
|
|
|
|
AppQueryBean dateQuery = new AppQueryBean();
|
|
|
|
AppQueryBean dateQuery = new AppQueryBean();
|
|
|
@ -3116,6 +3122,18 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
if (cardPaymentPay.containsKey("channel")) {
|
|
|
|
if (cardPaymentPay.containsKey("channel")) {
|
|
|
|
channels.add(cardPaymentPay);
|
|
|
|
channels.add(cardPaymentPay);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject apsInStore = getChannel(clientId, now, "ApsInStore");
|
|
|
|
|
|
|
|
if (apsInStore.containsKey("channel")) {
|
|
|
|
|
|
|
|
apsInStore.put("channel","Alipay+");
|
|
|
|
|
|
|
|
channels.add(apsInStore);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
JSONObject apsCashier = getChannel(clientId, now, "ApsCashier");
|
|
|
|
|
|
|
|
if (apsCashier.containsKey("channel")) {
|
|
|
|
|
|
|
|
apsCashier.put("channel","Alipay+(Online)");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
channels.add(apsCashier);
|
|
|
|
|
|
|
|
}
|
|
|
|
res.put("channels", channels);
|
|
|
|
res.put("channels", channels);
|
|
|
|
if (res.containsKey("rate_value")) {
|
|
|
|
if (res.containsKey("rate_value")) {
|
|
|
|
BigDecimal minRate = res.getBigDecimal("rate_value").add(BigDecimal.valueOf(0.01)).setScale(2, RoundingMode.DOWN);
|
|
|
|
BigDecimal minRate = res.getBigDecimal("rate_value").add(BigDecimal.valueOf(0.01)).setScale(2, RoundingMode.DOWN);
|
|
|
|