ts-glitter 20.3.2 → 20.3.4

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

@@ -1476,6 +1476,103 @@ export class Shopping {
     }
   }
 
+  async getShipmentRefer(user_info: any) {
+    user_info = user_info || {};
+    let def = (
+      (
+        await Private_config.getConfig({
+          appName: this.app,
+          key: 'glitter_shipment',
+        })
+      )[0] ?? {
+        value: {
+          volume: [],
+          weight: [],
+          selectCalc: 'volume',
+        },
+      }
+    ).value;
+
+    // 參照運費設定
+    const refer =
+      user_info.shipment === 'global_express'
+        ? (
+            (
+              await Private_config.getConfig({
+                appName: this.app,
+                key: 'glitter_shipment_global_' + user_info.country,
+              })
+            )[0] ?? {
+              value: {
+                volume: [],
+                weight: [],
+                selectCalc: 'volume',
+              },
+            }
+          ).value
+        : (
+            (
+              await Private_config.getConfig({
+                appName: this.app,
+                key: 'glitter_shipment_' + user_info.shipment,
+              })
+            )[0] ?? {
+              value: {
+                volume: [],
+                weight: [],
+                selectCalc: 'def',
+              },
+            }
+          ).value;
+
+    if (refer.selectCalc !== 'def') {
+      def = refer;
+    }
+    return def;
+  }
+
+  calculateShipment(dataList: { key: string; value: string }[], value: number | string) {
+    if (value === 0) {
+      return 0;
+    }
+
+    const productValue = parseFloat(`${value}`);
+    if (isNaN(productValue) || dataList.length === 0) {
+      return 0;
+    }
+
+    for (let i = 0; i < dataList.length; i++) {
+      const currentKey = parseFloat(dataList[i].key);
+      const currentValue = parseFloat(dataList[i].value);
+      if (productValue < currentKey) {
+        return i === 0 ? 0 : parseFloat(dataList[i - 1].value);
+      } else if (productValue === currentKey) {
+        return currentValue;
+      }
+    }
+
+    // 如果商品值大於所有的key，返回最後一個value
+    return parseInt(dataList[dataList.length - 1].value);
+  }
+
+  getShipmentFee(user_info: any, lineItems: CartItem[], shipment: any) {
+    if (user_info.shipment === 'now') return 0;
+
+    let total_volume = 0;
+    let total_weight = 0;
+    lineItems.map(item => {
+      if (item.shipment_obj.type === 'volume') {
+        total_volume += item.shipment_obj.value;
+      }
+      if (item.shipment_obj.type === 'weight') {
+        total_weight += item.shipment_obj.value;
+      }
+    });
+    return (
+      this.calculateShipment(shipment.volume, total_volume) + this.calculateShipment(shipment.weight, total_weight)
+    );
+  }
+
   async toCheckout(
     data: {
       line_items: CartItem[];
@@ -1533,7 +1630,7 @@ export class Shopping {
         timer.count++;
         const n = timer.count.toString().padStart(2, '0');
 
-        console.log(`TO-CHECKOUT-TIME-${n} [${name}] `.padEnd(40, '=') + '>', {
+        console.info(`TO-CHECKOUT-TIME-${n} [${name}] `.padEnd(40, '=') + '>', {
           totalTime,
           spendTime,
         });
@@ -1728,60 +1825,7 @@ export class Shopping {
       checkPoint('check rebate');
 
       // 運費設定
-      const shipment: ShipmentConfig = await (async () => {
-        data.user_info = data.user_info || {};
-        let def = (
-          (
-            await Private_config.getConfig({
-              appName: this.app,
-              key: 'glitter_shipment',
-            })
-          )[0] ?? {
-            value: {
-              volume: [],
-              weight: [],
-              selectCalc: 'volume',
-            },
-          }
-        ).value;
-
-        // 參照運費設定
-        const refer =
-          data.user_info.shipment === 'global_express'
-            ? (
-                (
-                  await Private_config.getConfig({
-                    appName: this.app,
-                    key: 'glitter_shipment_global_' + data.user_info.country,
-                  })
-                )[0] ?? {
-                  value: {
-                    volume: [],
-                    weight: [],
-                    selectCalc: 'volume',
-                  },
-                }
-              ).value
-            : (
-                (
-                  await Private_config.getConfig({
-                    appName: this.app,
-                    key: 'glitter_shipment_' + data.user_info.shipment,
-                  })
-                )[0] ?? {
-                  value: {
-                    volume: [],
-                    weight: [],
-                    selectCalc: 'def',
-                  },
-                }
-              ).value;
-
-        if (refer.selectCalc !== 'def') {
-          def = refer;
-        }
-        return def;
-      })();
+      const shipment: ShipmentConfig = await this.getShipmentRefer(data.user_info);
 
       // 物流設定
       const shipment_setting: any = await (async () => {
@@ -1883,30 +1927,6 @@ export class Shopping {
         carData.user_info.phone = userData.userData.phone;
       }
 
-      function calculateShipment(dataList: { key: string; value: string }[], value: number | string) {
-        if (value === 0) {
-          return 0;
-        }
-
-        const productValue = parseFloat(`${value}`);
-        if (isNaN(productValue) || dataList.length === 0) {
-          return 0;
-        }
-
-        for (let i = 0; i < dataList.length; i++) {
-          const currentKey = parseFloat(dataList[i].key);
-          const currentValue = parseFloat(dataList[i].value);
-          if (productValue < currentKey) {
-            return i === 0 ? 0 : parseFloat(dataList[i - 1].value);
-          } else if (productValue === currentKey) {
-            return currentValue;
-          }
-        }
-
-        // 如果商品值大於所有的key，返回最後一個value
-        return parseInt(dataList[dataList.length - 1].value);
-      }
-
       const add_on_items: any[] = [];
       const gift_product: any[] = [];
       const saveStockArray: (() => Promise<boolean>)[] = [];
@@ -2250,22 +2270,7 @@ export class Shopping {
 
       checkPoint('set max product');
 
-      carData.shipment_fee = (() => {
-        if (data.user_info.shipment === 'now') return 0;
-
-        let total_volume = 0;
-        let total_weight = 0;
-        carData.lineItems.map(item => {
-          if (item.shipment_obj.type === 'volume') {
-            total_volume += item.shipment_obj.value;
-          }
-          if (item.shipment_obj.type === 'weight') {
-            total_weight += item.shipment_obj.value;
-          }
-        });
-        return calculateShipment(shipment.volume, total_volume) + calculateShipment(shipment.weight, total_weight);
-      })();
-
+      carData.shipment_fee = this.getShipmentFee(data.user_info, carData.lineItems, shipment);
       carData.total += carData.shipment_fee;
       const f_rebate = await this.formatUseRebate(carData.total, carData.use_rebate);
       carData.useRebateInfo = f_rebate;
@@ -2417,7 +2422,7 @@ export class Shopping {
       (carData as any).payment_info_atm = keyData.payment_info_atm;
       const defaultPayArray = onlinePayArray.map(item => item.key);
       (keyData as any).cash_on_delivery.shipmentSupport = (keyData as any).cash_on_delivery.shipmentSupport ?? [];
-      console.log(`checkoutPayment=>`,checkoutPayment)
+
       // 透過特定金流，取得指定物流
       carData.shipment_support = checkoutPayment
         ? ((() => {
@@ -2437,8 +2442,6 @@ export class Shopping {
           })().shipmentSupport ?? [])
         : [];
 
-
-
       // 防止帶入購物金時，總計小於0
       let subtotal = 0;
       carData.lineItems.map(item => {
@@ -2883,18 +2886,18 @@ export class Shopping {
             )) {
               let sns = new SMS(this.app);
               await sns.sendCustomerSns('auto-sns-order-create', carData.orderID, phone);
-              console.log('訂單簡訊寄送成功');
+              console.info('訂單簡訊寄送成功');
             }
 
             if (carData.customer_info.lineID) {
               let line = new LineMessage(this.app);
               await line.sendCustomerLine('auto-line-order-create', carData.orderID, carData.customer_info.lineID);
-              console.log('訂單line訊息寄送成功');
+              console.info('訂單line訊息寄送成功');
             }
             // if (carData.customer_info.fb_id) {
             //     let fb = new FbMessage(this.app)
             //     await fb.sendCustomerFB('auto-fb-order-create', carData.orderID, carData.customer_info.fb_id);
-            //     console.log('訂單FB訊息寄送成功');
+            //     console.info('訂單FB訊息寄送成功');
             // }
             for (const email of new Set(
               [carData.customer_info, carData.user_info].map(dd => {
@@ -3637,28 +3640,15 @@ export class Shopping {
     try {
       const update: any = {};
       const storeConfig = await new User(this.app).getConfigV2({ key: 'store_manager', user_id: 'manager' });
-      let origin = undefined;
+      let origin: any;
 
-      if (data.id) {
-        origin = (
-          await db.query(
-            `SELECT *
-             FROM \`${this.app}\`.t_checkout
-             WHERE id = ?;`,
-            [data.id]
-          )
-        )[0];
-      }
+      const whereClause = data.cart_token ? 'cart_token = ?' : data.id ? 'id = ?' : null;
+      const value = data.cart_token ?? data.id;
 
-      if (data.cart_token) {
-        origin = (
-          await db.query(
-            `SELECT *
-             FROM \`${this.app}\`.t_checkout
-             WHERE cart_token = ?;`,
-            [data.cart_token]
-          )
-        )[0];
+      if (whereClause && value) {
+        const query = `SELECT * FROM \`${this.app}\`.t_checkout WHERE ${whereClause};`;
+        const result = await db.query(query, [value]);
+        origin = result[0];
       }
 
       if (!origin) {
@@ -3674,19 +3664,20 @@ export class Shopping {
 
       // lineItems 庫存修正
       const resetLineItems = (lineItems: any[]) => {
-        return lineItems.map(item => ({
-          ...item,
-          stockList: undefined,
-          deduction_log: Object.keys(item.deduction_log || {}).length
-            ? item.deduction_log
-            : { [storeConfig.list[0].id]: item.count },
-        }));
+        return lineItems.map(item => {
+          return {
+            ...item,
+            stockList: undefined,
+            deduction_log: Object.keys(item.deduction_log || {}).length
+              ? item.deduction_log
+              : { [storeConfig.list[0].id]: item.count },
+          };
+        });
       };
 
       if (data.orderData) {
         const orderData = data.orderData;
         update.orderData = structuredClone(orderData);
-        const updateProgress = update.orderData.progress;
 
         // 恢復取消訂單的庫存
         orderData.lineItems = resetLineItems(orderData.lineItems);
@@ -3697,7 +3688,7 @@ export class Shopping {
 
         // 當訂單變成已取消時，執行庫存回填
         const prevStatus = origin.orderData.orderStatus;
-        const prevProgress = origin.orderData.progress;
+        const prevProgress = origin.orderData.progress || 'wait';
 
         //變成已取消加回庫存
         if (prevStatus !== '-1' && orderData.orderStatus === '-1') {
@@ -3730,6 +3721,7 @@ export class Shopping {
         }
 
         // 當訂單出貨狀態變更，觸發通知事件
+        const updateProgress = update.orderData.progress;
         if (prevProgress !== updateProgress) {
           if (updateProgress === 'shipping') {
             await this.sendNotifications(orderData, 'shipment');
@@ -3747,6 +3739,7 @@ export class Shopping {
         }
       }
 
+      update.orderData.lineItems = update.orderData.lineItems.filter((item: any) => item.count > 0);
       this.writeRecord(origin, update);
 
       // ======= 更新訂單 =======
@@ -3758,9 +3751,8 @@ 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]
       );
 
@@ -3908,21 +3900,37 @@ export class Shopping {
   }
 
   private async resetStore(lineItems: any[], plus_or_minus: 'plus' | 'minus' = 'plus') {
-    const stockUpdates = lineItems.map(async item => {
+    const shoppingClass = new Shopping(this.app, this.token);
+    const calcMap = new Map();
+
+    function updateCalcData(calc: number, stock_id: string, product_id: string, spec: string[]) {
+      const getCalc = calcMap.get(product_id);
+      calcMap.set(product_id, [...(getCalc ?? []), { calc, stock_id, product_id, spec }]);
+    }
+
+    lineItems.map(item => {
       if (item.product_category === 'kitchen' && item.spec?.length) {
-        return new Shopping(this.app, this.token).calcVariantsStock(item.count, '', item.id, item.spec);
+        updateCalcData(item.count, '', item.id, item.spec);
+        return;
       }
-      return Promise.all(
-        Object.entries(item.deduction_log).map(([location, count]) => {
-          let intCount = parseInt(`${count || 0}`, 10);
-          if (plus_or_minus === 'minus') {
-            intCount = intCount * -1;
-          }
-          return new Shopping(this.app, this.token).calcVariantsStock(intCount, location, item.id, item.spec);
-        })
-      );
+
+      Object.entries(item.deduction_log).map(([location, count]) => {
+        let intCount = parseInt(`${count || 0}`, 10);
+        if (plus_or_minus === 'minus') {
+          intCount = intCount * -1;
+        }
+        updateCalcData(intCount, location, item.id, item.spec);
+      });
     });
-    await Promise.all(stockUpdates);
+
+    return await Promise.all(
+      [...calcMap.values()].map(async dataArray => {
+        for (const data of dataArray) {
+          const { calc, stock_id, product_id, spec } = data;
+          await shoppingClass.calcVariantsStock(calc, stock_id, product_id, spec);
+        }
+      })
+    );
   }
 
   /**
@@ -3966,25 +3974,53 @@ export class Shopping {
   }
 
   private async adjustStock(origin: any, orderData: any) {
-    if (orderData.orderStatus === '-1') return;
+    try {
+      if (orderData.orderStatus === '-1') return;
 
-    const stockAdjustments = orderData.lineItems.map(async (newItem: any) => {
-      const originalItem = origin.lineItems.find(
-        (item: any) => item.id === newItem.id && item.spec.join('') === newItem.spec.join('')
-      );
+      const shoppingClass = new Shopping(this.app, this.token);
+      const calcMap = new Map();
 
-      if (newItem.product_category === 'kitchen' && newItem.spec?.length) {
-        return new Shopping(this.app, this.token).calcVariantsStock(newItem.count, '', newItem.id, newItem.spec);
+      function updateCalcData(calc: number, stock_id: string, product_id: string, spec: string[]) {
+        const getCalc = calcMap.get(product_id);
+        calcMap.set(product_id, [...(getCalc ?? []), { calc, stock_id, product_id, spec }]);
       }
 
-      for (const [location, newCount] of Object.entries(newItem.deduction_log)) {
-        const originalCount = originalItem.deduction_log[location] || 0;
-        const parsedNewCount = Number(newCount || 0);
-        const delta = (isNaN(parsedNewCount) ? 0 : parsedNewCount) - originalCount;
-        await new Shopping(this.app, this.token).calcVariantsStock(delta * -1, location, newItem.id, newItem.spec);
-      }
-    });
-    await Promise.all(stockAdjustments);
+      orderData.lineItems.map((newItem: any) => {
+        if (newItem.product_category === 'kitchen' && newItem.spec?.length) {
+          updateCalcData(newItem.count, '', newItem.id, newItem.spec);
+          return;
+        }
+
+        const originalItem = origin.lineItems.find(
+          (item: any) => item.id === newItem.id && item.spec.join('') === newItem.spec.join('')
+        );
+
+        Object.entries(newItem.deduction_log).map(([location, newCount]) => {
+          const parsedNewCount = Number(newCount || 0);
+          const formatNewCount = isNaN(parsedNewCount) ? 0 : parsedNewCount;
+
+          if (!originalItem) {
+            updateCalcData(formatNewCount * -1, location, newItem.id, newItem.spec);
+            return;
+          }
+
+          const originalCount = originalItem.deduction_log[location] || 0;
+          const delta = formatNewCount - originalCount;
+          updateCalcData(delta * -1, location, newItem.id, newItem.spec);
+        });
+      });
+
+      return await Promise.all(
+        [...calcMap.values()].map(async dataArray => {
+          for (const data of dataArray) {
+            const { calc, stock_id, product_id, spec } = data;
+            await shoppingClass.calcVariantsStock(calc, stock_id, product_id, spec);
+          }
+        })
+      );
+    } catch (error) {
+      console.error(`adjustStock has error: ${error}`);
+    }
   }
 
   async manualCancelOrder(order_id: string) {
@@ -4087,13 +4123,13 @@ export class Shopping {
       )) {
         let sns = new SMS(this.app);
         await sns.sendCustomerSns('sns-proof-purchase', order_id, phone);
-        console.log('訂單待核款簡訊寄送成功');
+        console.info('訂單待核款簡訊寄送成功');
       }
 
       if (orderData.customer_info.lineID) {
         let line = new LineMessage(this.app);
         await line.sendCustomerLine('line-proof-purchase', order_id, orderData.customer_info.lineID);
-        console.log('付款成功line訊息寄送成功');
+        console.info('付款成功line訊息寄送成功');
       }
       await this.putOrder({
         orderData: orderData,
@@ -4604,7 +4640,7 @@ export class Shopping {
         )) {
           let sns = new SMS(this.app);
           await sns.sendCustomerSns('auto-sns-payment-successful', order_id, phone);
-          console.log('付款成功簡訊寄送成功');
+          console.info('付款成功簡訊寄送成功');
         }
 
         if (cartData.orderData.customer_info.lineID) {
@@ -4614,7 +4650,7 @@ export class Shopping {
             order_id,
             cartData.orderData.customer_info.lineID
           );
-          console.log('付款成功line訊息寄送成功');
+          console.info('付款成功line訊息寄送成功');
         }
 
         const userData = await new User(this.app).getUserData(cartData.email, 'account');
@@ -4827,6 +4863,7 @@ export class Shopping {
       const storeConfig = await _user.getConfigV2({ key: 'store_manager', user_id: 'manager' });
 
       const sourceMap: Record<string, string> = {};
+
       const insertPromises = content.variants.map(async (variant: any) => {
         content.total_sales += variant.sold_out ?? 0;
         content.min_price = Math.min(content.min_price ?? variant.sale_price, variant.sale_price);
@@ -4844,8 +4881,8 @@ export class Shopping {
         }
 
         const insertData = await db.query(
-          `INSERT INTO \`${this.app}\`.t_variants
-           SET ?`,
+          `INSERT INTO \`${this.app}\`.t_variants SET ?
+          `,
           [
             {
               content: JSON.stringify(variant),
@@ -4952,6 +4989,7 @@ export class Shopping {
           is_manger: true,
         })
       ).data.content;
+
       const variant_s: any = pd_data.variants.find((dd: any) => {
         return dd.spec.join('-') === spec.join('-');
       });