ts-glitter 19.2.7 → 19.2.9

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

@@ -810,6 +810,9 @@ export class Shopping {
       };
 
       const processProduct = async (product: any) => {
+        if(!product || !product.content){
+          return
+        }
         const createPriceMap = (type: MultiSaleType): Record<string, Map<string, number>> => {
           return Object.fromEntries(
             product.content.multi_sale_price
@@ -950,8 +953,14 @@ export class Shopping {
       };
 
       if (Array.isArray(products.data)) {
+        products.data=products.data.filter((dd)=>{
+          return dd && dd.content
+        })
         await Promise.all(products.data.map(processProduct));
       } else {
+        if((products.data) && !products.data.content){
+          products.data=undefined
+        }
         await processProduct(products.data);
       }
 
@@ -1022,6 +1031,9 @@ export class Shopping {
     userID: string;
     viewSource: string;
   }) {
+    if(!json.product.content){
+      return  []
+    }
     const id = `${json.product.id}`;
     const collection = json.product.content.collection || [];
     const userData = json.userData;
@@ -1867,7 +1879,6 @@ export class Shopping {
           let price = 0;
           let show_understocking = false;
           let stock = Infinity;
-
           if (prod.specs.length) {
             price = item.spec.reduce((total: number, spec: any, index: number) => {
               const dpe = prod.specs[index].option.find((dd: any) => dd.title === spec);
@@ -2813,14 +2824,20 @@ export class Shopping {
             //     await fb.sendCustomerFB('auto-fb-order-create', carData.orderID, carData.customer_info.fb_id);
             //     console.log('訂單FB訊息寄送成功');
             // }
+              for (const email of new Set([carData.customer_info, carData.user_info].map((dd)=>{
+                return dd && dd.email
+              }))) {
+              if (email) {
+                AutoSendEmail.customerOrder(
+                  this.app,
+                  'auto-email-order-create',
+                  carData.orderID,
+                  email,
+                  carData.language!!
+                );
+              }
+            }
 
-            AutoSendEmail.customerOrder(
-              this.app,
-              'auto-email-order-create',
-              carData.orderID,
-              carData.email,
-              carData.language!!
-            );
             await this.releaseVoucherHistory(carData.orderID, 1);
             checkPoint('default release checkout');
             return {
@@ -3571,13 +3588,20 @@ export class Shopping {
         if (prevStatus !== '-1' && orderData.orderStatus === '-1') {
 
           await this.resetStore(origin.orderData.lineItems);
-          await AutoSendEmail.customerOrder(
-            this.app,
-            'auto-email-order-cancel-success',
-            orderData.orderID,
-            orderData.email,
-            orderData.language
-          );
+
+            for (const email of new Set([origin.orderData.customer_info, origin.orderData.user_info].map((dd)=>{
+              return dd && dd.email
+            }))) {
+            if (email) {
+              await AutoSendEmail.customerOrder(
+                this.app,
+                'auto-email-order-cancel-success',
+                orderData.orderID,
+                email,
+                orderData.language
+              );
+            }
+          }
           //變成處理或已完成扣庫存
         } else if (prevStatus === '-1' && orderData.orderStatus !== '-1') {
           await this.resetStore(origin.orderData.lineItems, 'minus');
@@ -3802,14 +3826,17 @@ export class Shopping {
       const line = new LineMessage(this.app);
       messages.push(line.sendCustomerLine(`auto-line-${typeMap[type]}`, orderData.orderID, lineID));
     }
-    for (const data of [orderData.customer_info, orderData.user_info]) {
-      if (data.email) {
+
+      for (const email of new Set([orderData.customer_info, orderData.user_info].map((dd)=>{
+        return dd && dd.email
+      }))) {
+      if (email) {
         messages.push(
           AutoSendEmail.customerOrder(
             this.app,
             `auto-email-${typeMap[type]}`,
             orderData.orderID,
-            data.email,
+            email,
             orderData.language
           )
         );
@@ -3928,7 +3955,14 @@ export class Shopping {
 
       // 訂單待核款信件通知
       new ManagerNotify(this.app).uploadProof({ orderData: orderData });
-      await AutoSendEmail.customerOrder(this.app, 'proof-purchase', order_id, orderData.email, orderData.language);
+        for (const email of new Set([orderData.customer_info, orderData.user_info].map((dd)=>{
+          return dd && dd.email
+        }))) {
+        if (email) {
+          await AutoSendEmail.customerOrder(this.app, 'proof-purchase', order_id, email, orderData.language);
+        }
+      }
+
 
       if (orderData.customer_info.phone) {
         let sns = new SMS(this.app);
@@ -4427,14 +4461,20 @@ export class Shopping {
           orderData: cartData.orderData,
           status: status,
         });
+        for (const email of new Set([cartData.orderData.customer_info, cartData.orderData.user_info].map((dd)=>{
+          return dd && dd.email
+        }))) {
+          if (email) {
+            await AutoSendEmail.customerOrder(
+              this.app,
+              'auto-email-payment-successful',
+              order_id,
+              email,
+              cartData.orderData.language
+            );
+          }
+        }
 
-        await AutoSendEmail.customerOrder(
-          this.app,
-          'auto-email-payment-successful',
-          order_id,
-          cartData.email,
-          cartData.orderData.language
-        );
 
         if (cartData.orderData.customer_info.phone) {
           let sns = new SMS(this.app);