|
|
@@ -12,6 +12,8 @@ import com.iformall.domain.po.WxRentContract; |
|
|
import com.iformall.domain.po.WxShop; |
|
|
import com.iformall.domain.po.WxShop; |
|
|
import com.iformall.enums.EnumRentContractAdjustPeriod; |
|
|
import com.iformall.enums.EnumRentContractAdjustPeriod; |
|
|
import com.iformall.enums.EnumRentShopType; |
|
|
import com.iformall.enums.EnumRentShopType; |
|
|
|
|
|
import com.iformall.enums.EnumRentStartType; |
|
|
|
|
|
import com.iformall.mapper.WxRentContractMapper; |
|
|
import com.iformall.service.WxBillRentService; |
|
|
import com.iformall.service.WxBillRentService; |
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
import com.iformall.service.WxRentContractService; |
|
|
import com.iformall.service.WxRentContractService; |
|
|
@@ -46,6 +48,8 @@ public class WxRentContractController extends BaseController { |
|
|
private WxPayAccountBillService payAccountBillService; |
|
|
private WxPayAccountBillService payAccountBillService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxShopService wxShopService; |
|
|
private WxShopService wxShopService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private WxRentContractMapper wxRentContractMapper; |
|
|
|
|
|
|
|
|
@GetMapping("getDateDiff") |
|
|
@GetMapping("getDateDiff") |
|
|
@ApiImplicitParams({ |
|
|
@ApiImplicitParams({ |
|
|
@@ -85,9 +89,28 @@ public class WxRentContractController extends BaseController { |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
|
|
|
|
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
|
|
|
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
|
|
wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
|
|
} |
|
|
return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); |
|
|
return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("updateRentStartTime") |
|
|
|
|
|
@SystemControllerLog(description = "租赁合同-更新租赁开始日期") |
|
|
|
|
|
public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { |
|
|
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); |
|
|
|
|
|
Integer rentStartType = wxRentContract.getRentStartType(); |
|
|
|
|
|
wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); |
|
|
|
|
|
if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
|
|
wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
|
|
} |
|
|
|
|
|
MallUserInfo user = getUser(); |
|
|
|
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
|
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
|
|
|
wxRentContract.setRentPriceHandle(); |
|
|
|
|
|
return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@PostMapping("update") |
|
|
@PostMapping("update") |
|
|
@SystemControllerLog(description = "租赁合同-更新") |
|
|
@SystemControllerLog(description = "租赁合同-更新") |
|
|
public ResultData update(@RequestBody WxRentContract wxRentContract) { |
|
|
public ResultData update(@RequestBody WxRentContract wxRentContract) { |
|
|
@@ -96,6 +119,9 @@ public class WxRentContractController extends BaseController { |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
|
|
|
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
|
|
wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
|
|
} |
|
|
return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); |
|
|
return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -112,6 +138,10 @@ public class WxRentContractController extends BaseController { |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
|
|
|
|
|
|
|
|
|
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
|
|
wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
|
|
} |
|
|
return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); |
|
|
return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -123,6 +153,9 @@ public class WxRentContractController extends BaseController { |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setTenantId(user.getTenantId()); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setAdjustPeriodHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
wxRentContract.setRentPriceHandle(); |
|
|
|
|
|
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
|
|
wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); |
|
|
|
|
|
} |
|
|
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); |
|
|
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -262,3 +295,4 @@ public class WxRentContractController extends BaseController { |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|