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