|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.WxBillProperty; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxPropertyContract; |
|
|
|
import com.iformall.domain.po.WxRentContract; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
|
import com.iformall.enums.*; |
|
|
|
@@ -164,6 +165,7 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxPropertyContract.updateTenantInfo(user); |
|
|
|
wxPropertyContract.setAdjustPeriodHandle(); |
|
|
|
wxPropertyContract.calcutePrice(); |
|
|
|
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); |
|
|
|
wxPropertyContract.setContractType(contractType); |
|
|
|
if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
@@ -196,6 +198,15 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 计算价格 |
|
|
|
*/ |
|
|
|
@PostMapping("calcutePrice") |
|
|
|
public ResultData calcutePrice(@RequestBody WxPropertyContract wxPropertyContract) { |
|
|
|
wxPropertyContract.calcutePrice(); |
|
|
|
return new ResultData(wxPropertyContract.getPrice()); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/findById") |
|
|
|
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) |
|
|
|
public ResultData findById(Long id) { |
|
|
|
|