| @@ -3,7 +3,6 @@ package com.iformall.controller; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxBillDeposit; | |||||
| import com.iformall.domain.po.WxBillOtherDeposit; | import com.iformall.domain.po.WxBillOtherDeposit; | ||||
| import com.iformall.service.WxBillOtherDepositService; | import com.iformall.service.WxBillOtherDepositService; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -78,7 +77,7 @@ public class WxBillOtherDepositController extends BaseController { | |||||
| } | } | ||||
| @PostMapping("returnDeposit") | @PostMapping("returnDeposit") | ||||
| public ResultData returnDeposit(@RequestBody WxBillDeposit wxBillDeposit) { | |||||
| public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { | |||||
| logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); | logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); | ||||
| return wxBillOtherDepositService.returnDeposit(wxBillDeposit); | return wxBillOtherDepositService.returnDeposit(wxBillDeposit); | ||||
| @@ -50,6 +50,6 @@ public interface WxBillOtherDepositService { | |||||
| ResultData updatePaid(Long id); | ResultData updatePaid(Long id); | ||||
| ResultData returnDeposit(WxBillDeposit wxBillDeposit); | |||||
| ResultData returnDeposit(WxBillOtherDeposit wxBillDeposit); | |||||
| } | } | ||||
| @@ -6,8 +6,6 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | 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.WxBillOtherDeposit; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.enums.EnumBillDailyStatus; | import com.iformall.enums.EnumBillDailyStatus; | ||||
| @@ -183,7 +181,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData returnDeposit(WxBillDeposit record) { | |||||
| public ResultData returnDeposit(WxBillOtherDeposit record) { | |||||
| logger.info("租赁押金退还"); | logger.info("租赁押金退还"); | ||||
| WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); | WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); | ||||
| if (wxBillDeposit == null) { | if (wxBillDeposit == null) { | ||||