|
|
@@ -1138,11 +1138,11 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
} else { |
|
|
} else { |
|
|
// 未开启分账 |
|
|
// 未开启分账 |
|
|
Integer orderRealPayMent = payOrder.getChildOrderShare(order.getId()).getRealPayMent(); |
|
|
Integer orderRealPayMent = payOrder.getChildOrderShare(order.getId()).getRealPayMent(); |
|
|
fee = OrderHelper.getMallCharge(orderRealPayMent, payAccountQ); |
|
|
|
|
|
|
|
|
fee = OrderHelper.getMallCharge(orderRealPayMent, payAccount); |
|
|
Integer shareAmount = orderRealPayMent - fee; |
|
|
Integer shareAmount = orderRealPayMent - fee; |
|
|
cardInfo.setShareFeeAmount(shareAmount); |
|
|
cardInfo.setShareFeeAmount(shareAmount); |
|
|
cardInfo.setRemainingShareFeeAmount(shareAmount); |
|
|
cardInfo.setRemainingShareFeeAmount(shareAmount); |
|
|
cardInfo.setRateAmount(OrderHelper.getRateAmount(orderRealPayMent, fee, payAccountQ)); |
|
|
|
|
|
|
|
|
cardInfo.setRateAmount(OrderHelper.getRateAmount(orderRealPayMent, fee, payAccount)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
|