fix discount

bahram1249 · May 21, 2024 · 5986b23 · 5986b23
1 parent caf9501
commit 5986b23
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 4 deletions.
diff --git a/apps/e-commerce/src/product-discount/product-discount-setter.service.ts b/apps/e-commerce/src/product-discount/product-discount-setter.service.ts
@@ -153,6 +153,28 @@ export class ProductDiscountSetterService {
   ) {
     return await this.discountRepository.findAll(
       new QueryOptionsBuilder()
+        .attributes([
+          'id',
+          'name',
+          'description',
+          'discountTypeId',
+          'discountActionTypeId',
+          'discountValue',
+          'maxValue',
+          'discountActionRuleId',
+          'userId',
+          'priority',
+          'limit',
+          'used',
+          'isActive',
+          'isDeleted',
+          'startDate',
+          'endDate',
+          'couponCode',
+          'freeShipment',
+          'createdAt',
+          'updatedAt',
+        ])
         .include([
           {
             model: ECDiscountCondition,

diff --git a/apps/e-commerce/src/product-discount/product-discount.service.ts b/apps/e-commerce/src/product-discount/product-discount.service.ts
@@ -24,8 +24,8 @@ export class ProductDiscountService {
           _.merge(filter, { inventoryStatusId: InventoryStatusEnum.available }),
         );
       let results = await this.repository.findAll(resultQuery);
-      await this.productDiscountSetterService.applyProducts(results);
       const total = await this.repository.count(countQuery);
+      await this.productDiscountSetterService.applyProducts(results);
       if (filter.limit + filter.offset >= total) {
         more = false;
       }

diff --git a/apps/e-commerce/src/product/service/apply-discount.service.ts b/apps/e-commerce/src/product/service/apply-discount.service.ts
@@ -420,6 +420,47 @@ export class ApplyDiscountService {
   ) {
     return await this.repository.findAll(
       new QueryOptionsBuilder()
+        .attributes([
+          'id',
+          'name',
+          'description',
+          'discountTypeId',
+          'discountActionTypeId',
+          'discountValue',
+          'maxValue',
+          'discountActionRuleId',
+          'userId',
+          'priority',
+          'limit',
+          'used',
+          'isActive',
+          'isDeleted',
+          [
+            Sequelize.fn(
+              'isnull',
+              Sequelize.col('ECDiscount.startDate'),
+              Sequelize.fn('getdate'),
+            ),
+            'startDate',
+          ],
+          [
+            Sequelize.fn(
+              'isnull',
+              Sequelize.col('ECDiscount.endDate'),
+              Sequelize.fn(
+                'dateadd',
+                Sequelize.literal('day'),
+                Sequelize.literal('1'),
+                Sequelize.fn('getdate'),
+              ),
+            ),
+            'endDate',
+          ],
+          'couponCode',
+          'freeShipment',
+          'createdAt',
+          'updatedAt',
+        ])
         .include([
           {
             model: ECDiscountCondition,
@@ -442,9 +483,14 @@ export class ApplyDiscountService {
           Sequelize.where(Sequelize.fn('getdate'), {
             [Op.between]: [
               Sequelize.fn(
-                'isnull',
-                Sequelize.col('ECDiscount.startDate'),
-                Sequelize.fn('getdate'),
+                'dateadd',
+                Sequelize.literal('minute'),
+                Sequelize.literal('-16'),
+                Sequelize.fn(
+                  'isnull',
+                  Sequelize.col('ECDiscount.startDate'),
+                  Sequelize.fn('getdate'),
+                ),
               ),
               Sequelize.fn(
                 'isnull',