diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 44d3349..d5c7878 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -823,8 +823,10 @@ export class OrderService { SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%6%' THEN os.quantity ELSE 0 END) AS yoone6Quantity, SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%9%' THEN os.quantity ELSE 0 END) AS yoone9Quantity, SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%12%' THEN os.quantity ELSE 0 END) AS yoone12Quantity, + SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%12%' AND os.name LIKE '%NEW%' THEN os.quantity ELSE 0 END) AS yoone12QuantityNew, SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%15%' THEN os.quantity ELSE 0 END) AS yoone15Quantity, - SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%18%' THEN os.quantity ELSE 0 END) AS yoone18Quantity + SUM(CASE WHEN os.name LIKE '%yoone%' AND os.name LIKE '%18%' THEN os.quantity ELSE 0 END) AS yoone18Quantity, + SUM(CASE WHEN os.name LIKE '%zex%' THEN os.quantity ELSE 0 END) AS zexQuantity FROM order_sale os INNER JOIN \`order\` o ON o.id = os.orderId WHERE o.date_paid BETWEEN ? AND ? @@ -849,8 +851,10 @@ export class OrderService { yoone6Quantity: Number(totalQuantityResult.yoone6Quantity || 0), yoone9Quantity: Number(totalQuantityResult.yoone9Quantity || 0), yoone12Quantity: Number(totalQuantityResult.yoone12Quantity || 0), + yoone12QuantityNew: Number(totalQuantityResult.yoone12QuantityNew || 0), yoone15Quantity: Number(totalQuantityResult.yoone15Quantity || 0), yoone18Quantity: Number(totalQuantityResult.yoone18Quantity || 0), + zexQuantity: Number(totalQuantityResult.zexQuantity || 0), current, pageSize, };