| @@ -0,0 +1,31 @@ | |||||
| ALTER TABLE `mallink`.`wx_rent_contract` | |||||
| ADD COLUMN `lease_purpose` varchar(255) COMMENT '租赁用途' AFTER `merchant_id`, | |||||
| ADD COLUMN `contractual_rules` json COMMENT '{total:3,partyA:2,partyB:1}' AFTER `lease_purpose`, | |||||
| ADD COLUMN `delivery_date` datetime(0) COMMENT '交付日期' AFTER `contractual_rules`, | |||||
| ADD COLUMN `delivery_grace_period` int(11) COMMENT '交付宽限期(天)' AFTER `delivery_date`, | |||||
| ADD COLUMN `opening_date` datetime(0) COMMENT '开业日期' AFTER `delivery_grace_period`, | |||||
| ADD COLUMN `business_hours` json COMMENT '营业时间{start:,end:}' AFTER `opening_date`; | |||||
| ALTER TABLE `mallink`.`wx_rent_contract` | |||||
| ADD COLUMN `social_credit_code_a` varchar(255) COMMENT '甲方统一社会信用代码' AFTER `contract_number`, | |||||
| ADD COLUMN `bank_name_a` varchar(255) COMMENT '甲方开户银行' AFTER `social_credit_code_a`, | |||||
| ADD COLUMN `account_name_a` varchar(255) COMMENT '甲方开户名称' AFTER `bank_name_a`, | |||||
| ADD COLUMN `account_num_a` varchar(255) COMMENT '甲方银行账号' AFTER `account_name_a`; | |||||
| ALTER TABLE `mallink`.`wx_rent_contract` | |||||
| ADD COLUMN `property_name` varchar(255) COMMENT '物业公司名称' AFTER `account_num_a`, | |||||
| ADD COLUMN `property_fee` int(11) COMMENT '物业费金额' AFTER `property_name`, | |||||
| ADD COLUMN `fee_cycle` tinyint(1) COMMENT '物业费支付周期(月/季/年)' AFTER `property_fee`, | |||||
| ADD COLUMN `water_fee` int(11) COMMENT '水费(分/吨)' AFTER `fee_cycle`, | |||||
| ADD COLUMN `electricity_fees` int(11) COMMENT '电费(分/度)' AFTER `water_fee`; | |||||
| ALTER TABLE `mallink`.`wx_rent_contract` | |||||
| ADD COLUMN `link_address` varchar(255) COMMENT '联系地址' AFTER `link_phone`, | |||||
| MODIFY COLUMN `bank_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '开户行名称' AFTER `pay_account`; | |||||
| ALTER TABLE `mallink`.`wx_rent_contract` | |||||
| ADD COLUMN `social_credit_code` varchar(255) COMMENT '乙方统一社会信用代码' AFTER `bank_name`, | |||||
| ADD COLUMN `account_name` varchar(255) COMMENT '乙方开户名称' AFTER `social_credit_code`, | |||||
| ADD COLUMN `taxpayer_number` varchar(255) COMMENT '乙方纳税人识别号' AFTER `account_name`, | |||||
| ADD COLUMN `taxpayer_adress` varchar(255) COMMENT '乙方税务登记地址' AFTER `taxpayer_number`; | |||||
| @@ -112,6 +112,8 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/alipay/notify/**", "anon"); | filterChainDefinitionMap.put("/alipay/notify/**", "anon"); | ||||
| filterChainDefinitionMap.put("/jinmao/notify/**", "anon"); | |||||
| filterChainDefinitionMap.put("/wxMsgCallback/**", "anon"); | filterChainDefinitionMap.put("/wxMsgCallback/**", "anon"); | ||||
| filterChainDefinitionMap.put("/carCallback/**", "anon"); | filterChainDefinitionMap.put("/carCallback/**", "anon"); | ||||
| filterChainDefinitionMap.put("/jieshunCarCallback/**", "anon"); | filterChainDefinitionMap.put("/jieshunCarCallback/**", "anon"); | ||||
| @@ -105,6 +105,111 @@ public class WxRentContract extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer endProperty; | private Integer endProperty; | ||||
| // 商品类别 业态 | |||||
| // 租赁用途 | |||||
| private String leasePurpose; | |||||
| // 联系地址 | |||||
| // 本合同正本一式 份,甲方执 份,乙方执 份 | |||||
| //{total:,partyA:,partyB:} | |||||
| private String contractualRules; | |||||
| // 商铺交付日期 | |||||
| private Date deliveryDate; | |||||
| // 交付宽限期(天) | |||||
| private Integer deliveryGracePeriod; | |||||
| // 开业日期 | |||||
| private Date openingDate; | |||||
| // 营业时间 每日 点至 点 | |||||
| //{start:,end:} | |||||
| private String businessHours; | |||||
| // 合同期内 米不得新设相同品牌之分店或加盟店 | |||||
| // 物业公司名称 请输入物业公司名称 | |||||
| // 物业费金额 请输入金额 | |||||
| // 物业费支付周期 | |||||
| // | |||||
| // 水费 元/吨 | |||||
| // | |||||
| // 电费 元/度 | |||||
| // 甲方开户银行 | |||||
| // 甲方开户名称 | |||||
| // 甲方银行账号 | |||||
| // | |||||
| // 乙方开户银行 | |||||
| // 乙方开户名称 | |||||
| // 乙方银行账号 | |||||
| // | |||||
| // 乙方纳税人识别号 | |||||
| // 乙方税务登记地址 | |||||
| // 乙方开户银行 | |||||
| // 乙方开户名称 | |||||
| // 乙方银行账号 | |||||
| // 乙方联系电话 | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") | |||||
| private String contractNumber; | |||||
| //甲方信息(公司,地址,电话取wx_mall) | |||||
| // 甲方统一社会信用代码 | |||||
| private String socialCreditCodeA; | |||||
| // 甲方开户银行 | |||||
| private String bankNameA; | |||||
| // 甲方开户名称 | |||||
| private String accountNameA; | |||||
| // 甲方银行账号 | |||||
| private String accountNumA; | |||||
| //物业信息 | |||||
| //物业公司名称 | |||||
| private String propertyName; | |||||
| //物业费金额(元/月) | |||||
| private Integer propertyFee; | |||||
| //物业费支付周期(月/季/年) | |||||
| private Integer feeCycle; | |||||
| //水费(分/吨) | |||||
| private Integer waterFee; | |||||
| //电费(分/度) | |||||
| private Integer electricityFees; | |||||
| //乙方信息 | |||||
| //联系方式 | |||||
| //地址 | |||||
| private String linkAddress; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") | |||||
| private String linkPerson; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") | |||||
| private String linkPhone; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") | |||||
| private String payAccount; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") | |||||
| private String bankName; | |||||
| // 乙方统一社会信用代码 | |||||
| private String socialCreditCode; | |||||
| // 乙方开户银行 | |||||
| // 乙方开户名称 | |||||
| private String accountName; | |||||
| // 乙方银行账号 | |||||
| // 乙方纳税人识别号 | |||||
| private String taxpayerNumber; | |||||
| // 乙方税务登记地址 | |||||
| private String taxpayerAdress; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") | @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") | ||||
| @@ -123,8 +228,7 @@ public class WxRentContract extends TenantEntity { | |||||
| private Integer status; | private Integer status; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Integer> statuss; | private List<Integer> statuss; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") | |||||
| private String contractNumber; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | ||||
| private Long deposit; | private Long deposit; | ||||
| @@ -159,14 +263,9 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") | @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") | ||||
| private String rentArea; | private String rentArea; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") | |||||
| private String linkPerson; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") | |||||
| private String linkPhone; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") | |||||
| private String payAccount; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") | @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") | ||||
| private String filename; | private String filename; | ||||
| @@ -201,8 +300,7 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "审批流类型: 审批流1合同2账单3终止审批", name = "businessType") | @io.swagger.annotations.ApiModelProperty(value = "审批流类型: 审批流1合同2账单3终止审批", name = "businessType") | ||||
| private Integer businessType; | private Integer businessType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") | |||||
| private String bankName; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") | @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") | ||||
| private Integer rentShopType; | private Integer rentShopType; | ||||
| @@ -260,7 +358,7 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") | @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") | ||||
| private Integer adjustRatioWay; | private Integer adjustRatioWay; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业3金茂", name = "operationType") | |||||
| private Integer operationType; | private Integer operationType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | ||||
| @@ -8,7 +8,8 @@ package com.iformall.enums; | |||||
| public enum EnumContractOperationType { | public enum EnumContractOperationType { | ||||
| PART(1, "区分租赁物业"), | PART(1, "区分租赁物业"), | ||||
| WHOLE(2, "合并租赁物业"),; | |||||
| WHOLE(2, "合并租赁物业"), | |||||
| JINMAO(3, "金茂"),;; | |||||
| public static EnumContractOperationType getEnum(Integer code) { | public static EnumContractOperationType getEnum(Integer code) { | ||||
| for (EnumContractOperationType value : values()) { | for (EnumContractOperationType value : values()) { | ||||
| @@ -4,6 +4,14 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxRentContract"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxRentContract"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="lease_purpose" jdbcType="VARCHAR" property="leasePurpose"/> | |||||
| <result column="contractual_rules" jdbcType="VARCHAR" property="contractualRules"/> | |||||
| <result column="delivery_date" jdbcType="TIMESTAMP" property="deliveryDate"/> | |||||
| <result column="delivery_grace_period" jdbcType="INTEGER" property="deliveryGracePeriod"/> | |||||
| <result column="opening_date" jdbcType="TIMESTAMP" property="openingDate"/> | |||||
| <result column="business_hours" jdbcType="VARCHAR" property="businessHours"/> | |||||
| <result column="price" jdbcType="INTEGER" property="price"/> | <result column="price" jdbcType="INTEGER" property="price"/> | ||||
| <result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/> | <result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/> | ||||
| <result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/> | <result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/> | ||||
| @@ -14,6 +22,17 @@ | |||||
| <result column="filepath" jdbcType="VARCHAR" property="filepath"/> | <result column="filepath" jdbcType="VARCHAR" property="filepath"/> | ||||
| <result column="status" jdbcType="INTEGER" property="status"/> | <result column="status" jdbcType="INTEGER" property="status"/> | ||||
| <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | ||||
| <result column="social_credit_code_a" jdbcType="VARCHAR" property="socialCreditCodeA"/> | |||||
| <result column="bank_name_a" jdbcType="VARCHAR" property="bankNameA"/> | |||||
| <result column="account_name_a" jdbcType="VARCHAR" property="accountNameA"/> | |||||
| <result column="account_num_a" jdbcType="VARCHAR" property="accountNumA"/> | |||||
| <result column="property_name" jdbcType="VARCHAR" property="propertyName"/> | |||||
| <result column="property_fee" jdbcType="INTEGER" property="propertyFee"/> | |||||
| <result column="fee_cycle" jdbcType="INTEGER" property="feeCycle"/> | |||||
| <result column="water_fee" jdbcType="INTEGER" property="waterFee"/> | |||||
| <result column="electricity_fees" jdbcType="INTEGER" property="electricityFees"/> | |||||
| <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"/>--> | ||||
| @@ -31,6 +50,13 @@ | |||||
| <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> | <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> | ||||
| <result column="link_phone" jdbcType="VARCHAR" property="linkPhone"/> | <result column="link_phone" jdbcType="VARCHAR" property="linkPhone"/> | ||||
| <result column="pay_account" jdbcType="VARCHAR" property="payAccount"/> | <result column="pay_account" jdbcType="VARCHAR" property="payAccount"/> | ||||
| <result column="link_address" jdbcType="VARCHAR" property="linkAddress"/> | |||||
| <result column="social_credit_code" jdbcType="VARCHAR" property="socialCreditCode"/> | |||||
| <result column="account_name" jdbcType="VARCHAR" property="accountName"/> | |||||
| <result column="taxpayer_number" jdbcType="VARCHAR" property="taxpayerNumber"/> | |||||
| <result column="taxpayer_adress" jdbcType="VARCHAR" property="taxpayerAdress"/> | |||||
| <result column="filename" jdbcType="VARCHAR" property="filename"/> | <result column="filename" jdbcType="VARCHAR" property="filename"/> | ||||
| <result column="lease" jdbcType="INTEGER" property="lease"/> | <result column="lease" jdbcType="INTEGER" property="lease"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| @@ -90,9 +116,15 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`, | |||||
| `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, | |||||
| `id`,`merchant_id`, | |||||
| `lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`, | |||||
| `price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`, | |||||
| `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`, | |||||
| `social_credit_code_a`,`bank_name_a`,`account_name_a`,`account_num_a`, | |||||
| `property_name`,`property_fee`,`fee_cycle`,`water_fee`,`electricity_fees`, | |||||
| `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`, | ||||
| `link_address`,`social_credit_code`,`account_name`,`taxpayer_number`,`taxpayer_adress`, | |||||
| `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`, | ||||
| `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, | `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, | ||||