|
|
|
@@ -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<String,Object> 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<String, Object> data = wxRentContractService.getById(wxRentContract.getId()); |
|
|
|
return new ResultData(data); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("getAllContractInfo") |
|
|
|
@@ -72,4 +79,27 @@ public class WxRentContractExtensionController extends BaseController { |
|
|
|
List<WxRentContract> 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); |
|
|
|
} |
|
|
|
} |