|
|
|
@@ -7,6 +7,7 @@ import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumContractType; |
|
|
|
import com.iformall.enums.EnumFromType; |
|
|
|
import com.iformall.enums.EnumIsPreview; |
|
|
|
import com.iformall.enums.EnumRentStartType; |
|
|
|
@@ -14,10 +15,7 @@ import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.WxBillPropertyMapper; |
|
|
|
import com.iformall.mapper.WxBillRentMapper; |
|
|
|
import com.iformall.mapper.WxRentContractMapper; |
|
|
|
import com.iformall.service.WxBillRentService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
|
import com.iformall.service.WxRentContractService; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -59,6 +57,10 @@ public class WxRentContractController extends BaseController { |
|
|
|
WxBillRentMapper wxBillRentMapper; |
|
|
|
@Autowired |
|
|
|
WxBillPropertyMapper wxBillPropertyMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxRentPropertyContractService wxRentPropertyContractService; |
|
|
|
|
|
|
|
@GetMapping("autolatePay") |
|
|
|
@SystemControllerLog(description = "autolatePay") |
|
|
|
public ResultData autolatePay(String startDate, String endDate) throws Exception{ |
|
|
|
@@ -130,6 +132,8 @@ public class WxRentContractController extends BaseController { |
|
|
|
@SystemControllerLog(description = "租赁合同-添加") |
|
|
|
public ResultData add(@RequestBody WxRentContract wxRentContract) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::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)); |
|
|
|
} |
|
|
|
|