ts-glitter 20.4.8 → 20.5.0

package/src/api-public/services/shopping.ts

@@ -7,7 +7,7 @@ import axios from 'axios';
 import app from '../../app';
 import redis from '../../modules/redis.js';
 import Tool from '../../modules/tool.js';
-import FinancialService, { LinePay, PayNow, PayPal, JKO, EcPay } from './financial-service.js';
+import FinancialService, { EcPay, JKO, LinePay, PayNow, PayPal } from './financial-service.js';
 import { Private_config } from '../../services/private_config.js';
 import { User } from './user.js';
 import { Invoice } from './invoice.js';
@@ -34,6 +34,8 @@ import { CheckoutService } from './checkout.js';
 import { ProductInitial } from './product-initial.js';
 import { UtTimer } from '../utils/ut-timer.js';
 import { AutoFcm } from '../../public-config-initial/auto-fcm.js';
+import PaymentTransaction from './model/handlePaymentTransaction.js';
+
 type BindItem = {
   id: string;
   spec: string[];
@@ -371,7 +373,7 @@ export type Cart = {
   custom_form_data?: any;
   distribution_id?: number;
   distribution_info?: any;
-  orderSource: '' | 'manual' | 'normal' | 'POS' | 'combine' | 'group_buy';
+  orderSource: '' | 'manual' | 'normal' | 'POS' | 'combine' | 'group_buy' | 'split';
   temp_cart_id?: string;
   code_array: string[];
   deliveryData?: DeliveryData;
@@ -385,6 +387,8 @@ export type Cart = {
   scheduled_id?: string;
   editRecord: { time: string; record: string }[];
   combineOrderID?: number;
+  splitOrders?: string[];
+  parentOrder?: string;
 };
 
 export type Order = {
@@ -1327,10 +1331,12 @@ export class Shopping {
     const orderClause = query.order_by || 'ORDER BY id DESC';
     const offset = query.page * query.limit;
 
-    let sql = `SELECT * FROM \`${this.app}\`.t_manager_post ${whereClause} ${orderClause}`;
+    let sql = `SELECT *
+               FROM \`${this.app}\`.t_manager_post ${whereClause} ${orderClause}`;
 
     const data = await db.query(
-      `SELECT * FROM (${sql}) AS subquery LIMIT ?, ?
+      `SELECT *
+       FROM (${sql}) AS subquery LIMIT ?, ?
       `,
       [offset, Number(query.limit)]
     );
@@ -1343,7 +1349,8 @@ export class Shopping {
     } else {
       const total = await db
         .query(
-          `SELECT COUNT(*) as count FROM \`${this.app}\`.t_manager_post ${whereClause}
+          `SELECT COUNT(*) as count
+           FROM \`${this.app}\`.t_manager_post ${whereClause}
           `,
           []
         )
@@ -1800,7 +1807,7 @@ export class Shopping {
       fbp?: string;
       temp_cart_id?: string;
     },
-    type: 'add' | 'preview' | 'manual' | 'manual-preview' | 'POS' = 'add',
+    type: 'add' | 'preview' | 'manual' | 'manual-preview' | 'POS' | 'split' = 'add',
     replace_order_id?: string
   ) {
     try {
@@ -2777,8 +2784,8 @@ export class Shopping {
       checkPoint('check user rebate');
 
       // 手動結帳地方判定
-      if (type === 'manual') {
-        carData.orderSource = 'manual';
+      if (type === 'manual' || type === 'split') {
+        carData.orderSource = type;
         let tempVoucher: VoucherData = {
           discount_total: data.voucher.discount_total,
           end_ISO_Date: '',
@@ -2816,7 +2823,7 @@ export class Shopping {
         carData.total = data.total ?? 0;
         carData.rebate = tempVoucher.rebate_total;
 
-        if (tempVoucher.reBackType == 'shipment_free') {
+        if (tempVoucher.reBackType == 'shipment_free' || type == 'split') {
           carData.shipment_fee = 0;
         }
 
@@ -2988,7 +2995,7 @@ export class Shopping {
           ReturnURL: '',
           NotifyURL: '',
         };
-        // 線下付款
+        // 金流處理
         switch (carData.customer_info.payment_select) {
           case 'ecPay':
           case 'newWebPay':
@@ -3122,6 +3129,162 @@ export class Shopping {
     }
   }
 
+  async repayOrder(orderID: string, return_url: string) {
+    const app = this.app;
+
+    async function getOrder(orderID: string) {
+      try {
+        const result = await db.query(
+          `
+            SELECT *
+            FROM \`${app}\`.t_checkout
+            WHERE cart_token = ?`,
+          [orderID]
+        );
+        return result[0];
+      } catch (e: any) {
+        console.error(`查詢 orderID ${orderID} 的結帳資料時發生錯誤:`, e.message || e);
+        // 處理錯誤的方式：
+        // 選擇 1：返回 null，讓呼叫者知道操作失敗或未找到資料
+        return null;
+      }
+    }
+
+    const sqlData: any = await getOrder(orderID);
+
+    if (sqlData) {
+      const orderData: {
+        lineItems: CartItem[];
+        customer_info?: any; //顧客資訊 訂單人
+        email?: string;
+        return_url: string;
+        orderID?: string;
+        user_info: any; //取貨人資訊
+        code?: string;
+        use_rebate?: number;
+        use_wallet?: number;
+        checkOutType?: 'manual' | 'auto' | 'POS' | 'group_buy';
+        pos_store?: string;
+        voucher?: any; //自定義的voucher
+        discount?: number; //自定義金額
+        total?: number; //自定義總額
+        pay_status?: number; //自定義訂單狀態
+        custom_form_format?: any; //自定義表單格式
+        custom_form_data?: any; //自定義表單資料
+        custom_receipt_form?: any; //自定義配送表單格式
+        distribution_code?: string; //分銷連結代碼
+        code_array: string[]; // 優惠券代碼列表
+        give_away?: {
+          id: number;
+          spec: string[];
+          count: number;
+          voucher_id: string;
+        }[];
+        language?: 'en-US' | 'zh-CN' | 'zh-TW';
+        pos_info?: any; //POS結帳資訊;
+        invoice_select?: string;
+        pre_order?: boolean;
+        voucherList?: any;
+        isExhibition?: boolean;
+        client_ip_address?: string;
+        fbc?: string;
+        fbp?: string;
+        temp_cart_id?: string;
+        shipment_fee?: number;
+        rebate?: number;
+      } = sqlData.orderData;
+      if (!orderData) {
+        throw exception.BadRequestError('BAD_REQUEST', 'ToCheckout Error: Cannot find this orderID', null);
+      }
+      const keyData = (
+        await Private_config.getConfig({
+          appName: this.app,
+          key: 'glitter_finance',
+        })
+      )[0].value;
+
+      // 物流設定
+      const shipment_setting: any = await (async () => {
+        try {
+          const config = await Private_config.getConfig({
+            appName: this.app,
+            key: 'logistics_setting',
+          });
+
+          // 如果 config 為空，則返回預設值
+          if (!config) {
+            return {
+              support: [],
+              shipmentSupport: [],
+            };
+          }
+
+          // 返回第一個元素的 value 屬性
+          return config[0].value;
+        } catch (e) {
+          // 發生錯誤時返回空陣列
+          return [];
+        }
+      })();
+
+      let kd = keyData[orderData.customer_info.payment_select] ?? {
+        ReturnURL: '',
+        NotifyURL: '',
+      };
+      const newOrderID = Date.now();
+      const carData: Cart = {
+        customer_info: orderData.customer_info || {},
+        lineItems: orderData.lineItems ?? [],
+        total: orderData.total ?? 0,
+        email: sqlData.email ?? orderData.user_info?.email ?? '',
+        user_info: orderData.user_info,
+        shipment_fee: orderData.shipment_fee ?? 0,
+        rebate: orderData.rebate ?? 0,
+        goodsWeight: 0,
+        use_rebate: orderData.use_rebate || 0,
+        orderID: `${newOrderID}`,
+        shipment_support: shipment_setting.support as any,
+        shipment_info: shipment_setting.info as any,
+        shipment_selector: [
+          // 標準物流
+          ...Shipment_support_config.list.map(dd => ({
+            name: dd.title,
+            value: dd.value,
+          })),
+          // 自定義物流
+          ...(shipment_setting.custom_delivery ?? []).map((dd: any) => ({
+            form: dd.form,
+            name: dd.name,
+            value: dd.id,
+            system_form: dd.system_form,
+          })),
+        ].filter(option => shipment_setting.support.includes(option.value)),
+        use_wallet: 0,
+        method: sqlData.user_info?.method,
+        user_email: sqlData.email ?? orderData.user_info?.email ?? '',
+        useRebateInfo: sqlData.useRebateInfo,
+        custom_form_format: sqlData.custom_form_format,
+        custom_form_data: sqlData.custom_form_data,
+        custom_receipt_form: sqlData.custom_receipt_form,
+        orderSource: sqlData.orderSource === 'POS' ? 'POS' : '',
+        code_array: sqlData.code_array,
+        give_away: sqlData.give_away as any,
+        user_rebate_sum: 0,
+        language: sqlData.language,
+        pos_info: sqlData.pos_info,
+        client_ip_address: sqlData.client_ip_address as string,
+        fbc: sqlData.fbc as string,
+        fbp: sqlData.fbp as string,
+        editRecord: [],
+      };
+      const result = await new PaymentTransaction(this.app, orderData.customer_info.payment_select).processPayment(
+        carData
+      );
+    }
+
+    // return result
+  }
+
   async getReturnOrder(query: {
     page: number;
     limit: number;
@@ -3411,6 +3574,9 @@ export class Shopping {
 
   async splitOrder(obj: { orderData: Cart; splitOrderArray: OrderDetail[] }) {
     try {
+      const currentTime = new Date().toISOString();
+
+      //給定訂單編號 產生 編號A 編號B... 依此類推
       function generateOrderIds(orderId: string, arrayLength: number): string[] {
         const orderIdArray: string[] = [];
         const startChar = 'A'.charCodeAt(0); // 取得 'A' 的 ASCII 碼
@@ -3423,6 +3589,7 @@ export class Shopping {
 
         return orderIdArray;
       }
+
       //整理原本訂單的總價 優惠卷
       function refreshOrder(orderData: Cart, splitOrderArray: OrderDetail[]) {
         const { newTotal, newDiscount } = splitOrderArray.reduce(
@@ -3434,27 +3601,51 @@ export class Shopping {
           },
           { newTotal: 0, newDiscount: 0 }
         );
-
-        orderData.total = newTotal;
-        orderData.discount = newDiscount;
+        orderData.total = orderData.total - newTotal;
+        orderData.discount = (orderData.discount ?? 0) - newDiscount;
+        orderData.splitOrders = generateOrderIds(orderData.orderID, splitOrderArray.length) ?? [];
+        orderData.editRecord.push({
+          time: currentTime,
+          record: `拆分成 ${splitOrderArray.length} 筆子訂單\\n${orderData.splitOrders.map(orderID => `{{order=${orderID}}}`).join('\\n')}`,
+        });
       }
+
       const orderData = obj.orderData;
       const splitOrderArray = obj.splitOrderArray;
       refreshOrder(orderData, splitOrderArray);
-
-      try {
-        await db.query(
-          `UPDATE \`${this.app}\`.t_checkout
-         SET orderData = ?
-         WHERE cart_token = ?;`,
-          [JSON.stringify(orderData), orderData.orderID]
+      await this.putOrder({
+        cart_token: orderData.orderID,
+        orderData,
+      });
+      for (const [index, order] of splitOrderArray.entries()) {
+        await this.toCheckout(
+          {
+            code_array: [],
+            order_id: orderData?.splitOrders?.[index] ?? '',
+            line_items: order.lineItems as any,
+            customer_info: order.customer_info,
+            return_url: '',
+            user_info: order.user_info,
+            discount: order.discount,
+            voucher: order.voucher,
+            total: order.total,
+            pay_status: Number(order.pay_status),
+          },
+          'split'
         );
-      } catch (e: any) {
-        console.error(e);
-        throw exception.BadRequestError('BAD_REQUEST', 'putOrder Error:' + e, null);
       }
 
-      const currentTime = new Date().toISOString();
+      // try {
+      //   await db.query(
+      //     `UPDATE \`${this.app}\`.t_checkout
+      //    SET orderData = ?
+      //    WHERE cart_token = ?;`,
+      //     [JSON.stringify(orderData), orderData.orderID]
+      //   );
+      // }catch (e:any){
+      //   console.error(e);
+      //   throw exception.BadRequestError('BAD_REQUEST', 'putOrder Error:' + e, null);
+      // }
 
       return true;
     } catch (e) {
@@ -3882,7 +4073,7 @@ export class Shopping {
     return cart;
   }
 
-  async putOrder(data: { id?: string; cart_token?: string; orderData: any; status: any; spiltOrder?: string[] }) {
+  async putOrder(data: { id?: string; cart_token?: string; orderData: any; status?: any }) {
     try {
       const update: any = {};
       const storeConfig = await new User(this.app).getConfigV2({ key: 'store_manager', user_id: 'manager' });
@@ -3892,7 +4083,9 @@ export class Shopping {
       const value = data.cart_token ?? data.id;
 
       if (whereClause && value) {
-        const query = `SELECT * FROM \`${this.app}\`.t_checkout WHERE ${whereClause};`;
+        const query = `SELECT *
+                       FROM \`${this.app}\`.t_checkout
+                       WHERE ${whereClause};`;
         const result = await db.query(query, [value]);
         origin = result[0];
       }
@@ -3906,6 +4099,8 @@ export class Shopping {
 
       if (data.status !== undefined) {
         update.status = data.status;
+      } else {
+        data.status = update.status;
       }
 
       // lineItems 庫存修正
@@ -4003,7 +4198,9 @@ export class Shopping {
         {}
       );
       await db.query(
-        `UPDATE \`${this.app}\`.t_checkout SET ? WHERE id = ?;
+        `UPDATE \`${this.app}\`.t_checkout
+         SET ?
+         WHERE id = ?;
         `,
         [updateData, origin.id]
       );
@@ -4438,7 +4635,8 @@ export class Shopping {
     try {
       let querySql = ['1=1'];
       let orderString = 'order by id desc';
-
+      const timer = new UtTimer('get-checkout-info');
+      timer.checkPoint('start');
       if (query.search && query.searchType) {
         switch (query.searchType) {
           case 'cart_token':
@@ -4462,6 +4660,9 @@ export class Shopping {
               `(cart_token in (select order_id from \`${this.app}\`.t_invoice_memory where invoice_no like '%${query.search}%' ))`
             );
             break;
+          case 'cart_token_exact':
+            querySql.push(`(cart_token = '${query.search}')`);
+            break;
           default:
             querySql.push(
               `JSON_CONTAINS_PATH(orderData, 'one', '$.lineItems[*].title') AND JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.lineItems[*].${query.searchType}')) REGEXP '${query.search}'`
@@ -4526,7 +4727,6 @@ export class Shopping {
 
         querySql.push(countingSQL);
       }
-
       if (query.is_shipment) {
         querySql.push(`(shipment_number IS NOT NULL) and (shipment_number != '')`);
       }
@@ -4541,7 +4741,6 @@ export class Shopping {
             .join(',')})`
         );
       }
-
       if (query.progress) {
         //備貨中
         if (query.progress === 'in_stock') {
@@ -4558,7 +4757,6 @@ export class Shopping {
         temp += `progress IN (${newArray.map(status => `"${status}"`).join(',')})`;
         querySql.push(`(${temp})`);
       }
-
       if (query.distribution_code) {
         let codes = query.distribution_code.split(',');
         let temp = '';
@@ -4571,7 +4769,6 @@ export class Shopping {
       } else if (query.is_pos === 'false') {
         querySql.push(`(order_source!='POS' or order_source is null)`);
       }
-
       if (query.shipment) {
         let shipment = query.shipment.split(',');
         let temp = '';
@@ -4617,7 +4814,6 @@ export class Shopping {
             break;
         }
       }
-
       query.status && querySql.push(`o.status IN (${query.status})`);
       const orderMath = [];
 
@@ -4648,6 +4844,7 @@ export class Shopping {
                  FROM \`${this.app}\`.t_checkout o
                           LEFT JOIN \`${this.app}\`.t_invoice_memory i ON o.cart_token = i.order_id and i.status = 1
                  WHERE ${querySql.join(' and ')} ${orderString}`;
+      timer.checkPoint('start-query-sql');
       if (query.returnSearch == 'true') {
         const data = await db.query(
           `SELECT *
@@ -4655,7 +4852,6 @@ export class Shopping {
            WHERE cart_token = ${db.escape(query.search)}`,
           []
         );
-
         let returnSql = `SELECT *
                          FROM \`${this.app}\`.t_return_order
                          WHERE order_id = ${query.search}`;
@@ -4678,6 +4874,7 @@ export class Shopping {
         return data[0];
       }
       const response_data: any = await new Promise(async (resolve, reject) => {
+        timer.checkPoint('start-query-response_data');
         if (query.id) {
           const data = (
             await db.query(
@@ -4692,13 +4889,16 @@ export class Shopping {
             result: !!data,
           });
         } else {
+          const data = await db.query(
+            `SELECT *
+             FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}
+            `,
+            []
+          );
+          timer.checkPoint('finish-query-response_data');
+          console.log(sql);
           resolve({
-            data: await db.query(
-              `SELECT *
-               FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}
-              `,
-              []
-            ),
+            data: data,
             total: (
               await db.query(
                 `SELECT count(1)
@@ -4796,7 +4996,7 @@ export class Shopping {
             })
           )
       );
-
+      timer.checkPoint('finish-query-all');
       return response_data;
     } catch (e) {
       throw exception.BadRequestError('BAD_REQUEST', 'getCheckOut Error:' + e, null);
@@ -5151,7 +5351,8 @@ export class Shopping {
         }
 
         const insertData = await db.query(
-          `INSERT INTO \`${this.app}\`.t_variants SET ?
+          `INSERT INTO \`${this.app}\`.t_variants
+           SET ?
           `,
           [
             {
@@ -6179,7 +6380,16 @@ export class Shopping {
       }
 
       query.id && querySql.push(`(v.id = ${query.id})`);
-      query.id_list && querySql.push(`(v.id in (${query.id_list}))`);
+      if (query.id_list) {
+        if (query.id_list?.includes('-')) {
+        querySql.push(`(v.product_id in (${query.id_list.split(',').map((dd)=>{
+            return dd.split('-')[0]
+          })}))`);
+        } else {
+          querySql.push(`(v.id in (${query.id_list}))`);
+        }
+      }
+
       query.collection &&
         querySql.push(
           `(${query.collection
@@ -6367,22 +6577,23 @@ export class Shopping {
            WHERE id = ?`,
           [{ content: JSON.stringify(data.variant_content) }, data.id]
         );
-        let variants=(await db.query(
-          `SELECT *
+        let variants = (
+          await db.query(
+            `SELECT *
            FROM \`${this.app}\`.t_variants
            WHERE product_id = ?`,
-          [data.product_id]
-        )).map((dd:any)=>{
-          return dd.content
+            [data.product_id]
+          )
+        ).map((dd: any) => {
+          return dd.content;
         });
-        data.product_content.variants=variants;
+        data.product_content.variants = variants;
         await db.query(
           `UPDATE \`${this.app}\`.t_manager_post
            SET ?
            WHERE id = ?`,
           [{ content: JSON.stringify(data.product_content) }, data.product_id]
         );
-
       }
       return {
         result: 'success',

package/src/api-public/services/terms-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"terms-check.js","sourceRoot":"","sources":["terms-check.ts"],"names":[],"mappings":";;;AAAA,MAAa,UAAU;IAEZ,MAAM,CAAE,KAAK,CAAC,GAAW;QAC5B,QAAQ,GAAG,EAAE;YACT,KAAK,4BAA4B;gBAC7B,OAAO;oBACH,MAAM,EAAE,m3zCAAm3zC;iBAC93zC,CAAA;YACL,KAAK,8BAA8B;gBAC/B,OAAO;oBACH,MAAM,EAAE,kipCAAkipC;iBAC7ipC,CAAA;YACL,KAAK,0BAA0B;gBAC3B,OAAO,EAAC,MAAM,EAAE,0gxCAA0gxC,EAAC,CAAA;YAC/hxC,KAAK,6BAA6B;gBAC9B,OAAO,EAAC,MAAM,EAAE,s7nCAAs7nC,EAAC,CAAA;SAC98nC;QACD,OAAQ;YACJ,MAAM,EAAC,EAAE;SACZ,CAAA;IAEL,CAAC;CACJ;AAtBD,gCAsBC"}
+{"version":3,"file":"terms-check.js","sourceRoot":"","sources":["terms-check.ts"],"names":[],"mappings":";;;AAAA,MAAa,UAAU;IAEZ,MAAM,CAAE,KAAK,CAAC,GAAW;QAC5B,QAAQ,GAAG,EAAE,CAAC;YACV,KAAK,4BAA4B;gBAC7B,OAAO;oBACH,MAAM,EAAE,m3zCAAm3zC;iBAC93zC,CAAA;YACL,KAAK,8BAA8B;gBAC/B,OAAO;oBACH,MAAM,EAAE,kipCAAkipC;iBAC7ipC,CAAA;YACL,KAAK,0BAA0B;gBAC3B,OAAO,EAAC,MAAM,EAAE,0gxCAA0gxC,EAAC,CAAA;YAC/hxC,KAAK,6BAA6B;gBAC9B,OAAO,EAAC,MAAM,EAAE,s7nCAAs7nC,EAAC,CAAA;QAC/8nC,CAAC;QACD,OAAQ;YACJ,MAAM,EAAC,EAAE;SACZ,CAAA;IAEL,CAAC;CACJ;AAtBD,gCAsBC"}

package/src/api-public/services/updated-table-checked.js

@@ -199,6 +199,28 @@ class UpdatedTableChecked {
         CHANGE COLUMN \`count\` \`count\` FLOAT NOT NULL;
       `,
         });
+        await UpdatedTableChecked.update({
+            app_name: app_name,
+            table_name: 't_user',
+            last_version: ['V1.2'],
+            new_version: 'V1.3',
+            event: `ALTER TABLE \`${app_name}\`.\`t_user\`
+      ADD COLUMN \`email\` VARCHAR(50) NULL AFTER \`member_level\`,
+      ADD COLUMN \`phone\` VARCHAR(50) NULL AFTER \`email\`,
+      ADD INDEX \`index8\` (\`email\` ASC) VISIBLE,
+      ADD INDEX \`index9\` (\`phone\` ASC) VISIBLE;
+      ;`,
+        });
+        await UpdatedTableChecked.update({
+            app_name: app_name,
+            table_name: 't_user',
+            last_version: ['V1.3'],
+            new_version: 'V1.4',
+            event: `UPDATE \`${app_name}\`.t_user
+    SET
+    phone = JSON_UNQUOTE(JSON_EXTRACT(userData, '$.phone')),
+      email = JSON_UNQUOTE(JSON_EXTRACT(userData, '$.email'))  where id>0`,
+        });
     }
     static async update(obj) {
         var _a;

package/src/api-public/services/updated-table-checked.js.map

@@ -1 +1 @@
-{"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"updated-table-checked.js","sourceRoot":"","sources":["updated-table-checked.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/updated-table-checked.ts

@@ -209,6 +209,34 @@ export class UpdatedTableChecked {
         CHANGE COLUMN \`count\` \`count\` FLOAT NOT NULL;
       `,
     });
+
+    //會員表插入信箱和電話
+    await UpdatedTableChecked.update({
+      app_name: app_name,
+      table_name: 't_user',
+      last_version: ['V1.2'],
+      new_version: 'V1.3',
+      event: `ALTER TABLE \`${app_name}\`.\`t_user\`
+      ADD COLUMN \`email\` VARCHAR(50) NULL AFTER \`member_level\`,
+      ADD COLUMN \`phone\` VARCHAR(50) NULL AFTER \`email\`,
+      ADD INDEX \`index8\` (\`email\` ASC) VISIBLE,
+      ADD INDEX \`index9\` (\`phone\` ASC) VISIBLE;
+      ;`,
+    });
+
+    //會員表插入信箱和電話
+    await UpdatedTableChecked.update({
+      app_name: app_name,
+      table_name: 't_user',
+      last_version: ['V1.3'],
+      new_version: 'V1.4',
+      event:`UPDATE \`${app_name}\`.t_user
+    SET
+    phone = JSON_UNQUOTE(JSON_EXTRACT(userData, '$.phone')),
+      email = JSON_UNQUOTE(JSON_EXTRACT(userData, '$.email'))  where id>0`,
+    });
+
+
   }
 
   public static async update(obj: {

package/src/api-public/services/user-service.d.ts

@@ -0,0 +1,9 @@
+export declare class UserService {
+    static updateAndMigrateToTableColumn(obj: {
+        id?: string;
+        cart_token?: string;
+        orderData: any;
+        app_name: string;
+        no_shipment_number?: boolean;
+    }): Promise<void>;
+}

package/src/api-public/services/user-service.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserService = void 0;
+class UserService {
+    static async updateAndMigrateToTableColumn(obj) {
+    }
+}
+exports.UserService = UserService;
+//# sourceMappingURL=user-service.js.map

package/src/api-public/services/user-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-service.js","sourceRoot":"","sources":["user-service.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IACf,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,GAMjD;IAED,CAAC;CACF;AAVD,kCAUC"}

package/src/api-public/services/user-service.ts

@@ -0,0 +1,11 @@
+export class UserService{
+  public static async updateAndMigrateToTableColumn(obj: {
+    id?: string;
+    cart_token?: string;
+    orderData: any;
+    app_name: string;
+    no_shipment_number?: boolean;
+  }) {
+
+  }
+}