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

Merge remote-tracking branch 'origin/master' into multiple_refund

This commit is contained in:
Hawking 2023-04-18 23:50:50 +08:00
parent 39085af80d d6f909527f
commit 3b4376f8f5
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java
View File

@ -7,7 +7,9 @@ import com.ghy.common.core.page.TableDataInfo;
import com.ghy.common.enums.BusinessType; import com.ghy.common.enums.BusinessType;
import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.order.domain.AfterServiceRecord; import com.ghy.order.domain.AfterServiceRecord;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.service.IAfterServiceRecordService; import com.ghy.order.service.IAfterServiceRecordService;
import com.ghy.order.service.OrderDetailService;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -32,6 +34,9 @@ public class AfterServiceRecordController extends BaseController {
@Autowired @Autowired
private IAfterServiceRecordService afterServiceRecordService; private IAfterServiceRecordService afterServiceRecordService;
@Autowired
private OrderDetailService orderDetailService;
@RequiresPermissions("worker:record:view") @RequiresPermissions("worker:record:view")
@GetMapping() @GetMapping()
public String record() { public String record() {
@ -102,6 +107,10 @@ public class AfterServiceRecordController extends BaseController {
@ResponseBody @ResponseBody
public AjaxResult addSave(@RequestBody AfterServiceRecord afterServiceRecord) { public AjaxResult addSave(@RequestBody AfterServiceRecord afterServiceRecord) {
logger.info("新增售后记录:{}", afterServiceRecord); logger.info("新增售后记录:{}", afterServiceRecord);
OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
if(orderDetail.getDrawCashTime() != null){
return AjaxResult.error("已发起分账子单,请联系师傅处理线下售后!");
}
return toAjax(afterServiceRecordService.insertAfterServiceRecord(afterServiceRecord)); return toAjax(afterServiceRecordService.insertAfterServiceRecord(afterServiceRecord));
} }
@ -125,6 +134,10 @@ public class AfterServiceRecordController extends BaseController {
public AjaxResult editSave(@RequestBody AfterServiceRecord afterServiceRecord) { public AjaxResult editSave(@RequestBody AfterServiceRecord afterServiceRecord) {
logger.info("修改售后记录:{}", afterServiceRecord); logger.info("修改售后记录:{}", afterServiceRecord);
try { try {
OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
if(orderDetail.getDrawCashTime() != null){
return AjaxResult.error("已发起分账子单,请联系师傅处理线下售后!");
}
return toAjax(afterServiceRecordService.updateAfterServiceRecord(afterServiceRecord)); return toAjax(afterServiceRecordService.updateAfterServiceRecord(afterServiceRecord));
} catch (Exception exception) { } catch (Exception exception) {
logger.error(ExceptionUtils.getStackTrace(exception)); logger.error(ExceptionUtils.getStackTrace(exception));