diff --git a/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql b/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql new file mode 100644 index 000000000..db2cfc464 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql @@ -0,0 +1,30 @@ +## 1. 初始化店铺, 初始化写字楼铺位。 +## 2. 写字楼铺位初始化后,需要设置虚拟商户,关联铺位。 +INSERT INTO wx_merchant (`id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`, +`car_vendor_type`,`status`,`link_person`,`business_id`,`is_public`,`is_private`,`cover_picture`,`bill_setting`,`is_admin`,`top_time`, +`is_del`,`search_card_by_phone`,`credit_locked`,`entry_amount`,`cash_out_number`,`cash_out_count`,`create_from`,`create_from_id`,`create_from_data`) +SELECT id ,'1022',NULL,'https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png', CONCAT('[系统铺位号]',shop_number),'11111111111',NOW(),NOW(), +0,1,'虚拟',6,0,1,'["https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png"]',3,0,NOW(), +0,0,0,0,0,0,3,id, shop_number +FROM wx_shop WHERE tenant_id = 1022 AND building = 1250 + +## 3. 关联虚拟商户和铺位 +INSERT INTO wx_merchant_shop (`id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`shop_id`,`create_date`,`update_date`,`is_del`) +SELECT id,'1022',NULL,id,id,NOW(),NOW(),0 FROM wx_shop WHERE tenant_id = 1022 AND building = 1250 + +## 4. 写字楼铺位设置位已出租状态 +UPDATE wx_shop SET STATUS = 1 WHERE tenant_id = 1022 AND building = 1250 + + +#### 设置业主, 只是记录,以后不能复用 ##### +SELECT * FROM wx_merchant_tttt; +SELECT * FROM wx_merchant_shop_ttttt; + +SELECT * FROM wx_merchant_mulity_tttt ; +SELECT * FROM wx_merchant_shop_mulity_ttttt; + +INSERT INTO `wx_shop_users` (`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`type`,`principal_type`,`name`,`phone`,`create_date`,`update_date`,`status`) +SELECT id,'1022',NULL,shop_id,1,1,NAME,link_phone,NOW(),NOW(),0 FROM wx_merchant_tttt + +INSERT INTO `wx_shop_users` (`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`type`,`principal_type`,`name`,`phone`,`create_date`,`update_date`,`status`) +SELECT id,'1022',NULL,shop_id,1,1,merchant_name,phone,NOW(),NOW(),0 FROM wx_merchant_shop_mulity_ttttt diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java index b32a8ed33..09d891b0e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java @@ -90,8 +90,8 @@ public class WxShopUsers extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Excel(name="状态",width = 20,orderNum = "7",replace = {"未出租_0","已出租_1"}) - @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)EnumShopUsersStatus",name="status") + @Excel(name="状态",width = 20,orderNum = "7",replace = {"当前_0","往任_1"}) + @io.swagger.annotations.ApiModelProperty(value="状态(0:当前, 1:往任)EnumShopUsersStatus",name="status") private Integer status; @TableField(exist = false) private String statusName;