clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

分帐后也能同意退款，修改提示语

This commit is contained in:
Hawking 2023-04-20 22:44:10 +08:00
parent 777178cc45
commit 5bd28dc039
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
View File

@ -128,15 +128,18 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult updateAfterServiceRecord(AfterServiceRecord param) throws BaseAdaPayException { public AjaxResult updateAfterServiceRecord(AfterServiceRecord param) throws BaseAdaPayException {
Long one = 1L;
AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId()); AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId());
Assert.notNull(afterServiceRecord, "售后记录不存在！"); Assert.notNull(afterServiceRecord, "售后记录不存在！");
if (Long.valueOf(1L).equals(param.getCustomerFinalCheck()) && Long.valueOf(1L).equals(afterServiceRecord.getWorkerFeedbackResult())) { OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
// 客户同意退款 boolean drawCash = orderDetail.getDrawCashTime() != null;
if (one.equals(param.getCustomerFinalCheck()) && one.equals(afterServiceRecord.getWorkerFeedbackResult())) {
// 师傅同意 且 客户同意退款
afterServiceRecord.setCustomerFinalCheck(1L); afterServiceRecord.setCustomerFinalCheck(1L);
afterServiceRecord.setRefundApplyTime(new Date()); afterServiceRecord.setRefundApplyTime(new Date());
OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
// DrawCashTime不为空说明已经发起过分账 // DrawCashTime不为空说明已经发起过分账
if (orderDetail.getDrawCashTime() != null) { if (drawCash) {
log.warn("子单[{}]已发起分账，不能退款", afterServiceRecord.getOrderDetailId()); log.warn("子单[{}]已发起分账，不能退款", afterServiceRecord.getOrderDetailId());
afterServiceRecord.setOriginalRefund(BigDecimal.ZERO); afterServiceRecord.setOriginalRefund(BigDecimal.ZERO);
afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
@ -144,6 +147,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
} else { } else {
agreeRefund(afterServiceRecord); agreeRefund(afterServiceRecord);
} }
} else if (one.equals(afterServiceRecord.getWorkerFeedbackResult()) && param.getCustomerFinalCheck() == null) {
// 师傅同意 且 客户未处理
afterServiceRecordMapper.updateAfterServiceRecord(param);
return drawCash ? AjaxResult.error("本单银联已确认货款结算完毕(订单支付完成)，款项已到达或即将到达您所绑定帐户，需同意退款的同意后您线下与客户另行操作，系统无法提供原路返回退款!") : AjaxResult.success();
} else { } else {
afterServiceRecordMapper.updateAfterServiceRecord(param); afterServiceRecordMapper.updateAfterServiceRecord(param);
} }