@bee-hole/server 2.0.7 → 2.2.0

package/resource/public/html/h5pay.html

@@ -57,7 +57,7 @@
       margin-bottom: 20px;
     }
 
-    .payment-method {
+    .payment-method, .xianxia-payment-method {
       border: 2px solid #ddd;
       border-radius: 8px;
       padding: 15px;
@@ -66,15 +66,21 @@
       transition: all 0.3s ease;
     }
 
-    .payment-method:hover {
+    .payment-method:hover, .xianxia-payment-method:hover {
       border-color: #3182ce;
       background-color: #ebf8ff;
     }
 
-    .payment-method img {
+    .payment-method img, .xianxia-payment-method img {
       height: 22px;
       margin-bottom: 10px;
     }
+    .xianxia-payment-method h3 p span , .xianxia-payment-method h3 span{
+      white-space: pre-wrap !important;
+      word-break: break-all !important;
+      display: block;
+      text-align: left;
+    }
 
     .currency-select {
       display: block;
@@ -179,11 +185,14 @@
     <div id="loading" data-i18n="loading">加载支付方式中...</div>
     <div id="payment-methods" class="payment-methods"></div>
     <button id="pay-button" class="pay-button" disabled data-i18n="payNow">去支付</button>
+    <div id="xianxia-payment-methods" class="payment-methods" style="margin-top: 1rem;"></div>
   </div>
 
   <script>
     var debug = false;
-    const httpurl = 'https://beehole.bee-hole.com';
+    // const httpurl = 'https://beehole.bee-hole.com';
+    // const httpurl = 'https://xbuy.96101210.com';
+    const httpurl = 'http:///192.168.3.58:8299';
     const translations = {
       'zh-CN': {
         paymentDetails: '支付详情',
@@ -203,6 +212,7 @@
         balance: '余额',
         paySuccess: '支付成功',
         sanbarcodePay: '请扫上面的支付码支付',
+        xianxiaPayTitle: '线下支付',
       },
       'en-US': {
         paymentDetails: 'Payment Details',
@@ -221,7 +231,8 @@
         translatePrice: 'Translate Price',
         balance: 'Balance',
         paySuccess: 'Payment Success',
-        sanbarcodePay: '请扫上面的支付码支付',
+        sanbarcodePay: 'Please scan the above payment code to pay',
+        xianxiaPayTitle: 'Offline Payment',
       }
     };
 
@@ -310,7 +321,7 @@
         fetch(api, {
           method: 'POST',
           headers: {
-            'Admin-Locale': currentLanguage,
+            'admin-locale': 'zh-CN',
             'Content-Type': 'application/json' // 如果需要 token 认证
           },
           body: JSON.stringify({
@@ -361,6 +372,7 @@
     function renderPaymentMethods(methods) {
       const container = document.getElementById('payment-methods');
       container.innerHTML = methods.map(method => {
+        if (method.pay_way_id !== '9999'){
         return `
                 <div class="payment-method" data-id="${method.pay_way_id}">
                     ${method.logo ? `<img src="${method.logo}" alt="${translate(method.description)}">` : `<div style="height: 22px;"></div>`}
@@ -371,6 +383,9 @@
                     </select>` : ''}
                 </div>
             `;
+        } else {
+          return renderPaymentMethodsXianxia(method);
+        }
       }).join('');
 
       container.querySelectorAll('.payment-method').forEach(method => {
@@ -386,7 +401,17 @@
         initPay();
       }, 200);
     }
-
+    function renderPaymentMethodsXianxia(method) {
+      console.log(method , 'method');
+      const container = document.getElementById('xianxia-payment-methods');
+      container.innerHTML = `
+                <div class="xianxia-payment-method" data-id="${method.pay_way_id}">
+                    ${method.logo ? `<img src="${method.logo}" alt="${translate(method.description)}">` : `<div style="height: 22px;"></div>`}
+                    <h3 data-i18n="${('xianxiaPayTitle')}" data-id="${method.pay_way_id}">${translate('xianxiaPayTitle')}</h3>
+                    <h3>${method.description}</h3>
+                </div>
+            `;
+    }
     function selectPaymentMethod(event) {
       hiddenErrText();
       hiidenPayCode();
@@ -470,7 +495,7 @@
         fetch(api, {
           method: 'POST',
           headers: {
-            'Admin-Locale': currentLanguage,
+            'admin-locale': currentLanguage,
             'Content-Type': 'application/json' // 如果需要 token 认证
           },
           body: JSON.stringify(query)
@@ -541,7 +566,7 @@
         fetch(api, {
           method: 'POST',
           headers: {
-            'Admin-Locale': currentLanguage,
+            'admin-locale': currentLanguage,
             'Content-Type': 'application/json' // 如果需要 token 认证
           },
           body: JSON.stringify(query)
@@ -646,7 +671,21 @@
         const paymentMethods = await fetchPaymentMethods(params.credential_id);
         document.getElementById('loading').style.display = 'none';
         renderPaymentMethods(paymentMethods);
-
+//         renderPaymentMethodsXianxia({
+//           xianxiaPayWayId: params.xianxiaPayWayId,
+//           xianxiaPayWayName: params.xianxiaPayWayName,
+//           content: `<div>paypal支付：<a href="https://paypal.me/pay2leeyinn" target="_blank" rel="noopener">支付给我</a></div>
+// <div>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">Cash on Delivery Instructions I. Operational Process </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">1. Select the cash - on - delivery option when placing an order. </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">2. After we dispatch the goods, the courier will deliver the merchandise to the location you specify. </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">3. Open the package on the spot and check whether the appearance and quantity of the goods are consistent with the order. </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">4. After confirmation, pay the purchase price to the courier to complete the transaction. II. Precautions </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">1. Ensure that the receiving information is accurate. </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">2. There may be a handling charge for cash on delivery, subject to the actual situation. </span></p>
+// <p><span style="color: #1f2329; font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'SF Pro SC', 'SF Pro Display', 'SF Pro Icons', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: pre; background-color: #ffffff;">3. If there are quality problems with the goods or they do not match the order, contact customer service in a timely manner to solve the problem.</span></p>
+// </div>`
+//         });
         updatePageLanguage();
         // getOrderStatus();
       } catch (error) {

package/storage/init/init.sql

@@ -13638,7 +13638,8 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2175, 2176, 'app.menus.left.warehouse.rule', 'warehouseRule', 'bars', 'C', '', 'warehouseRule', 'wareHouse/rule/list', '', '1', '2', '2', '', 2, '', 12, '1', '2024-12-02 06:16:22', '2024-12-03 05:56:35'),
 (2176, 0, 'compoents.warehousePolicy.warehouse', 'cangku', 'home', 'M', '', '/cangku', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-12-10 07:29:36', '2024-12-10 07:29:36'),
 (2177, 0, 'app.menus.left.workOrderList', 'workOrderList', 'audit', 'C', '', 'workOrderList', 'workOrder/index', '', '1', '2', '2', '', 1, '', 10, '1', '2024-08-08 05:30:54', '2024-08-08 05:30:54'),
-(2178, 2065, 'app.menus.left.yunying.wholesale', 'wholesale-act', 'bars', 'C', '', 'wholesalelist', 'wholesaleact/list', '', '1', '2', '2', '', 2, '', 10, '1', '2024-12-24 06:45:44', '2024-12-24 07:20:42');
+(2178, 2065, 'app.menus.left.yunying.wholesale', 'wholesale-act', 'bars', 'C', '', 'wholesalelist', 'wholesaleact/list', '', '1', '2', '2', '', 2, '', 10, '1', '2024-12-24 06:45:44', '2024-12-24 07:20:42'),
+(2179, 2176, 'view.vstock.title', 'lockStock', 'ellipsis', 'C', '', 'lockStock', 'wareHouse/lock/index', '', '1', '2', '2', '', 2, '', 20, '1', '2025-01-07 08:55:55', '2025-01-16 01:48:50');
 
 -- --------------------------------------------------------
 
@@ -34519,6 +34520,7 @@ CREATE TABLE `mall_purchase` (
   `purchase_id` varchar(64) NOT NULL COMMENT '采购单编号,以P开头',
   `main_shop_id` bigint(20) NOT NULL COMMENT '主店铺shop_id(货源方标记)',
   `sub_shop_id` bigint(20) NOT NULL COMMENT '采购店铺shop_id(采购方标记)',
+  `is_virtual` tinyint(1) DEFAULT NULL COMMENT '是否是虚拟占用库存',
   `country` varchar(255) NOT NULL COMMENT '收货地址中的国家信息',
   `state` varchar(255) NOT NULL COMMENT '收货地址中的省/州信息',
   `city` varchar(255) DEFAULT NULL COMMENT '收货地址中的城市信息',
@@ -34535,7 +34537,10 @@ CREATE TABLE `mall_purchase` (
   `debit_channel` varchar(7) NOT NULL COMMENT '扣款渠道:CASH(现金),BALANCE(余额)',
   `status` varchar(16) NOT NULL COMMENT 'unpaid(未支付),paid(已支付),closed(已关闭)',
   `closed_time` datetime DEFAULT NULL COMMENT '采购单关闭时间',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+  `create_time` datetime NOT NULL COMMENT '数据创建时间',
+  `is_self_take` bigint(20) NOT NULL DEFAULT '2' COMMENT '是否自提 1=自提2=一件代发 默认2',
+  `miandan_url` text COMMENT 'tk面单地址',
+  `logistics_number` varchar(255) DEFAULT NULL COMMENT '快递单号'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购单表';
 
 -- --------------------------------------------------------
@@ -35035,7 +35040,9 @@ CREATE TABLE `mall_shop_recharge_log` (
   `paid_time` datetime DEFAULT NULL COMMENT '充值单支付时间',
   `refunded_time` datetime DEFAULT NULL COMMENT '充值单退款时间',
   `status` varchar(10) NOT NULL COMMENT '充值单状态:PENDING(待支付)PAID(已支付)REFUNDED(已退款)CLOSED(已关闭)',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+  `create_time` datetime NOT NULL COMMENT '数据创建时间',
+  `payment_document` longtext COMMENT '支付凭证',
+  `payment_remark` longtext COMMENT '支付备注'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='店铺充值记录';
 
 -- --------------------------------------------------------
@@ -35090,6 +35097,7 @@ CREATE TABLE `mall_skus_map` (
   `from_idf_uniq` varchar(255) DEFAULT NULL COMMENT '来源平台标识(一般是店铺ID、店铺标识)',
   `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
   `out_id` varchar(64) DEFAULT '' COMMENT '外部编码',
+  `out_id_num` bigint(20) NOT NULL DEFAULT '1' COMMENT '外部编码数量',
   `from_platform_out_id` varchar(64) DEFAULT NULL COMMENT '来源平台out_id',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -35218,6 +35226,85 @@ CREATE TABLE `mall_stockchange_log` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_stocks_locked`
+--
+
+CREATE TABLE `mall_stocks_locked` (
+  `id` bigint(20) NOT NULL,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `shop_id` bigint(20) NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `remain_num` bigint(20) NOT NULL,
+  `used_num` bigint(20) NOT NULL,
+  `ctime` datetime(3) DEFAULT NULL,
+  `mtime` datetime(3) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='锁定库存表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_locked_logs`
+--
+
+CREATE TABLE `mall_stocks_locked_logs` (
+  `id` bigint(20) NOT NULL,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `shop_id` bigint(20) NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `type` tinyint(4) NOT NULL,
+  `num` bigint(20) NOT NULL,
+  `before_total` bigint(20) NOT NULL DEFAULT '0',
+  `after_total` bigint(20) NOT NULL DEFAULT '0',
+  `before_used` bigint(20) NOT NULL DEFAULT '0',
+  `after_used` bigint(20) NOT NULL DEFAULT '0',
+  `ctime` datetime(3) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='锁定库存变更日志表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_logs`
+--
+
+CREATE TABLE `mall_stocks_logs` (
+  `id` bigint(20) NOT NULL,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SKU外部编号',
+  `shop_id` bigint(20) DEFAULT NULL,
+  `warehouse_id` bigint(20) NOT NULL COMMENT '仓库ID',
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '订单ID',
+  `type` tinyint(4) NOT NULL COMMENT '类型：1-入库，2-出库',
+  `num` bigint(20) NOT NULL COMMENT '操作数量',
+  `before_num` bigint(20) NOT NULL COMMENT '操作前数量',
+  `after_num` bigint(20) NOT NULL COMMENT '操作后数量',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `sence` tinyint(4) NOT NULL COMMENT '操作场景'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='库存变更日志表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_pre`
+--
+
+CREATE TABLE `mall_stocks_pre` (
+  `id` bigint(20) NOT NULL,
+  `shop_id` bigint(20) NOT NULL,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `num` bigint(20) NOT NULL,
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `status` tinyint(4) NOT NULL,
+  `use_locked` tinyint(1) NOT NULL DEFAULT '0',
+  `lock_shop_id` bigint(20) DEFAULT NULL,
+  `expire_at` datetime(3) DEFAULT NULL,
+  `ctime` datetime(3) DEFAULT NULL,
+  `mtime` datetime(3) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预占库存表';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_subscribes`
 --
@@ -35379,7 +35466,8 @@ CREATE TABLE `mall_warehouse` (
   `wms_id` bigint(20) DEFAULT NULL COMMENT 'wmsConfigID',
   `cang_id` bigint(20) DEFAULT NULL,
   `shipping_methods` longtext COMMENT '物流服务商list',
-  `api_charging` int(1) DEFAULT '0' COMMENT '是否开启api计费，0=>否， 1=>是'
+  `api_charging` int(1) DEFAULT '0' COMMENT '是否开启api计费，0=>否， 1=>是',
+  `is_manually_modify_inventory` int(1) DEFAULT NULL COMMENT '允许手动修改库存， 1=>允许，2=>不允许'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -41621,6 +41709,56 @@ ALTER TABLE `mall_stockchange_log`
   ADD UNIQUE KEY `stock_change_log_UN` (`order_id`,`sku_id`,`warehouse_id`),
   ADD KEY `shop_status` (`shop_id`,`out_id`,`status`) USING BTREE;
 
+--
+-- 表的索引 `mall_stocks_locked`
+--
+ALTER TABLE `mall_stocks_locked`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `idx_id` (`id`),
+  ADD KEY `idx_out_id` (`out_id`),
+  ADD KEY `idx_out_id_country_shop_id` (`out_id`,`country`,`shop_id`),
+  ADD KEY `idx_out_id_shop_id` (`out_id`,`shop_id`),
+  ADD KEY `idx_out_country` (`out_id`,`country`),
+  ADD KEY `idx_shop_out_country` (`shop_id`,`out_id`,`country`);
+
+--
+-- 表的索引 `mall_stocks_locked_logs`
+--
+ALTER TABLE `mall_stocks_locked_logs`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `idx_out_id` (`out_id`),
+  ADD KEY `idx_shop_id` (`shop_id`),
+  ADD KEY `idx_order_id` (`order_id`),
+  ADD KEY `idx_ctime` (`ctime`),
+  ADD KEY `idx_shop_id_order_id` (`shop_id`,`order_id`),
+  ADD KEY `idx_shop_id_order_id_type` (`shop_id`,`order_id`,`type`),
+  ADD KEY `idx_order_type` (`order_id`,`type`);
+
+--
+-- 表的索引 `mall_stocks_logs`
+--
+ALTER TABLE `mall_stocks_logs`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `idx_out_id` (`out_id`),
+  ADD KEY `idx_shop_id` (`shop_id`),
+  ADD KEY `idx_warehouse_id` (`warehouse_id`),
+  ADD KEY `idx_order_id` (`order_id`),
+  ADD KEY `idx_type` (`type`),
+  ADD KEY `idx_shop_out_warehouse` (`shop_id`,`out_id`,`warehouse_id`);
+
+--
+-- 表的索引 `mall_stocks_pre`
+--
+ALTER TABLE `mall_stocks_pre`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `uk_order_sku` (`order_id`,`out_id`),
+  ADD KEY `idx_order_id` (`order_id`),
+  ADD KEY `idx_out_id_country` (`out_id`,`country`),
+  ADD KEY `idx_out_country_status` (`out_id`,`country`,`status`),
+  ADD KEY `idx_order_status` (`order_id`,`status`),
+  ADD KEY `idx_out_shop_country_status` (`out_id`,`shop_id`,`country`,`status`),
+  ADD KEY `idx_expire_status` (`expire_at`,`status`);
+
 --
 -- 表的索引 `mall_subscribes`
 --
@@ -42028,7 +42166,7 @@ ALTER TABLE `admin_member_grade`
 -- 使用表AUTO_INCREMENT `admin_menu`
 --
 ALTER TABLE `admin_menu`
-  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2179;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2180;
 
 --
 -- 使用表AUTO_INCREMENT `admin_netsea_product`
@@ -42804,6 +42942,30 @@ ALTER TABLE `mall_sku_values`
 ALTER TABLE `mall_stockchange_log`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
 
+--
+-- 使用表AUTO_INCREMENT `mall_stocks_locked`
+--
+ALTER TABLE `mall_stocks_locked`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `mall_stocks_locked_logs`
+--
+ALTER TABLE `mall_stocks_locked_logs`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `mall_stocks_logs`
+--
+ALTER TABLE `mall_stocks_logs`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `mall_stocks_pre`
+--
+ALTER TABLE `mall_stocks_pre`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
 --
 -- 使用表AUTO_INCREMENT `mall_subscribes`
 --

package/storage/patch/gcf.sql

@@ -0,0 +1,180 @@
+
+
+--
+-- 表的结构 `mall_stocks_locked`
+--
+
+CREATE TABLE IF NOT EXISTS `mall_stocks_locked` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `shop_id` bigint(20) NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `remain_num` bigint(20) NOT NULL,
+  `used_num` bigint(20) NOT NULL,
+  `ctime` datetime(3) DEFAULT NULL,
+  `mtime` datetime(3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_id` (`id`),
+  KEY `idx_out_id` (`out_id`),
+  KEY `idx_out_id_country_shop_id` (`out_id`,`country`,`shop_id`),
+  KEY `idx_out_id_shop_id` (`out_id`,`shop_id`),
+  KEY `idx_out_country` (`out_id`,`country`),
+  KEY `idx_shop_out_country` (`shop_id`,`out_id`,`country`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='锁定库存表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_locked_logs`
+--
+
+CREATE TABLE IF NOT EXISTS `mall_stocks_locked_logs` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `shop_id` bigint(20) NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `type` tinyint(4) NOT NULL,
+  `num` bigint(20) NOT NULL,
+  `before_total` bigint(20) NOT NULL DEFAULT '0',
+  `after_total` bigint(20) NOT NULL DEFAULT '0',
+  `before_used` bigint(20) NOT NULL DEFAULT '0',
+  `after_used` bigint(20) NOT NULL DEFAULT '0',
+  `ctime` datetime(3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_out_id` (`out_id`),
+  KEY `idx_shop_id` (`shop_id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_ctime` (`ctime`),
+  KEY `idx_shop_id_order_id` (`shop_id`,`order_id`),
+  KEY `idx_shop_id_order_id_type` (`shop_id`,`order_id`,`type`),
+  KEY `idx_order_type` (`order_id`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='锁定库存变更日志表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_logs`
+--
+
+CREATE TABLE IF NOT EXISTS `mall_stocks_logs` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SKU外部编号',
+  `shop_id` bigint(20) DEFAULT NULL,
+  `warehouse_id` bigint(20) NOT NULL COMMENT '仓库ID',
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '订单ID',
+  `type` tinyint(4) NOT NULL COMMENT '类型：1-入库，2-出库',
+  `num` bigint(20) NOT NULL COMMENT '操作数量',
+  `before_num` bigint(20) NOT NULL COMMENT '操作前数量',
+  `after_num` bigint(20) NOT NULL COMMENT '操作后数量',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `sence` tinyint(4) NOT NULL COMMENT '操作场景',
+  PRIMARY KEY (`id`),
+  KEY `idx_out_id` (`out_id`),
+  KEY `idx_shop_id` (`shop_id`),
+  KEY `idx_warehouse_id` (`warehouse_id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_type` (`type`),
+  KEY `idx_shop_out_warehouse` (`shop_id`,`out_id`,`warehouse_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='库存变更日志表';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_stocks_pre`
+--
+
+CREATE TABLE IF NOT EXISTS `mall_stocks_pre` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `shop_id` bigint(20) NOT NULL,
+  `out_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `country` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `num` bigint(20) NOT NULL,
+  `order_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `status` tinyint(4) NOT NULL,
+  `use_locked` tinyint(1) NOT NULL DEFAULT '0',
+  `lock_shop_id` bigint(20) DEFAULT NULL,
+  `expire_at` datetime(3) DEFAULT NULL,
+  `ctime` datetime(3) DEFAULT NULL,
+  `mtime` datetime(3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_order_sku` (`order_id`,`out_id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_out_id_country` (`out_id`,`country`),
+  KEY `idx_out_country_status` (`out_id`,`country`,`status`),
+  KEY `idx_order_status` (`order_id`,`status`),
+  KEY `idx_out_shop_country_status` (`out_id`,`shop_id`,`country`,`status`),
+  KEY `idx_expire_status` (`expire_at`,`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预占库存表';
+
+
+
+
+
+
+
+
+
+INSERT INTO mall_stocks_logs (
+    id, 
+    out_id, 
+    shop_id, 
+    warehouse_id, 
+    order_id, 
+    type, 
+    num, 
+    before_num, 
+    after_num, 
+    create_time, 
+    sence
+)
+SELECT 
+    id, 
+    out_id, 
+    shop_id, 
+    warehouse_id, 
+    order_id, 
+    1 AS type,  -- type=1 表示入库
+    change_quantity AS num, 
+    before_change AS before_num, 
+    after_change AS after_num, 
+    create_time, 
+    scene AS sence
+FROM 
+    mall_stockchange_log
+WHERE 
+    status = 1;
+
+
+-- 以下命令仅仅在跨境一番数据库手工执行
+INSERT INTO mall_stocks_pre (
+    id, 
+    shop_id, 
+    out_id, 
+    country, 
+    num, 
+    order_id, 
+    status, 
+    use_locked, 
+    lock_shop_id, 
+    expire_at, 
+    ctime, 
+    mtime
+)
+SELECT 
+    id, 
+    shop_id, 
+    out_id, 
+    'JP' AS country,  -- country=JP
+    change_quantity AS num, 
+    order_id, 
+    1 AS status,  -- status=1
+    0 AS use_locked,  -- use_locked=0
+    0 AS lock_shop_id,  -- lock_shop_id=0
+    DATE_ADD(create_time, INTERVAL 30 MINUTE) AS expire_at,  -- create_time加半小时
+    create_time AS ctime, 
+    create_time AS mtime
+FROM 
+    mall_stockchange_log
+WHERE 
+    status = 0;