|
|
|
@@ -193,46 +193,46 @@ public class CouponOrderExpiringSchedule { |
|
|
|
} |
|
|
|
|
|
|
|
if (co.getAutoRefund().equals(EnumCouponAutoRefund.UNSUPPORTED.getCode())){ |
|
|
|
// 不设退款,只能走微信分账-分账完结,把钱给分给商场 |
|
|
|
try { |
|
|
|
WxPayOrder wxPayOrder = new WxPayOrder(); |
|
|
|
wxPayOrder.updateTenantInfo(co); |
|
|
|
// Long orderId = co.getOrderId(); |
|
|
|
// if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { |
|
|
|
// orderId = co.getComposeOrderId(); |
|
|
|
//todo 过期不退款 不设解冻(30天自动解冻)--不会抽取任何费用 |
|
|
|
// try { |
|
|
|
// WxPayOrder wxPayOrder = new WxPayOrder(); |
|
|
|
// wxPayOrder.updateTenantInfo(co); |
|
|
|
//// Long orderId = co.getOrderId(); |
|
|
|
//// if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { |
|
|
|
//// orderId = co.getComposeOrderId(); |
|
|
|
//// } |
|
|
|
// wxPayOrder.setOrderId(co.getComposeOrderId()); |
|
|
|
// wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
// wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); |
|
|
|
// |
|
|
|
// if (wxPayOrder != null) { |
|
|
|
// WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); |
|
|
|
// wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); |
|
|
|
// wxSharingOrderDto.setMerchantId(0L); |
|
|
|
// wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); |
|
|
|
// wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); |
|
|
|
// wxSharingOrderDto.setOrderId(wxPayOrder.getId()); |
|
|
|
// wxSharingOrderDto.setSingleOrderId(co.getOrderId()); |
|
|
|
// wxSharingOrderDto.setSingleOrderAmount(co.getCouponPrice()); |
|
|
|
// wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); |
|
|
|
// wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); |
|
|
|
// wxSharingOrderDto.updateTenantInfo(wxPayOrder); |
|
|
|
// wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); |
|
|
|
// WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(co.getOrderId()); |
|
|
|
// if (share.getRateAmount() != null) { |
|
|
|
// // 实际分账金额为 分账金额 + 通道费差 |
|
|
|
// wxSharingOrderDto.setMerchantShareAmount(share.getShareAmount()+share.getRateAmount()); |
|
|
|
// } else { |
|
|
|
// // 未设置通道费差 |
|
|
|
// wxSharingOrderDto.setMerchantShareAmount(share.getShareAmount()); |
|
|
|
// } |
|
|
|
// wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto,wxPayOrder); |
|
|
|
// } |
|
|
|
wxPayOrder.setOrderId(co.getComposeOrderId()); |
|
|
|
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); |
|
|
|
|
|
|
|
if (wxPayOrder != null) { |
|
|
|
WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); |
|
|
|
wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); |
|
|
|
wxSharingOrderDto.setMerchantId(0L); |
|
|
|
wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); |
|
|
|
wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); |
|
|
|
wxSharingOrderDto.setOrderId(wxPayOrder.getId()); |
|
|
|
wxSharingOrderDto.setSingleOrderId(co.getOrderId()); |
|
|
|
wxSharingOrderDto.setSingleOrderAmount(co.getCouponPrice()); |
|
|
|
wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); |
|
|
|
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); |
|
|
|
wxSharingOrderDto.updateTenantInfo(wxPayOrder); |
|
|
|
wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); |
|
|
|
WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(co.getOrderId()); |
|
|
|
if (share.getRateAmount() != null) { |
|
|
|
// 实际分账金额为 分账金额 + 通道费差 |
|
|
|
wxSharingOrderDto.setMerchantShareAmount(share.getShareAmount()+share.getRateAmount()); |
|
|
|
} else { |
|
|
|
// 未设置通道费差 |
|
|
|
wxSharingOrderDto.setMerchantShareAmount(share.getShareAmount()); |
|
|
|
} |
|
|
|
wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto,wxPayOrder); |
|
|
|
} |
|
|
|
|
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("券过期不退款: " + co.getId() + " ERROR:" + e.getMessage(),e); |
|
|
|
throw new MallinkException(e.getErrorCode(), e.getMessage()); |
|
|
|
} |
|
|
|
// |
|
|
|
// } catch (MallinkException e) { |
|
|
|
// logger.error("券过期不退款: " + co.getId() + " ERROR:" + e.getMessage(),e); |
|
|
|
// throw new MallinkException(e.getErrorCode(), e.getMessage()); |
|
|
|
// } |
|
|
|
|
|
|
|
if(bStockBack) { |
|
|
|
// 库存退回 |
|
|
|
|