退单,售后相关流程的问题修复
This commit is contained in:
parent
ff2c4e92be
commit
5c8b625228
|
|
@ -122,7 +122,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
|
||||||
AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId());
|
AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId());
|
||||||
Assert.notNull(afterServiceRecord, "售后记录不存在!");
|
Assert.notNull(afterServiceRecord, "售后记录不存在!");
|
||||||
// 实际同意,需要发起退款,减少原单分账金额-调用退款接口
|
// 实际同意,需要发起退款,减少原单分账金额-调用退款接口
|
||||||
if(param.getCustomerFinalCheck() == 1){
|
if(param.getCustomerFinalCheck() != null && param.getCustomerFinalCheck() == 1){
|
||||||
OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
|
OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
|
||||||
Assert.notNull(orderDetail, "子单不存在!");
|
Assert.notNull(orderDetail, "子单不存在!");
|
||||||
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(afterServiceRecord.getOrderDetailId());
|
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(afterServiceRecord.getOrderDetailId());
|
||||||
|
|
@ -159,8 +159,8 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
|
||||||
throw new BaseException("发起退款异常!");
|
throw new BaseException("发起退款异常!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
afterServiceRecord.setUpdateTime(DateUtils.getNowDate());
|
param.setUpdateTime(DateUtils.getNowDate());
|
||||||
return afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
|
return afterServiceRecordMapper.updateAfterServiceRecord(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteAfterServiceRecordByIds" parameterType="String">
|
<delete id="deleteAfterServiceRecordByIds" parameterType="String">
|
||||||
delete from after_service_record where customer_final_check != 1 and id in
|
delete from after_service_record where (customer_final_check is NULL or customer_final_check != 1) and id in
|
||||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||||
#{id}
|
#{id}
|
||||||
</foreach>
|
</foreach>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue