Przeglądaj źródła

[储值卡][新增]:折扣率从千分之一改外万分之一

release_toaliyun_real
Stormeye Wu 7 lat temu
rodzic
commit
5d33ddc57d
4 zmienionych plików z 6 dodań i 6 usunięć
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  4. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java Wyświetl plik

@@ -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("无");



+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Wyświetl plik

@@ -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);
}
}



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Wyświetl plik

@@ -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


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Wyświetl plik

@@ -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);
}


Ładowanie…
Anuluj
Zapisz