From 5d33ddc57dbb72c8eca70a94af71ca9cbda369cb Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 16 Dec 2018 10:09:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=8A=98=E6=89=A3=E7=8E=87=E4=BB=8E=E5=8D=83?= =?UTF-8?q?=E5=88=86=E4=B9=8B=E4=B8=80=E6=94=B9=E5=A4=96=E4=B8=87=E5=88=86?= =?UTF-8?q?=E4=B9=8B=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxMemController.java | 2 +- .../com/iformall/controller/WxMerchantBUserController.java | 2 +- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 +- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java index 618e432a4..74b8b70cf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -73,7 +73,7 @@ public class WxMemController extends BaseController { org.springframework.beans.BeanUtils.copyProperties(cUser, userVo); if (userVo.getScore() == null || userVo.getScore() == 0) { userVo.setLevelName("无"); - userVo.setDiscountRate(1000); // 无折扣 + userVo.setDiscountRate(10000); // 无折扣 } else { userVo.setLevelName("无"); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index b23a2128e..7dec8590c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -152,7 +152,7 @@ public class WxMerchantBUserController extends BaseController { curDiscountRate = merchant.getVipDiscountRate3(); } userVo.setDiscountRate(curDiscountRate); - userVo.setAmount(amount*curDiscountRate/1000); + userVo.setAmount(amount*curDiscountRate/10000); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 2eb216c5a..f256e48c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -50,7 +50,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 3. 扣减计算 Integer payment = cardInfo.getSaleAmount() * record.getDeductionAmount() / cardInfo.getAmount(); - Double dChargeFee = Math.ceil(payment * 1.0D * payAccount.getRate() / 1000); + Double dChargeFee = Math.ceil(payment * 1.0D * payAccount.getRate() / 10000); Integer real_payment = payment - dChargeFee.intValue(); // 4 insert card_spend diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 05dd24eb6..a5764a001 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -168,7 +168,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setShare(isShare.getCode()); if (isShare == EnumPayShare.YES) { // 分账金额 - Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 1000); + Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 10000); Integer share_amount = record.getPayAmount() - dChargeFee.intValue(); record.setShareAmount(share_amount); } @@ -429,7 +429,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setShare(isShare.getCode()); if (isShare == EnumPayShare.YES) { // 分账金额 - Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 1000); + Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 10000); Integer share_amount = record.getPayAmount() - dChargeFee.intValue(); record.setShareAmount(share_amount); if (share_amount <= 0) { @@ -1501,7 +1501,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { public static void main(String[] args) { Integer v = 50; Integer rate = 6; - Double dChargeFee = Math.ceil(v * 1.0D * 6 / 1000); + Double dChargeFee = Math.ceil(v * 1.0D * 6 / 10000); Integer share_amount = v - dChargeFee.intValue(); System.out.println("share value " + share_amount); }