gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：拒绝后，用户重新申请，后台可以审核

Browse Source
This commit is contained in:
yangqingyuan
2024-08-20 11:33:53 +08:00
parent 6c51e1618f
commit 366994a340
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
View File

@@ -481,19 +481,30 @@ public class OpenEquipmentController extends BaseController {
// 已有记录 取消退租 // 已有记录 取消退租
Integer isRefund = order.getIsRefund(); Integer isRefund = order.getIsRefund();
if (refund != null) { if (refund != null) {
if(isRefund == 1){ if(isRefund == 1){//如果已经已申请退租
return fail("已申请退租！"); 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 { } else {
if(isRefund == 2){ if(isRefund == 2){
return fail("找不到申请退租记录！"); return fail("找不到申请退租记录！");
@@ -505,7 +516,7 @@ public class OpenEquipmentController extends BaseController {
refund.setOrderGoodsId(order.getGoodsId()); refund.setOrderGoodsId(order.getGoodsId());
refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId()); refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId());
refund.setType(10); refund.setType(10);
refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租"); refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租");//3强制退租（后台操作）
refund.setRefundMoney(new BigDecimal(0)); refund.setRefundMoney(new BigDecimal(0));
refund.setMerchantCode(order.getMerchantCode()); refund.setMerchantCode(order.getMerchantCode());
} }