From 320c864cc547d20c42fff4bf76a5c8396a3efa45 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Sat, 17 Aug 2024 11:27:02 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=BC=BA=E5=88=B6=E9=80=80=E7=A7=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/open/controller/OpenEquipmentController.java | 4 ++-- src/main/java/com/gxwebsoft/shop/entity/Order.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java index 2e721a6..f63f9e3 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java @@ -503,9 +503,9 @@ public class OpenEquipmentController extends BaseController { refund.setOrderId(order.getOrderId()); refund.setOrderNo(order.getOrderNo()); refund.setOrderGoodsId(order.getGoodsId()); - refund.setUserId(getLoginUserId()); + refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId()); refund.setType(10); - refund.setApplyDesc("申请退租"); + refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租"); refund.setRefundMoney(new BigDecimal(0)); refund.setMerchantCode(order.getMerchantCode()); } diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java index 54a4091..b2513ec 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Order.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -328,7 +328,7 @@ public class Order implements Serializable { @TableField(exist = false) private Date insuranceExpireDate; - @ApiModelProperty(value = "是否申请退租，1为申请，2为取消") + @ApiModelProperty(value = "是否申请退租，1为申请，2为取消，3强制退租（后台操作）") @TableField(exist = false) private Integer isRefund;