From f89d21828d74bd3495e4d0b28d8ed3f4aa9f9339 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Fri, 17 Jul 2020 10:00:42 +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 --- .../WxRentContractExtensionController.java | 48 +++++++++++++++---- .../resources/mapper/WxRentContractMapper.xml | 2 +- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java index 9008e4e2d..9cdb98d97 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -1,19 +1,26 @@ package com.iformall.controller.contract; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; +import com.iformall.enums.EnumContractType; +import com.iformall.enums.EnumRentStartType; import com.iformall.service.WxRentContractService; +import com.iformall.service.WxRentPropertyContractService; import com.iformall.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,6 +30,8 @@ import java.util.Map; * @Date: 2020/7/14 11:21 * @Description: */ + +@Slf4j @RestController @RequestMapping("wxRentContractExtension") public class WxRentContractExtensionController extends BaseController { @@ -31,8 +40,9 @@ public class WxRentContractExtensionController extends BaseController { @Autowired private WxRentContractService wxRentContractService; + @Autowired - private WxShopService wxShopService; + private WxRentPropertyContractService wxRentPropertyContractService; @GetMapping("searchMerchant") @ApiImplicitParams({ @@ -52,14 +62,11 @@ public class WxRentContractExtensionController extends BaseController { @ApiImplicitParam(name = "merchantId", value = "商户id", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "根据商户id查询该商户计租中合同信息") public ResultData getContractInfo(Long merchantId) throws Exception{ - Map resultMap = new HashMap<>(); WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setMerchantId(merchantId); wxRentContract = wxRentContractService.getByMerchantId(wxRentContract); - WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); - resultMap.put("wxRentContract",wxRentContract); - resultMap.put("wxShop",wxShop); - return new ResultData(resultMap); + Map data = wxRentContractService.getById(wxRentContract.getId()); + return new ResultData(data); } @GetMapping("getAllContractInfo") @@ -72,4 +79,27 @@ public class WxRentContractExtensionController extends BaseController { List rentContracts = wxRentContractService.getAllContractByMerchantId(wxRentContract); return new ResultData(rentContracts); } + + @PostMapping("extension") + @SystemControllerLog(description = "租赁合同续签") + public ResultData extension(@RequestBody WxRentContract wxRentContract) { + log.debug("[" + getIpAddr() + "] WxRentContractExtensionController::add"); + Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); + wxRentContract.setContractType(contractType); + if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ + wxRentContract.setBusDiscountTime(new Integer(0)); + } + MallUserInfo user = getUser(); + //wxRentContract.updateTenantInfo(user); + wxRentContract.setTenantId("789"); + wxRentContract.setParentTenantId("788"); + user.setId(Long.parseLong("321127266275430400")); + user.setUsername("alitest"); + wxRentContract.setAdjustPeriodHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); + if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + return wxRentContractService.save(wxRentContract, user.getId(),user.getName(),oldDate); + } } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index a5c69a63f..a2030f274 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -525,7 +525,7 @@