Parcourir la source

Merge tag 'refs/tags/jenkins-back-end-2942' into release

dev
release_toaliyun_real
Stormeye Wu il y a 6 ans
Parent
révision
2e3cf5b51c
2 fichiers modifiés avec 7 ajouts et 1 suppressions
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Voir le fichier

@@ -714,7 +714,11 @@ public class WxOrderServiceImpl implements WxOrderService {
} catch (Exception e) {
logger.error("payOrder not found:" + e.getMessage());
}
fee = payOrder.getPayAmount() - payOrder.getShareAmount();
if (payOrder.getShareAmount() != null) {
fee = payOrder.getPayAmount() - payOrder.getShareAmount();
} else {
fee = payOrder.getPayAmount();
}
cardInfo.setTransactionId(payOrder.getTransactionId());
cardInfo.setShareFeeAmount(payOrder.getShareAmount());
cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Voir le fichier

@@ -226,6 +226,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode());
record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
record.setShare(isShare.getCode());
record.setShareAmount(0); // 不分账时,默认设为0
record.setRateAmount(0); // 不分账时,默认设为0
if (isShare == EnumPayShare.YES) {
// 分账金额
int iChargeFee = PayUtils.getPayRate(record.getPayAmount(), payAccount.getRate(), false);


Chargement…
Annuler
Enregistrer