|
|
|
@@ -769,9 +769,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
Integer realSubsidyFee = subsidyNum - iSubChargeFee; |
|
|
|
|
|
|
|
WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(), couponOrder.getTenantId()); |
|
|
|
WxComposeChildOrderPrice price = orderAdapterService.getChildOrderPrice(coupon, false, order.getOrderGroupId(), order.getCouponNumber()); |
|
|
|
int iPriceChargeFee = OrderHelper.getMallCharge(price.getRealPayMent(), payAccount); |
|
|
|
Integer realPayment = price.getRealPayMent() - iPriceChargeFee; |
|
|
|
int iPriceChargeFee = OrderHelper.getMallCharge(coupon.getSalePrice(), payAccount); |
|
|
|
Integer realPayment = coupon.getSalePrice() - iPriceChargeFee; |
|
|
|
|
|
|
|
WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); |
|
|
|
merchantSubsidy.setId(idWorker.nextId()); |
|
|
|
@@ -781,8 +780,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
merchantSubsidy.setMerchantId(merchantId); |
|
|
|
merchantSubsidy.setCouponOrderId(couponOrder.getId()); |
|
|
|
merchantSubsidy.setCouponType(couponOrder.getCouponType()); |
|
|
|
merchantSubsidy.setOrderPayment(price.getRealPayMent()); |
|
|
|
merchantSubsidy.setReceiverPayment(price.getRealPayMent()); |
|
|
|
merchantSubsidy.setOrderPayment(coupon.getPrice()); |
|
|
|
merchantSubsidy.setReceiverPayment(coupon.getSalePrice()); |
|
|
|
merchantSubsidy.setRealPayment(realPayment); |
|
|
|
merchantSubsidy.setSubsidy(subsidyNum); |
|
|
|
merchantSubsidy.setRealSubsidy(realSubsidyFee); |
|
|
|
@@ -1526,21 +1525,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
payOrder.setShare(EnumPayShare.NO.getCode()); |
|
|
|
} |
|
|
|
|
|
|
|
//设置子订单分账金额 |
|
|
|
Map<String,WxComposeChildOrderShare> childShares = new HashMap<String,WxComposeChildOrderShare>(); |
|
|
|
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrder.getComposeOrderType()); |
|
|
|
List<WxOrder> orderList = orderAdapterService.getChildOrders(composeOrder, appInfo.getTenantId()); |
|
|
|
if (null != orderList && orderList.size() > 0) { |
|
|
|
for (WxOrder o : orderList) { |
|
|
|
WxCoupon coupon = wxCouponMapper.selectById(o.getProductId(), appInfo.getTenantId()); |
|
|
|
WxComposeChildOrderPrice price = orderAdapterService.getChildOrderPrice(coupon, false, o.getOrderGroupId(), o.getCouponNumber()); |
|
|
|
int orderMallCharge = OrderHelper.getMallCharge(price.getRealPayMent(), payAccount); |
|
|
|
Integer orderShareAmount = price.getRealPayMent() - orderMallCharge; |
|
|
|
Integer orderRateAmount = PayUtils.getPayRate(price.getRealPayMent(), payAccount.getRealRate(), true); |
|
|
|
childShares.put(String.valueOf(o.getId()), new WxComposeChildOrderShare(price.getRealPayMent(), orderShareAmount, orderRateAmount)); |
|
|
|
} |
|
|
|
payOrder.setChildOrderShare(JSON.toJSONString(childShares)); |
|
|
|
} |
|
|
|
} |
|
|
|
payOrder.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); |
|
|
|
payOrder.setPosPayOrderId(couponOrder.getId()); |
|
|
|
|