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-17 11:27:02 +08:00
parent 795de70c63
commit 320c864cc5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,9 +503,9 @@ public class OpenEquipmentController extends BaseController {
refund.setOrderId(order.getOrderId()); refund.setOrderId(order.getOrderId());
refund.setOrderNo(order.getOrderNo()); refund.setOrderNo(order.getOrderNo());
refund.setOrderGoodsId(order.getGoodsId()); refund.setOrderGoodsId(order.getGoodsId());
refund.setUserId(getLoginUserId()); refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId());
refund.setType(10); refund.setType(10);
refund.setApplyDesc("申请退租"); refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租");
refund.setRefundMoney(new BigDecimal(0)); refund.setRefundMoney(new BigDecimal(0));
refund.setMerchantCode(order.getMerchantCode()); refund.setMerchantCode(order.getMerchantCode());
} }

2
src/main/java/com/gxwebsoft/shop/entity/Order.java
View File

@@ -328,7 +328,7 @@ public class Order implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Date insuranceExpireDate; private Date insuranceExpireDate;
@ApiModelProperty(value = "是否申请退租，1为申请，2为取消") @ApiModelProperty(value = "是否申请退租，1为申请，2为取消，3强制退租（后台操作）")
@TableField(exist = false) @TableField(exist = false)
private Integer isRefund; private Integer isRefund;