diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 2b7ddb9..dd75a31 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -557,7 +557,13 @@ public class MerchantOrderController { merchantOrder.setTransDt(new Date()); merchantOrder.setCreateDt(new Date()); merchantOrder.setStatus("1"); - merchantOrder.setEnterFee(merchantOrder.getConsumeFee()-(merchantOrder.getConsumeFee()*0.0038)); + //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); + + BigDecimal bigDecimal = new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal subtract = new BigDecimal(merchantOrder.getConsumeFee()).subtract(bigDecimal); + BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(merchantOrder.getConsumeFee())); + BigDecimal subtract1 = bigDecimal1.subtract(bigDecimal); + merchantOrder.setEnterFee(subtract1.doubleValue()); merchantOrder.setAisleSwitch("0"); merchantOrder.setRate(new BigDecimal("38.00")); merchantOrder.setSettlementType(1); @@ -578,12 +584,12 @@ public class MerchantOrderController { } public static void main(String[] args) { - Double a = 1000.00D; - Double s = 0.0038; - double v = a * s; - System.out.println("利率"+v); - double v1 = a - (a * s); - System.out.println("剩余"+v1); + BigDecimal s = new BigDecimal("0.0038"); + BigDecimal a = new BigDecimal("77.77"); + BigDecimal multiply = s.multiply(a).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal bigDecimal = a.subtract(multiply).setScale(2, BigDecimal.ROUND_DOWN); + System.out.println(multiply); + System.out.println(bigDecimal); } /** diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java index c2d81d2..2d11bbc 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.crypto.SecureUtil; import cn.hutool.json.JSONUtil; import cn.pluss.platform.IdCardService; import cn.pluss.platform.PushService; +import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService; import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService; import cn.pluss.platform.activityRecharge.ActivityRechargeService; import cn.pluss.platform.api.PageInfo; @@ -225,6 +226,8 @@ public class MerchantOrderServiceImpl extends ServiceImpl impl break; case "4": // 银盛 - //ysAuditServiceV2.merchantAudit(userId, false); + //ysAuditServiceV2.merchantAudiRt(userId, false); ysAuditServiceV3.merchantAuditV3(userId, false, 4); break; case "5":