From e9c8fe1b7bc9ee5772a8dfe8fc3879810454e7ab Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Jan 2019 13:01:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=8A=E8=A1=A5=E5=BD=95=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 2 +- .../enums/EnumRentContractStatus.java | 1 + .../service/WxRentContractService.java | 2 +- .../impl/WxRentContractServiceImpl.java | 39 ++----------------- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index c4709697d..512fed169 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -132,7 +132,7 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updateRentContractStatus(Long id) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - return wxRentContractService.updateRentContractStatus(id, getUser().getId()); + return wxRentContractService.updateRentContractStatus(id); } } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java index 18005d0c5..4e02fc5d0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java @@ -7,6 +7,7 @@ package com.iformall.enums; public enum EnumRentContractStatus { + INTENTION(0, "意向"), WAIT_SIGN(1, "待签约"), SIGNED_RENT_UNPAID(2, "已签约未记租"), RENT_PAID(3, "计租中"), diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 0506050c2..1382b237e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -63,7 +63,7 @@ public interface WxRentContractService { ResultData updateFile(WxRentContract wxRentContract, Long userId); - ResultData updateRentContractStatus(Long id, Long userId); + ResultData updateRentContractStatus(Long id); void updateApplyStatus(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 39ffe8102..e0d385842 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -181,22 +181,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); } wxRentContractMapper.insertSelective(record); - //建立账单 - if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) - && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setMerchantId(record.getMerchantId()); - List> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); - if (billRentList.size() == 0) { - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setId(record.getMerchantId()); - wxMerchant.setTenantId(record.getTenantId()); - //租金 - buildRent(wxMerchant, userId); - //押金 - buildDeposit(wxMerchant, userId); - } - } } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -257,27 +241,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); } wxRentContractMapper.updateByPrimaryKeySelective(record); - //建立账单 - /*if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) - && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setMerchantId(record.getMerchantId()); - List> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); - if (billRentList.size() == 0) { - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setId(record.getMerchantId()); - wxMerchant.setTenantId(record.getTenantId()); - //租金 - buildRent(wxMerchant, userId); - //押金 - buildDeposit(wxMerchant, userId); - } - }*/ } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } -// return new ResultData(Result.SUCCESS, "更新租赁合同信息成功"); return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract); } @@ -815,7 +782,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public ResultData updateRentContractStatus(Long id, Long userId) { + public ResultData updateRentContractStatus(Long id) { if (id == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } @@ -840,9 +807,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxMerchant.setId(record.getMerchantId()); wxMerchant.setTenantId(record.getTenantId()); //租金 - buildRent(wxMerchant, userId); + buildRent(wxMerchant, null); //押金 - buildDeposit(wxMerchant, userId); + buildDeposit(wxMerchant, null); } } return new ResultData(Result.SUCCESS, "操作成功");