Merge pull request #305 from Roger13579/dev

Dev
Roger13579 · Jun 28, 2024 · ed241bd · ed241bd
2 parents d35b625 + 46075f8
commit ed241bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/models/order.ts b/src/models/order.ts
@@ -32,7 +32,7 @@ const { userId, productId, plan } = schemaDef;
 
 const schema = new Schema<IOrder>(
   {
-    thirdPartyPaymentId: { type: String },
+    thirdPartyPaymentId: { type: String, default: '' },
     userId,
     products: {
       type: [
@@ -61,6 +61,7 @@ const schema = new Schema<IOrder>(
     },
     paidAt: {
       type: Date,
+      default: '',
     },
     deliveryInfo: {
       type: {

diff --git a/src/types/order.type.ts b/src/types/order.type.ts
@@ -2,6 +2,7 @@ import { IUserReq, TPaginationQuery } from './common.type';
 import { IPlan, IProductId } from './product.type';
 import { IProduct } from '../models/product';
 import { Types } from 'mongoose';
+import { IOrder } from '../models/order';
 
 export enum PaymentMethod {
   linePay = 'linePay',
@@ -105,3 +106,13 @@ export interface IUpdateOrderParam extends IOrderId {
 export interface INewebPayCheckOrderReq extends IUserReq {
   body: { TradeInfo: string; TradeSha: unknown };
 }
+
+export interface IGetOrderParam extends IOrder {
+  thirdPartyPaymentId: string;
+  paidAt: Date;
+}
+
+export type OrderDocumentWithPayment = Document &
+  IGetOrderParam & {
+    _id: Types.ObjectId;
+  };