add GaoPackage

src/main/resources/db/migration/timiserver/V49__add_gao_event_record_updated_by.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `gao_event_record`
+	ADD COLUMN `updated_by` VARCHAR(36) NULL COMMENT '最后修改用户 ID' AFTER `updated_at`;
+
+UPDATE `gao_event_record`
+SET `updated_by` = `operator_user_id`
+WHERE `updated_by` IS NULL;
+
+ALTER TABLE `gao_event_record`
+	MODIFY COLUMN `updated_by` VARCHAR(36) NOT NULL COMMENT '最后修改用户 ID';

src/main/resources/db/migration/timiserver/V51__bind_gao_package_purchase_event.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `gao_event`
+	ADD COLUMN `package_config_id` VARCHAR(36) NULL COMMENT '购买套餐事件绑定的套餐配置 ID' AFTER `biz_type`,
+	ADD KEY `idx_gao_event_package_config` (`package_config_id`, `deleted_at`);

src/main/resources/db/migration/timiserver/V52__remove_gao_store_manager_inheritance.sql

@@ -0,0 +1,10 @@
+UPDATE `role_permission_inherit` inherit
+JOIN `role` parent_role ON parent_role.id = inherit.parent_role_id
+JOIN `role` child_role ON child_role.id = inherit.child_role_id
+SET inherit.deleted_at = UNIX_TIMESTAMP() * 1000
+WHERE
+	inherit.deleted_at IS NULL
+	AND parent_role.module_code = 'GAO'
+	AND parent_role.code = 'GLOBAL_MANAGER'
+	AND child_role.module_code = 'GAO'
+	AND child_role.code = 'STORE_MANAGER';

src/main/resources/mapper/timi-server/gao/GaoCustomerPackageItemMapper.xml

@@ -25,11 +25,15 @@
 	<update id="updateReservedQuantity">
 		UPDATE `gao_customer_package_item`
 		SET `reserved_quantity` = `reserved_quantity` + #{delta}, `updated_at` = FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000)
-		WHERE `id` = #{id} AND `deleted_at` IS NULL AND `reserved_quantity` + #{delta} &gt;= 0
+		WHERE `id` = #{id} AND `deleted_at` IS NULL
+			AND `reserved_quantity` + #{delta} &gt;= 0
+			AND `reserved_quantity` + `delivered_quantity` + #{delta} &lt;= `total_quantity`
 	</update>
 	<update id="updateDeliveredQuantity">
 		UPDATE `gao_customer_package_item`
 		SET `delivered_quantity` = `delivered_quantity` + #{delta}, `updated_at` = FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) 
-		WHERE `id` = #{id} AND `deleted_at` IS NULL AND `delivered_quantity` + #{delta} &gt;= 0
+		WHERE `id` = #{id} AND `deleted_at` IS NULL
+			AND `delivered_quantity` + #{delta} &gt;= 0
+			AND `reserved_quantity` + `delivered_quantity` + #{delta} &lt;= `total_quantity`
 	</update>
 </mapper>

src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml

@@ -65,6 +65,7 @@
 			`verification_status` = 'VERIFIED',
 			`verifier_user_id` = #{verifierUserId},
 			`verified_at` = #{verifiedAt},
+			`updated_by` = #{updatedBy},
 			`updated_at` = ROUND(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000)
 		WHERE
 			`id` = #{id}

src/main/resources/mapper/timi-server/user/RolePermissionMapper.xml

@@ -16,7 +16,7 @@
 		SELECT DISTINCT
 			permission.*
 		FROM `role_permission`
-		LEFT JOIN `permission` ON permission.id = role_permission.permission_id
+		INNER JOIN `permission` ON permission.id = role_permission.permission_id
 		WHERE
 			`role_permission`.`role_id` IN
 			<foreach collection="roleIdList" item="item" separator="," open="(" close=")">