|
|
@@ -962,6 +962,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//修改订单状态
|
|
|
orderDon.setStatus(OrderDon.Status.refund);
|
|
|
orderDon.setRefundMoney(wxOrderRefundReq.getRefundMoney());
|
|
|
+ orderDon.setRefundDesc(wxOrderRefundReq.getRefundDesc());
|
|
|
if (orderDon.getIsDistribute()) {
|
|
|
distributeWaitingSendPointsMapper.updateOrderStatus(orderDon.getId(), DistributeWaitingSendPoints.Status.close);
|
|
|
}
|
|
|
@@ -1045,6 +1046,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
if (orderDon.getIsDistribute()) {
|
|
|
distributeWaitingSendPointsMapper.updateOrderStatus(orderDon.getId(), DistributeWaitingSendPoints.Status.close);
|
|
|
}
|
|
|
+ orderDon.setRefundDesc(zfbOrderRefundReq.getRefundDesc());
|
|
|
orderDonMapper.updateById(orderDon);
|
|
|
//记录退款信息
|
|
|
THREAD_POOL_TASK_EXECUTOR.execute(()->{
|
|
|
@@ -1218,7 +1220,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
refund.setOrderId(orderDon.getId());
|
|
|
refund.setOutRefundNo(outRefundNo);
|
|
|
refund.setTotalFee(orderDon.getMoney());
|
|
|
- refund.setRefundDesc("订单退款");
|
|
|
+ refund.setRefundDesc(orderDon.getRefundDesc());
|
|
|
//退款金额
|
|
|
refund.setRefundFee(orderDon.getRefundMoney());
|
|
|
refund.setUserId(orderDon.getUserId());
|