diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java index 7ebafe88..994fcabf 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java @@ -122,7 +122,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId()); Assert.notNull(afterServiceRecord, "售后记录不存在!"); // 实际同意,需要发起退款,减少原单分账金额-调用退款接口 - if(param.getCustomerFinalCheck() == 1){ + if(param.getCustomerFinalCheck() != null && param.getCustomerFinalCheck() == 1){ OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId()); Assert.notNull(orderDetail, "子单不存在!"); FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(afterServiceRecord.getOrderDetailId()); @@ -159,8 +159,8 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService throw new BaseException("发起退款异常!"); } } - afterServiceRecord.setUpdateTime(DateUtils.getNowDate()); - return afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); + param.setUpdateTime(DateUtils.getNowDate()); + return afterServiceRecordMapper.updateAfterServiceRecord(param); } /** diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml index b01e3322..9f48790e 100644 --- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml @@ -113,7 +113,7 @@ - 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 #{id}