feat: 新增收入報表功能、收入統計功能、修正訂單顯示價格錯誤

NTOU-Auction · Jan 8, 2024 · 25e2852 · 25e2852
1 parent 54ea9c6
commit 25e2852
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 270 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -110,7 +110,7 @@ export default function RootLayout({
   ];
 
   const SELLER_CENTER_LINKS = [
-    //{ text: "賣家中心", href: user ? "/dashbord" : "/sign-in", icon: StorefrontIcon },
+    { text: "賣家中心", href: user ? "/dashbord" : "/sign-in", icon: StorefrontIcon },
     { text: "商品管理", href: user ? "/seller-product" : "/sign-in", icon: SellIcon },
     { text: "訂單管理", href: user ? "/order" : "/sign-in", icon: ContentPasteIcon },
     { text: "上架商品", href: user ? "/add-product" : "/sign-in", icon: AddIcon },

diff --git a/src/app/my-order/page.js b/src/app/my-order/page.js
@@ -282,7 +282,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -351,7 +351,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -396,7 +396,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -442,7 +442,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -490,7 +490,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>

diff --git a/src/app/order/page.js b/src/app/order/page.js
@@ -314,7 +314,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -381,7 +381,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -424,7 +424,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -468,7 +468,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>
@@ -520,7 +520,7 @@ export default function Orders() {
                   </TableCell>
                   <TableCell>
                     {order.productAddAmountList.map((productItem, index) => (
-                      <div key={index}>{productItem.product.currentPrice}</div>
+                      <div key={index}>{productItem.product.currentPrice * productItem.amount}</div>
                     ))}
                   </TableCell>
                   <TableCell>