From e873f4ba53695645a1c0b07ae70021146bfcdce9 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 21 May 2019 16:43:19 +0800 Subject: [PATCH] =?UTF-8?q?[BIGINT/TENANTID][=E4=BF=AE=E6=94=B9]:bigint?= =?UTF-8?q?=E6=9C=80=E5=A4=A720=EF=BC=8CtenantId=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905211414__CHANGE_BIGINT_TENANT.sql | 576 ++++++++++++++++++ .../impl/WxCouponInjectServiceImpl.java | 4 + 2 files changed, 580 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905211414__CHANGE_BIGINT_TENANT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211414__CHANGE_BIGINT_TENANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211414__CHANGE_BIGINT_TENANT.sql new file mode 100644 index 000000000..20245d0d8 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905211414__CHANGE_BIGINT_TENANT.sql @@ -0,0 +1,576 @@ +ALTER TABLE `mall_permission` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `parent_id` `parent_id` bigint(20) DEFAULT NULL COMMENT '父编号ID,一级菜单为0'; + +ALTER TABLE `mall_resource` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) DEFAULT NULL COMMENT '租户ID'; + +ALTER TABLE `mall_role` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `mall_role_permission` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `permission_id` `permission_id` bigint(20) DEFAULT NULL COMMENT '权限ID', +CHANGE COLUMN `role_id` `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID'; + +ALTER TABLE `mall_sale_type` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL; + +ALTER TABLE `mall_user_action` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `mall_user_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `is_admin` `is_admin` int(1) DEFAULT '0' COMMENT '0 不是超管 1是超管'; + +ALTER TABLE `mall_user_role` +CHANGE COLUMN `uid` `uid` bigint(20) DEFAULT NULL COMMENT '用户ID', +CHANGE COLUMN `role_id` `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID', +CHANGE COLUMN `id` `id` bigint(20) NOT NULL; + +ALTER TABLE `push_limit` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL, +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `schedule_job` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '任务id', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `schedule_job_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '任务日志id', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_admin_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_appinfo` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `pay_id` `pay_id` bigint(20) DEFAULT NULL COMMENT '支付ID,参考wx_pay_account', +CHANGE COLUMN `pay_bill_id` `pay_bill_id` bigint(20) DEFAULT NULL COMMENT '账户支付ID'; + +ALTER TABLE `wx_authorizer_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) DEFAULT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_b_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_bill_action` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) NOT NULL COMMENT '用户ID', +CHANGE COLUMN `bill_id` `bill_id` bigint(20) DEFAULT NULL COMMENT '账单ID'; + +ALTER TABLE `wx_bill_daily` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_other` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_other_deposit` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_property` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `property_contract_id` `property_contract_id` bigint(20) DEFAULT NULL COMMENT '物业合同ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_property_deposit` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `property_contract_id` `property_contract_id` bigint(20) DEFAULT NULL COMMENT '物业合同ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_rent` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `rent_contract_id` `rent_contract_id` bigint(20) DEFAULT NULL COMMENT '租金合同ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_bill_rent_deposit` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `rent_contract_id` `rent_contract_id` bigint(20) DEFAULT NULL COMMENT '租金合同ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '账号ID', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_brand` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_c_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_c_user` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_c_user_basic_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `tag_id` `tag_id` bigint(20) DEFAULT NULL COMMENT '用户标签ID'; + +ALTER TABLE `wx_c_user_car` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) NOT NULL COMMENT 'c端用户id'; + +ALTER TABLE `wx_c_user_from_b` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `b_user_id` `b_user_id` bigint(20) NOT NULL COMMENT 'b_user_id', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) NOT NULL COMMENT 'c_user_id'; + +ALTER TABLE `wx_campaign` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `mechant_id` `mechant_id` bigint(20) DEFAULT NULL COMMENT '门店id'; + +ALTER TABLE `wx_car_cmd_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_car_pay_record` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `stayed_time` `stayed_time` int(11) DEFAULT NULL COMMENT '逗留时长'; + +ALTER TABLE `wx_card_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '券ID'; + +ALTER TABLE `wx_card_spend` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `card_id` `card_id` bigint(20) NOT NULL COMMENT '储值卡ID', +CHANGE COLUMN `owner_id` `owner_id` bigint(20) NOT NULL COMMENT '持有人ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) DEFAULT NULL COMMENT '订单账号'; + +ALTER TABLE `wx_card_transfer_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_order_id` `coupon_order_id` bigint(20) NOT NULL COMMENT '券与订单关系ID', +CHANGE COLUMN `from_user` `from_user` bigint(20) unsigned NOT NULL COMMENT '转赠者', +CHANGE COLUMN `to_user` `to_user` bigint(20) NOT NULL COMMENT '领取者'; + +ALTER TABLE `wx_channel` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_chart_data` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_component_verify_ticket` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_coupon` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_coupon_action_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) DEFAULT NULL COMMENT 'coupon id', +CHANGE COLUMN `coupon_order_id` `coupon_order_id` bigint(20) DEFAULT NULL COMMENT 'channel_type为1时,存orderId,其他存couponOrderId', +CHANGE COLUMN `channel_id` `channel_id` bigint(20) DEFAULT NULL COMMENT '0.精准发券(coupon_inject),1.主动领取(保留)(coupon_channel),2.停车发券3.核销发券4.B端刷卡发券5.购买发券(coupon_send)'; + +ALTER TABLE `wx_coupon_car` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `park_id` `park_id` bigint(20) NOT NULL COMMENT '停车场ID'; + +ALTER TABLE `wx_coupon_channel` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '卡券id', +CHANGE COLUMN `sub_target_id` `sub_target_id` bigint(20) DEFAULT NULL COMMENT '子频道ID'; + +ALTER TABLE `wx_coupon_inject` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `m_user_id` `m_user_id` bigint(20) DEFAULT NULL, +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '券id', +CHANGE COLUMN `model_id` `model_id` bigint(20) DEFAULT NULL COMMENT '短信模板id', +CHANGE COLUMN `update_time` `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', +CHANGE COLUMN `msg_id` `msg_id` bigint(20) DEFAULT NULL COMMENT '短信id'; + +ALTER TABLE `wx_coupon_merchant` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `product_id` `product_id` bigint(20) NOT NULL COMMENT '产品ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID'; + +ALTER TABLE `wx_coupon_order` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '单张券ID', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) unsigned NOT NULL COMMENT 'c端用户id', +CHANGE COLUMN `owner_id` `owner_id` bigint(20) NOT NULL COMMENT '卡券持有者', +CHANGE COLUMN `b_user_id` `b_user_id` bigint(20) DEFAULT NULL COMMENT '操作券B端小程序用户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) unsigned DEFAULT NULL COMMENT '用户订单ID'; + +ALTER TABLE `wx_coupon_send` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '单张券ID'; + +ALTER TABLE `wx_coupon_send_config` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_coupon_type` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_credit_history` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) NOT NULL COMMENT '用户ID', +CHANGE COLUMN `operator_id` `operator_id` bigint(20) NOT NULL COMMENT '操作人ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) DEFAULT NULL COMMENT '券ID(积分兑换券时生成)', +CHANGE COLUMN `business_id` `business_id` bigint(20) DEFAULT NULL COMMENT '业态ID(计算新增积分时使用)'; + +ALTER TABLE `wx_date_amount_record` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID'; + +ALTER TABLE `wx_device` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_flow_record` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `business_id` `business_id` bigint(20) NOT NULL COMMENT '业务id', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '用户id'; + +ALTER TABLE `wx_game` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_game_action_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `game_id` `game_id` bigint(20) NOT NULL COMMENT '游戏ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) NOT NULL COMMENT 'c用户ID', +CHANGE COLUMN `coupon_order_id` `coupon_order_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '券包ID'; + +ALTER TABLE `wx_group` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_level_config` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_level_merchant` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `level_id` `level_id` bigint(20) NOT NULL COMMENT '会员等级ID'; + +ALTER TABLE `wx_mall` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_mall_apply` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_mall_building` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `mall_id` `mall_id` bigint(20) NOT NULL COMMENT '商场id'; + +ALTER TABLE `wx_mall_floor` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `mall_id` `mall_id` bigint(20) NOT NULL COMMENT '商场id', +CHANGE COLUMN `building_id` `building_id` bigint(20) NOT NULL COMMENT '楼座id'; + +ALTER TABLE `wx_merchant` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `brand` `brand` bigint(64) DEFAULT NULL COMMENT '品牌'; + +ALTER TABLE `wx_merchant_b_user` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户id'; + +ALTER TABLE `wx_merchant_corp` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户id'; + +ALTER TABLE `wx_merchant_shop` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户id', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) NOT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_merchant_subsidy` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '订单ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `coupon_order_id` `coupon_order_id` bigint(20) NOT NULL COMMENT '券包ID/存储卡ID'; + +ALTER TABLE `wx_merchant_tax` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID'; + +ALTER TABLE `wx_merchant_trade_daily` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `b_user_id` `b_user_id` bigint(20) DEFAULT NULL COMMENT 'B端用户ID'; + +ALTER TABLE `wx_msg` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `model_id` `model_id` bigint(64) DEFAULT NULL COMMENT '模板id', +CHANGE COLUMN `coupon_inject_id` `coupon_inject_id` bigint(64) DEFAULT NULL COMMENT '精准投放ID'; + +ALTER TABLE `wx_msg_callback` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `msg_id` `msg_id` bigint(20) DEFAULT NULL, +CHANGE COLUMN `callback_id` `callback_id` bigint(20) DEFAULT NULL; + +ALTER TABLE `wx_msg_config` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_msg_model` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_msg_record` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) DEFAULT NULL COMMENT '租户ID', +CHANGE COLUMN `model_id` `model_id` bigint(20) DEFAULT NULL COMMENT '模板id', +CHANGE COLUMN `sender_user_id` `sender_user_id` bigint(20) DEFAULT NULL COMMENT '发送人id', +CHANGE COLUMN `receiver_user_id` `receiver_user_id` bigint(20) DEFAULT NULL COMMENT '接收人用户id'; + +ALTER TABLE `wx_msg_signature` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_msg_validationcode` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) DEFAULT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_order` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_number` `order_number` bigint(20) NOT NULL COMMENT '订单码;正反向交易保持一致。', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) DEFAULT NULL COMMENT 'c端用户id', +CHANGE COLUMN `coupon_channel_id` `coupon_channel_id` bigint(20) DEFAULT NULL COMMENT 'coupon_channel_id', +CHANGE COLUMN `product_id` `product_id` bigint(20) DEFAULT NULL COMMENT 'coupon:couponid, micropay:buserId, cardpay:merchantid', +CHANGE COLUMN `order_group_id` `order_group_id` bigint(64) NOT NULL DEFAULT '0' COMMENT '团单ID'; + +ALTER TABLE `wx_order_group` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '首个订单ID', +CHANGE COLUMN `coupon_id` `coupon_id` bigint(20) NOT NULL COMMENT '券ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID'; + +ALTER TABLE `wx_order_press` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '订单ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) NOT NULL COMMENT '砍价参与人ID'; + +ALTER TABLE `wx_park` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_pay_account` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_pay_account_bill` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_pay_bill` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `bill_id` `bill_id` bigint(20) NOT NULL COMMENT '账单ID', +CHANGE COLUMN `b_user_id` `b_user_id` bigint(20) NOT NULL COMMENT '用户ID'; + +ALTER TABLE `wx_pay_order` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '订单ID', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) DEFAULT NULL COMMENT '用户ID', +CHANGE COLUMN `b_user_id` `b_user_id` bigint(20) DEFAULT NULL COMMENT 'b端用户'; + +ALTER TABLE `wx_profit_sharing_order` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '接收方(商场租户id)', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '支付订单ID'; + +ALTER TABLE `wx_profit_sharing_receiver` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '接收方(商场租户id)', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) NOT NULL COMMENT '商户ID'; + +ALTER TABLE `wx_profit_sharing_result` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '接收方(商场租户id)', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(64) DEFAULT NULL COMMENT '商户ID', +CHANGE COLUMN `sharing_order_id` `sharing_order_id` bigint(20) NOT NULL COMMENT '分账订单号', +CHANGE COLUMN `sharing_receiver_id` `sharing_receiver_id` bigint(20) NOT NULL COMMENT '分账接收方id'; + +ALTER TABLE `wx_property_contract` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户id', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户', +CHANGE COLUMN `brand` `brand` bigint(20) DEFAULT NULL COMMENT '经营品牌', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID', +CHANGE COLUMN `rent_contract_id` `rent_contract_id` bigint(20) DEFAULT NULL COMMENT '租金合同ID'; + +ALTER TABLE `wx_question` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_question_config` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_question_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `user_id` `user_id` bigint(20) NOT NULL COMMENT '答题用户id', +CHANGE COLUMN `question_id` `question_id` bigint(20) NOT NULL COMMENT '问题id'; + +ALTER TABLE `wx_refund_order` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) NOT NULL COMMENT '订单ID-out_trade_no', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) NOT NULL COMMENT '用户ID'; + +ALTER TABLE `wx_rent_contract` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `merchant_id` `merchant_id` bigint(20) DEFAULT NULL COMMENT '商户', +CHANGE COLUMN `brand` `brand` bigint(20) DEFAULT NULL COMMENT '经营品牌', +CHANGE COLUMN `shop_id` `shop_id` bigint(20) DEFAULT NULL COMMENT '商铺ID'; + +ALTER TABLE `wx_score_history` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `c_user_id` `c_user_id` bigint(20) NOT NULL COMMENT '会员ID', +CHANGE COLUMN `order_id` `order_id` bigint(20) DEFAULT NULL COMMENT '单据号'; + +ALTER TABLE `wx_score_rules` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_score_validity_period` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_screen_ad` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `target_id` `target_id` bigint(20) NOT NULL COMMENT '广告ID, 类型为券时,标识couponchannelid,类型为宣传页时,为宣传页id'; + +ALTER TABLE `wx_shop` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `building` `building` bigint(20) NOT NULL COMMENT '楼座号', +CHANGE COLUMN `floor` `floor` bigint(20) NOT NULL COMMENT '楼层号', +CHANGE COLUMN `longitude` `longitude` decimal(10,5) DEFAULT NULL COMMENT '经度- baidu poi', +CHANGE COLUMN `latitude` `latitude` decimal(10,5) DEFAULT NULL COMMENT '维度-baidu poi'; + +ALTER TABLE `wx_subsidy` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID', +CHANGE COLUMN `operator_user_id` `operator_user_id` bigint(20) NOT NULL COMMENT '操作用户ID'; + +ALTER TABLE `wx_tags` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `group_id` `group_id` bigint(20) NOT NULL, +CHANGE COLUMN `type_id` `type_id` bigint(20) NOT NULL; + +ALTER TABLE `wx_tags_group` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_tags_type` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `group_id` `group_id` bigint(20) NOT NULL; + +ALTER TABLE `wx_template_msg` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_topic` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_user_channel` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_user_visit` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_weapp_audit_status` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_weapp_code_status` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_weapp_ext_set` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID'; + +ALTER TABLE `wx_weapp_release_status` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_web_log` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; + +ALTER TABLE `wx_wiwide_info` +CHANGE COLUMN `id` `id` bigint(20) NOT NULL COMMENT '主键ID', +CHANGE COLUMN `tenant_id` `tenant_id` varchar(10) NOT NULL COMMENT '租户ID'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 8be4626d7..03112a7e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -73,12 +73,16 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { @Override public void saveOrUpdate(WxCouponInject record) { + Date curDate = new Date(); if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateTime(curDate); + record.setUpdateTime(curDate); couponInjectMapper.insertSelective(record); } else { + record.setUpdateTime(curDate); couponInjectMapper.updateByPrimaryKeySelective(record); } }