From 7a97c6301c7efd41b3def58f70633a4eb0ab6aaa Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Feb 2019 19:08:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=85=B6=E4=BB=96=E6=8A=BC=E9=87=91=E8=B4=A6?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9][=E9=80=80=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxBillOtherDepositController.java | 3 +-- .../java/com/iformall/service/WxBillOtherDepositService.java | 2 +- .../iformall/service/impl/WxBillOtherDepositServiceImpl.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java index d35eee42f..80e66589e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java @@ -3,7 +3,6 @@ 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; @@ -78,7 +77,7 @@ public class WxBillOtherDepositController extends BaseController { } @PostMapping("returnDeposit") - public ResultData returnDeposit(@RequestBody WxBillDeposit wxBillDeposit) { + public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); return wxBillOtherDepositService.returnDeposit(wxBillDeposit); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index 82c5f8dbb..3f9e6dea7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -50,6 +50,6 @@ public interface WxBillOtherDepositService { ResultData updatePaid(Long id); - ResultData returnDeposit(WxBillDeposit wxBillDeposit); + ResultData returnDeposit(WxBillOtherDeposit 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 13c1ec541..a973c3ec9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -6,8 +6,6 @@ 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; import com.iformall.enums.EnumBillDailyStatus; @@ -183,7 +181,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService } @Override - public ResultData returnDeposit(WxBillDeposit record) { + public ResultData returnDeposit(WxBillOtherDeposit record) { logger.info("租赁押金退还"); WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); if (wxBillDeposit == null) {