diff --git a/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql b/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql index 8f6f77b54..1e1ea7968 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql @@ -3,3 +3,13 @@ INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permissio --销售类型加权限 update mall_sale_type set menus = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; + + +--加金茂合同菜单 +INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (307, '金茂合同', 299, 'Y', NULL, 1, NULL, NULL, 'jmrentlist', 'icon-zhangdan', 0, 307); +INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (308, '租金合同', 300, 'Y', NULL, 1, NULL, NULL, 'jmpointrentlist', 'icon-wuyehetong', 0, 308); + + + +--销售类型加权限 +update mall_sale_type set menus = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql b/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql index 975aec23b..4df8524c3 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql @@ -1,10 +1,22 @@ -ALTER TABLE `mallink`.`wx_rent_contract` -ADD COLUMN `lease_purpose` varchar(255) COMMENT '租赁用途' AFTER `merchant_id`, +ALTER TABLE `mallink`.`wx_mall` +ADD COLUMN `social_credit_code` varchar(255) COMMENT '甲方统一社会信用代码' AFTER `longitude`, +ADD COLUMN `bank_name` varchar(255) COMMENT '甲方开户银行' AFTER `social_credit_code`, +ADD COLUMN `account_name` varchar(255) COMMENT '甲方开户名称' AFTER `bank_name`, +ADD COLUMN `account_num` varchar(255) COMMENT '甲方银行账号' AFTER `account_name`; + + + + + +ALTER TABLE `mallink`.`wx_rent_contract` +ADD COLUMN `shop_type_sub` varchar(255) COMMENT '商品类别' AFTER `merchant_id`, +ADD COLUMN `lease_purpose` varchar(255) COMMENT '租赁用途' AFTER `shopTypeSub`, 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`; +ADD COLUMN `scope_metre` int(11) COMMENT '合同期内?米不得新设相同品牌之分店或加盟店' AFTER `business_hours`; ALTER TABLE `mallink`.`wx_rent_contract` diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 0bedd604e..edbee4343 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -93,7 +93,16 @@ public class WxMall extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="支付宝app authToken,永久有效",name="alipayAppAuthToken") private String alipayAppAuthToken; @io.swagger.annotations.ApiModelProperty(value="支付宝app authToken,永久有效",name="alipayAppAuthToken") - private String alipayMemberTemplateId; + private String alipayMemberTemplateId; + + // 甲方统一社会信用代码 + private String socialCreditCode; + // 甲方开户银行 + private String bankName; + // 甲方开户名称 + private String accountName; + // 甲方银行账号 + private String accountNum; 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 4249b0558..0691e2d2b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -106,7 +106,8 @@ public class WxRentContract extends TenantEntity { private Integer endProperty; -// 商品类别 业态 +// 商品类别 + private String shopTypeSub; // 租赁用途 private String leasePurpose; @@ -124,6 +125,7 @@ public class WxRentContract extends TenantEntity { //{start:,end:} private String businessHours; // 合同期内 米不得新设相同品牌之分店或加盟店 + private Integer scopeMetre; // 物业公司名称 请输入物业公司名称 // 物业费金额 请输入金额 @@ -265,8 +267,6 @@ public class WxRentContract extends TenantEntity { - - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") private String filename; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 601b15858..f1c33f36e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1851,6 +1851,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //MALL信息 WxMall wxMall = new WxMall(); wxMall.setTenantInfo(wxRentContract); + result.put("mallList",wxMallMapper.findList(new WxMall())); wxMall = wxMallMapper.findList(wxMall).get(0); result.put("mallName", wxMall.getName()); result.put("province", wxMall.getProvince()); diff --git a/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx b/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx index a993fd546..da6e1a46d 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx and b/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx differ diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 57926db57..be550fd28 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -41,6 +41,11 @@ + + + + + @@ -56,7 +61,8 @@ `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, `sale_type`, `valid_start`, `valid_end`,`business_hours`,`introduction`,`img`, - `group_support`,`latitude`,`longitude`,`live_support`,`cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id` + `group_support`,`latitude`,`longitude`,`live_support`,`cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id`, + `social_credit_code`,`bank_name`,`account_name`,`account_num` diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 95aa8af11..4834ed4c1 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -5,12 +5,14 @@ + + @@ -117,7 +119,7 @@ `id`,`merchant_id`, - `lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`, + `shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, `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`,