From 10021dc69d927ccc8b4bf47d8d3ccce2beeef4c4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 1 Mar 2021 16:06:39 +0800 Subject: [PATCH] rent depositInfo --- .../controller/datatower/DataTowerController.java | 8 ++++++++ .../db/migration/V202102260001__wx_rent_contract.sql | 3 ++- .../main/java/com/iformall/domain/po/WxRentContract.java | 8 ++++++-- .../src/main/resources/mapper/WxRentContractMapper.xml | 6 ++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index 468e87106..a23be42dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -101,5 +101,13 @@ public class DataTowerController extends BaseController { return dataTowerService.queryCustomerData(getTenantInfo(), params); } + @ApiOperation("调取客流接口客流") + @PostMapping("/queryWiWideData") + @SystemControllerLog(description = "数据塔台-查询客流") + public ResultData queryWiWideData(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryWiWideData"); + String url = params.get("url"); + return null; + } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql index 9a00cd262..fdc8524fa 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql @@ -1,3 +1,4 @@ ALTER TABLE `wx_rent_contract` -ADD COLUMN `deposit_info` json COMMENT '押金明细' AFTER `deposit`, +ADD COLUMN `cashtype_content_lsit` json COMMENT '押金明细' AFTER `deposit`, +ADD COLUMN `cashtype_lsit` json COMMENT '押金明细' AFTER `cashtype_content_lsit`, ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 6d2a5960f..c8c10cc45 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -114,8 +114,12 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") private Long deposit; - @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo") - private String depositInfo; +// @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo") +// private String depositInfo; + @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeContentLsit") + private String cashtypeContentLsit; + @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeLsit") + private String cashtypeLsit; @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") @SortColumn(column = "payDate") diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 9f3c22202..88266a134 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -16,7 +16,9 @@ - + + + @@ -89,7 +91,7 @@ `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`, - `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,deposit_info,`pay_date`,`is_del`,`merchant_name`, + `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`updatetime`,`createtime`,`link_person`,`link_phone`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`,`shop_name`,`from_id`,