ts-glitter 22.5.2 → 22.5.3

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

@@ -36,6 +36,7 @@ import { PaymentStrategyFactory } from './factories/payment-strategy-factory.js'
 import { IPaymentStrategy } from './interface/payment-strategy-interface.js';
 import { PaymentService } from './payment-service.js';
 import { CartItem, CheckoutEvent } from './checkout-event.js';
+import { ProductCollection } from './collection.js';
 // import { DiffRecord } from './diff-record.js';
 
 type BindItem = {
@@ -529,7 +530,12 @@ export class Shopping {
       }
 
       if (query.product_category) {
-        querySql.push(`JSON_EXTRACT(content, '$.product_category') = ${db.escape(query.product_category)}`);
+        if(query.product_category==='commodity'){
+          querySql.push(`((JSON_EXTRACT(content, '$.product_category') = ${db.escape(query.product_category)}) or (JSON_EXTRACT(content, '$.product_category') is null))`);
+        }else{
+          querySql.push(`(JSON_EXTRACT(content, '$.product_category') = ${db.escape(query.product_category)})`);
+        }
+
       }
 
       if (query.domain) {
@@ -633,8 +639,8 @@ export class Shopping {
             .split(',')
             .map(dd => {
               return query.accurate_search_collection
-                ? `(JSON_CONTAINS(content->'$.collection', '"${dd}"'))`
-                : `(JSON_EXTRACT(content, '$.collection') LIKE '%${dd}%')`;
+                ? `(id in (SELECT product_id FROM ${this.app}.t_collection where collection=${db.escape(dd)}))`
+                : `(id in (SELECT product_id FROM ${this.app}.t_collection where collection LIKE '%${dd}%'))`;
             })
             .join(' or ')})`
         );
@@ -748,6 +754,7 @@ export class Shopping {
           if (product.content) {
             product.content.in_wish_list = wishListSet.has(String(product.id));
             product.content.id = product.id;
+            product.content.specs=product.content.specs??[]
           }
           return product;
         });
@@ -976,6 +983,7 @@ export class Shopping {
                   }
                 }
                 product.total_sales = totalSale;
+                content.collection=(await db.query(`SELECT collection FROM \`${this.app}\`.t_collection where product_id=${db.escape(content.id)};`,[])).map((dd:any)=>dd.collection)
               }
               resolve(true);
             });
@@ -5443,10 +5451,7 @@ export class Shopping {
         user_id: 'manager',
       });
 
-      if (content.collection.length > 0) {
-        //有新類別要處理
-        await this.updateCollectionFromUpdateProduct(content.collection);
-      }
+
 
       let productArray: any = content.data;
       await Promise.all(
@@ -5558,9 +5563,10 @@ export class Shopping {
           this.setProductGeneralTagConifg(tempTags.general),
         ]);
 
+
         const data = await db.query(
           `REPLACE
-          INTO \`${this.app}\`.\`t_manager_post\` (id,userID,content) values ?
+          INTO \`${this.app}\`.\`t_manager_post\` (id,userID,content,\`type\`) values ?
           `,
           [
             productArray.map((product: any) => {
@@ -5569,10 +5575,13 @@ export class Shopping {
               }
               product.type = 'product';
               this.checkVariantDataType(product.variants);
-              return [product.id || null, this.token?.userID, JSON.stringify(product)];
+              return [product.id || null, this.token?.userID, JSON.stringify(product),'product'];
             }),
           ]
         );
+        await ProductCollection.updateProductCollection(this.app,productArray)
+
+
         let insertIDStart = data.insertId;
         await new Shopping(this.app, this.token).promisesProducts(productArray, insertIDStart);
         return insertIDStart;
@@ -5653,7 +5662,7 @@ export class Shopping {
 
       // 更新商品 Variant
       await new Shopping(this.app, this.token).postVariantsAndPriceValue(content);
-
+      await ProductCollection.updateProductCollection(this.app,[content])
       return content.insertId;
     } catch (e) {
       console.error(e);

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

@@ -295,6 +295,49 @@ ADD INDEX \`index2\` (\`type\` ASC) VISIBLE;
             new_version: 'V1.2',
             event: `UPDATE \`${app_name}\`.t_triggers SET type = content->>'$.type' where id>0`,
         });
+        await UpdatedTableChecked.update({
+            app_name: app_name,
+            table_name: 't_manager_post',
+            last_version: ['V1.0', ''],
+            new_version: 'V1.1',
+            event: `ALTER TABLE \`${app_name}\`.\`t_manager_post\`
+        ADD COLUMN \`type\` VARCHAR(45) NULL AFTER \`status\`,
+ADD INDEX \`index3\` (\`type\` ASC) VISIBLE;
+      ;`,
+        });
+        await UpdatedTableChecked.update({
+            app_name: app_name,
+            table_name: 't_manager_post',
+            last_version: ['V1.1'],
+            new_version: 'V1.2',
+            event: `UPDATE \`${app_name}\`.t_manager_post SET type = content->>'$.type' where id>0`,
+        });
+        await UpdatedTableChecked.update({
+            app_name: app_name,
+            table_name: 't_manager_post',
+            last_version: ['V1.2'],
+            new_version: 'V1.3',
+            event: () => {
+                return new Promise(async (resolve) => {
+                    const products = await database_1.default.query(`select * from \`${app_name}\`.t_manager_post where type='product'`, []);
+                    let insert = [];
+                    products.map((dd) => {
+                        if (Array.isArray(dd.content.collection)) {
+                            dd.content.collection.map((dd2) => {
+                                insert.push([
+                                    dd.id,
+                                    dd2
+                                ]);
+                            });
+                        }
+                    });
+                    if (insert.length > 0) {
+                        await database_1.default.query(`replace into \`${app_name}\`.t_collection (product_id, collection) values ?`, [insert]);
+                    }
+                    resolve(true);
+                });
+            },
+        });
     }
     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

@@ -312,6 +312,55 @@ ADD INDEX \`index2\` (\`type\` ASC) VISIBLE;
       new_version: 'V1.2',
       event: `UPDATE \`${app_name}\`.t_triggers SET type = content->>'$.type' where id>0`,
     });
+    //將商品的type拉出做index
+    await UpdatedTableChecked.update({
+      app_name: app_name,
+      table_name: 't_manager_post',
+      last_version:  ['V1.0', ''],
+      new_version: 'V1.1',
+      event: `ALTER TABLE \`${app_name}\`.\`t_manager_post\`
+        ADD COLUMN \`type\` VARCHAR(45) NULL AFTER \`status\`,
+ADD INDEX \`index3\` (\`type\` ASC) VISIBLE;
+      ;`,
+    });
+    await UpdatedTableChecked.update({
+      app_name: app_name,
+      table_name: 't_manager_post',
+      last_version: ['V1.1'],
+      new_version: 'V1.2',
+      event: `UPDATE \`${app_name}\`.t_manager_post SET type = content->>'$.type' where id>0`,
+    });
+    await UpdatedTableChecked.update({
+      app_name: app_name,
+      table_name: 't_manager_post',
+      last_version: ['V1.2'],
+      new_version: 'V1.3',
+      event: ()=>{
+        return new Promise(async resolve => {
+          const products=await db.query(`select * from \`${app_name}\`.t_manager_post where type='product'`,[]);
+          let insert:any=[]
+          products.map((dd:any)=>{
+if(Array.isArray(dd.content.collection)){
+  dd.content.collection.map((dd2:any)=>{
+    insert.push([
+      dd.id,
+      dd2
+    ])
+  })
+
+}
+          });
+
+          if(insert.length>0){
+            await db.query(`replace into \`${app_name}\`.t_collection (product_id, collection) values ?`,[insert]);
+          }
+
+          resolve(true);
+        });
+      },
+    });
+
+
   }
 
   public static async update(obj: {