修改退款逻辑

This commit is contained in:
韩鹏辉
2023-08-30 15:46:22 +08:00
parent d5225c65e6
commit 9e9aa93f00

View File

@@ -556,7 +556,6 @@ public class MerchantOrderController {
merchantOrder.setStoreName("尖愁");
merchantOrder.setTransDt(new Date());
merchantOrder.setCreateDt(new Date());
merchantOrder.setAisleSwitch("1");
merchantOrder.setStatus("1");
//BigDecimal e=new BigDecimal(merchantOrder.getConsumeFee()).subtract(new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN);
@@ -565,7 +564,7 @@ public class MerchantOrderController {
BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(merchantOrder.getConsumeFee()));
BigDecimal subtract1 = bigDecimal1.subtract(bigDecimal);
merchantOrder.setEnterFee(subtract1.doubleValue());
merchantOrder.setAisleSwitch("0");
merchantOrder.setAisleSwitch("1");
merchantOrder.setRate(new BigDecimal("38.00"));
merchantOrder.setSettlementType(1);
merchantOrder.setChannelRate(new BigDecimal("21.00"));