From b9cb1a7bf2f4ad5dae2562e530d5ecc2bfa5b053 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Fri, 7 Aug 2020 16:29:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxRentContractController.java | 27 +++++++-- .../WxRentContractv2Controller.java | 59 ------------------- .../java/com/iformall/common/ErrorCode.java | 1 + .../iformall/mapper/WxRentContractMapper.java | 2 + .../service/WxRentContractService.java | 4 +- .../impl/WxPropertyContractServiceImpl.java | 10 +--- .../impl/WxRentContractServiceImpl.java | 13 +++- .../resources/mapper/WxRentContractMapper.xml | 4 ++ 8 files changed, 46 insertions(+), 74 deletions(-) delete mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index d38f11878..25a0790ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -63,6 +63,20 @@ public class WxRentContractController extends WxContractBaseController { @Autowired private WxRentPropertyContractService wxRentPropertyContractService; + + + + @GetMapping("getMerchantList") + @SystemControllerLog(description = "获取商户列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) + public ResultData getMerchantList(Integer shopType) throws Exception{ + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setRentShopType(shopType); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); + } + @GetMapping("autolatePay") @SystemControllerLog(description = "autolatePay") public ResultData autolatePay(String startDate, String endDate) throws Exception{ @@ -139,13 +153,16 @@ public class WxRentContractController extends WxContractBaseController { if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ wxRentContract.setBusDiscountTime(new Integer(0)); } - WxMerchant wxMerchant = new WxMerchant(); + //WxMerchant wxMerchant = new WxMerchant(); //wxMerchant.setName(wxRentContract.getMerchantName()); - wxMerchant.setId(wxRentContract.getMerchantId()); - if (wxMerchantService.hasMerchant(wxMerchant)) { - return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); + //wxMerchant.setId(wxRentContract.getMerchantId()); +// if (wxMerchantService.hasMerchant(wxMerchant)) { +// return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); +// } + //查询商户是否存在计租中合同 + if (!wxRentContractService.hasContract(wxRentContract)){ + return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT); } - MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java deleted file mode 100644 index ec491e566..000000000 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.iformall.controller.contractv2; - -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxRentContract; -import com.iformall.enums.EnumContractType; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxRentPropertyContractService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author: furunxin - * @Date: 2020/8/5 10:13 - * @Description: - */ - -@Slf4j -@RestController -@RequestMapping("wxRentContract_V2") -@Api(description = "租赁合同V2版本") -public class WxRentContractv2Controller extends BaseController { - - @Autowired - private WxMerchantService wxMerchantService; - - - @Autowired - private WxRentPropertyContractService wxRentPropertyContractService; - - @GetMapping("getMerchantList") - @SystemControllerLog(description = "获取商户列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) - public ResultData getMerchantList(Integer shopType) throws Exception{ - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.updateTenantInfo(getTenantInfo()); - wxMerchant.setRentShopType(shopType); - return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); - } - - - @PostMapping("add") - @SystemControllerLog(description = "租赁合同-添加") - public ResultData add(@RequestBody WxRentContract wxRentContract) { - log.debug("[" + getIpAddr() + "] WxRentContractv2Controller::add"); - //查询合同类型 - Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); - wxRentContract.setContractType(contractType); - return null; - } -} diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index a198cb590..f62ccc2a2 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -102,6 +102,7 @@ public enum ErrorCode{ MERCHANT_NAME_IS_FOUND(2014, "商户名称已存在"), MERCHANT_CAR_NOT_DEL(2015, "停车商户不能被删除"), MERCHANT_BUSER_NOT_VALID(2016, "商户用户不存在或已被禁用"), + MERCHANT_HASRENTCONTRACT(2017,"该商户存在计租中合同"), /** * 券 */ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 7758a8736..d3bfd8760 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -83,4 +83,6 @@ public interface WxRentContractMapper extends CommonMapper WxRentContract getByMerchantId(WxRentContract wxRentContract); List getAllContractBymerchantId(WxRentContract wxRentContract); + + List getContractByMerchant(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index f1b745c14..7b647886c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -112,6 +112,8 @@ public interface WxRentContractService { ResultData extensionUpdate(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate); ResultData extensionUpdateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate); - + ResultData apply(WxRentContract wxRentContract,MallUserInfo user); + + boolean hasContract(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 42aa6b18d..b0c63cfd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -343,6 +343,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService // } else { // record.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); // } + record.setStatus(EnumRentContractStatus.DRAFT.getCode()); record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); try { wxPropertyContractMapper.insert(record); @@ -411,8 +412,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService message = "更新物业合同信息成功"; } - 111111111111111 - return new ResultData(Result.SUCCESS, message, record); } @@ -502,7 +501,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); - record.setStatus(EnumRentContractStatus.EXTENSION.getCode()); + record.setStatus(EnumRentContractStatus.DRAFT.getCode()); record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); try { wxPropertyContractMapper.insert(record); @@ -553,7 +552,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //如果是合并合同 物业合同的状态为 意向 if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { - record.setStatus(EnumRentContractStatus.EXTENSION.getCode()); + record.setStatus(EnumRentContractStatus.DRAFT.getCode()); } if (CollectionUtils.isEmpty(record.getFlowParams())) { @@ -569,9 +568,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService message = "更新物业合同信息成功"; } - - 22222222222222222222222222222 - return new ResultData(Result.SUCCESS, message, record); } 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 19f6616ff..925d75a71 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -495,7 +495,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { try { record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); - + record.setStatus(EnumRentContractStatus.DRAFT.getCode()); Date tempDate = record.getRentalStartDate(); record.setRentalStartDate(oldRentStartDate); wxRentContractMapper.insert(record); @@ -2570,7 +2570,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { try { record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); - + record.setStatus(EnumRentContractStatus.DRAFT.getCode()); Date tempDate = record.getRentalStartDate(); record.setRentalStartDate(oldRentStartDate); wxRentContractMapper.insert(record); @@ -2770,4 +2770,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]租金合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]"); } } + + @Override + public boolean hasContract(WxRentContract wxRentContract) { + List list = wxRentContractMapper.getContractByMerchant(wxRentContract); + if (list.isEmpty()){ + return true; + } + return false; + } } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index cdcb3055e..95b705004 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -662,5 +662,9 @@ + +