| @@ -101,5 +101,13 @@ public class DataTowerController extends BaseController { | |||||
| return dataTowerService.queryCustomerData(getTenantInfo(), params); | return dataTowerService.queryCustomerData(getTenantInfo(), params); | ||||
| } | } | ||||
| @ApiOperation("调取客流接口客流") | |||||
| @PostMapping("/queryWiWideData") | |||||
| @SystemControllerLog(description = "数据塔台-查询客流") | |||||
| public ResultData queryWiWideData(@RequestBody Map<String,String> params) { | |||||
| logger.debug("[" + getIpAddr() + "] DataTowerController::queryWiWideData"); | |||||
| String url = params.get("url"); | |||||
| return null; | |||||
| } | |||||
| } | } | ||||
| @@ -1,3 +1,4 @@ | |||||
| ALTER TABLE `wx_rent_contract` | 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`; | ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`; | ||||
| @@ -114,8 +114,12 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | ||||
| private Long 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") | @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") | ||||
| @SortColumn(column = "payDate") | @SortColumn(column = "payDate") | ||||
| @@ -16,7 +16,9 @@ | |||||
| <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | ||||
| <result column="deposit" jdbcType="INTEGER" property="deposit"/> | <result column="deposit" jdbcType="INTEGER" property="deposit"/> | ||||
| <result column="deposit_info" jdbcType="VARCHAR" property="depositInfo"/> | |||||
| <!--<result column="deposit_info" jdbcType="VARCHAR" property="depositInfo"/>--> | |||||
| <result column="cashtype_content_lsit" jdbcType="VARCHAR" property="cashtypeContentLsit"/> | |||||
| <result column="cashtype_lsit" jdbcType="VARCHAR" property="cashtypeLsit"/> | |||||
| <result column="pay_date" jdbcType="INTEGER" property="payDate"/> | <result column="pay_date" jdbcType="INTEGER" property="payDate"/> | ||||
| <result column="is_del" jdbcType="INTEGER" property="isDel"/> | <result column="is_del" jdbcType="INTEGER" property="isDel"/> | ||||
| @@ -89,7 +91,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`, | `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`, | `brand`,`business_id`,`shop_type`,`updatetime`,`createtime`,`link_person`,`link_phone`, | ||||
| `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, | `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, | ||||
| `start_date`,`end_date`,`shop_name`,`from_id`, | `start_date`,`end_date`,`shop_name`,`from_id`, | ||||