This commit is contained in:
墨大叔 2024-09-09 16:56:29 +08:00
parent 7563bde2bc
commit 3c83165a93
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ public class ApiTestV2 extends BaseController {
public AjaxResult testPay() throws Exception {
String reqsn = String.valueOf(System.currentTimeMillis());
Map<String, String> map = service.pay(1, reqsn, "W01", "标题", "备注", "", "123", "https://test.allinpaygd.com/JWeb/NotifyServlet", "", "", "", "", "", "", "", "", "", "", "", "");
Map<String, String> map = service.pay(1, reqsn, "W06", "标题", "备注", "ol5kD7eeXNGeYE5z7uIhk12K-rBA", "123", "https://test.allinpaygd.com/JWeb/NotifyServlet", "", "", "", "", "", "", "", "", "", "", "", "");
return success(map);
}
}

View File

@ -292,7 +292,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
BigDecimal serviceCharge = serviceRate.multiply(order.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
// 最低服务费
BigDecimal minService = sysConfigService.getBigDecimal(ConfigKey.RECHARGE_MIN_SERVICE);
ServiceUtil.assertion(serviceCharge.compareTo(minService) < 0, "当前套餐金额小于最低服务费,请联系商户处理");
ServiceUtil.assertion(order.getMoney().compareTo(minService) < 0, "当前套餐金额小于最低服务费,请联系商户处理");
order.setServiceCharge(serviceCharge);
// 商户最终到账的金额 = 交易金额 - 服务费
order.setArrivalAmount(order.getMoney().subtract(serviceCharge));