提交 8b9af2f7 作者: xiaowang

修复

上级 539db60f
...@@ -423,7 +423,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService { ...@@ -423,7 +423,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
leaseRefundOrderDO.setType(OrderType.RETREAT.getCode()); leaseRefundOrderDO.setType(OrderType.RETREAT.getCode());
leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO); leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
// 修改订单状态 // 修改订单状态
leaseOrderDao.updateUavOrderStatus(leaseOrderRefundVO.getStatus(), LeaseOrderStatus.APPLY_REFUND.getCode()); leaseOrderDao.updateUavOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.APPLY_REFUND.getCode());
return ResultBody.success(); return ResultBody.success();
} else { } else {
// 退云享金、佣金 // 退云享金、佣金
...@@ -659,7 +659,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService { ...@@ -659,7 +659,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
@Transactional @Transactional
public ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param) { public ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param) {
LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(param.getOrderId()); LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(param.getOrderId());
log.info("leaseOrderDO:{}", JSONObject.toJSONString(leaseOrderDO)); log.info("平台确认归还操作,leaseOrderDO:{}", JSONObject.toJSONString(leaseOrderDO));
boolean isWaitingMerchantConfirm = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()); boolean isWaitingMerchantConfirm = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode());
boolean isApplyRefund = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode()); boolean isApplyRefund = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode());
...@@ -734,11 +734,10 @@ public class LeaseOrderServiceImpl implements LeaseOrderService { ...@@ -734,11 +734,10 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.REMAIN_TO_BE_EVALUATED); this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.REMAIN_TO_BE_EVALUATED);
} }
} else { } else {
// todo 进行相应赔偿
// 有破损等待平台 // 有破损等待平台
} }
} else { } else {
// todo 进行相应赔偿
return ResultBody.error("状态流程有误,请重试"); return ResultBody.error("状态流程有误,请重试");
} }
return ResultBody.success(); return ResultBody.success();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论