diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java index 22b60fc5e..d35eee42f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.service.WxBillOtherDepositService; import io.swagger.annotations.ApiImplicitParam; @@ -76,5 +77,11 @@ public class WxBillOtherDepositController extends BaseController { return wxBillOtherDepositService.updatePaid(id); } + @PostMapping("returnDeposit") + public ResultData returnDeposit(@RequestBody WxBillDeposit wxBillDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); + return wxBillOtherDepositService.returnDeposit(wxBillDeposit); + + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index dc7c6c306..2604e02bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -122,6 +122,9 @@ public class WxBillOtherDeposit implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") private Integer rentShopType; + @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") + private Integer returnPrice; + public Integer getReceivePay() { return receivePay; } @@ -242,6 +245,14 @@ public class WxBillOtherDeposit implements Serializable { this.rentShopType = rentShopType; } + public Integer getReturnPrice() { + return returnPrice; + } + + public void setReturnPrice(Integer returnPrice) { + this.returnPrice = returnPrice; + } + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), ReceivePay_ASC("`receivePay` ASC"), ReceivePay_DESC("`receivePay` DESC"), Pay_ASC("`pay` ASC"), Pay_DESC("`pay` DESC"), ReceiveDate_ASC("`receiveDate` ASC"), ReceiveDate_DESC("`receiveDate` DESC"), PayDate_ASC("`payDate` ASC"), PayDate_DESC("`payDate` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"), ExpiredDay_ASC("`expiredDay` ASC"), ExpiredDay_DESC("`expiredDay` DESC"), TenantId_ASC("`tenantId` ASC"), TenantId_DESC("`tenantId` DESC"), Owe_ASC("`owe` ASC"), Owe_DESC("`owe` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), IsDel_ASC("`isDel` ASC"), IsDel_DESC("`isDel` DESC"), MerchantId_ASC("`merchantId` ASC"), MerchantId_DESC("`merchantId` DESC"), UserId_ASC("`userId` ASC"), UserId_DESC("`userId` DESC"), ShopId_ASC("`shopId` ASC"), ShopId_DESC("`shopId` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"); private String value; diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index a0090f37f..82c5f8dbb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillOther; import com.iformall.domain.po.WxBillOtherDeposit; @@ -49,4 +50,6 @@ public interface WxBillOtherDepositService { ResultData updatePaid(Long id); + ResultData returnDeposit(WxBillDeposit wxBillDeposit); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 3d1680b7e..13c1ec541 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillOther; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxShop; @@ -181,5 +182,24 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService return new ResultData(Result.SUCCESS, "其他押金账单结单成功"); } + @Override + public ResultData returnDeposit(WxBillDeposit record) { + logger.info("租赁押金退还"); + WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); + if (wxBillDeposit == null) { + return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); + } + wxBillDeposit.setReturnPrice(record.getReturnPrice()); + wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + wxBillDeposit.setUpdatetime(new Date()); + try { + wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + } catch (Exception e) { + logger.error("租赁押金退还失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 34803919e..3a9b4d3ad 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -20,13 +20,14 @@ + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, - `rent_shop_type` + `rent_shop_type`,`return_price` @@ -68,7 +69,7 @@