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;