From 366994a340a8d180802fab71be2c646c41903fd8 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Tue, 20 Aug 2024 11:33:53 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=8B=92=E7=BB=9D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E9=87=8D=E6=96=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E5=8F=B0=E5=8F=AF=E4=BB=A5=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OpenEquipmentController.java | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java index e93c644..eb51ed9 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java @@ -481,19 +481,30 @@ public class OpenEquipmentController extends BaseController { // 已有记录 取消退租 Integer isRefund = order.getIsRefund(); if (refund != null) { - if(isRefund == 1){ - return fail("已申请退租！"); + if(isRefund == 1){//如果已经已申请退租 + if (refund.getAuditStatus()== 30) {//拒绝后，可以重新申请审核 + refund.setAuditStatus(10); + refund.setApplyDesc("申请退租"); + orderRefundService.updateById(refund); + // 更新订单状态 + Order updateOrder = new Order(); + updateOrder.setReceiptStatus(RECEIPT_STATUS_APPLY); + updateOrder.setOrderId(order.getOrderId()); + orderService.updateById(updateOrder); + return success("申请成功，请等待客服人员审核"); + } else { + return fail("已申请退租！"); + } + } else { //取消退租 + Integer auditStatus = refund.getAuditStatus(); + if (auditStatus != 10) { + return fail("未申请退租！"); + } + orderRefundService.removeById(refund.getOrderRefundId()); + order.setReceiptStatus(RECEIPT_STATUS_YES); + orderService.updateById(order); + return success("取消退租成功"); } - - Integer auditStatus = refund.getAuditStatus(); - if(auditStatus != 10){ - return fail("未申请退租！"); - } - orderRefundService.removeById(refund.getOrderRefundId()); - order.setReceiptStatus(RECEIPT_STATUS_YES); - orderService.updateById(order); - return success("取消退租成功"); - } else { if(isRefund == 2){ return fail("找不到申请退租记录！"); @@ -505,7 +516,7 @@ public class OpenEquipmentController extends BaseController { refund.setOrderGoodsId(order.getGoodsId()); refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId()); refund.setType(10); - refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租"); + refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租");//3强制退租（后台操作） refund.setRefundMoney(new BigDecimal(0)); refund.setMerchantCode(order.getMerchantCode()); }