diff --git a/internal/dao/bundleDao.go b/internal/dao/bundleDao.go index 56793bf..c827a96 100644 --- a/internal/dao/bundleDao.go +++ b/internal/dao/bundleDao.go @@ -72,15 +72,17 @@ func BundleList(req *bundle.BundleListRequest) (res *bundle.BundleListResponse, for _, bundleProfile := range bundles { res.Bundles = append(res.Bundles, &bundle.BundleProfile{ - Uuid: bundleProfile.UUID, - Name: bundleProfile.Name, - Price: bundleProfile.Price, - PriceType: bundleProfile.PriceType, - Contract: bundleProfile.Contract, - Content: bundleProfile.Content, - Language: bundleProfile.Language, - CreatedAt: bundleProfile.CreatedAt.String(), - UpdatedAt: bundleProfile.UpdatedAt.String(), + Uuid: bundleProfile.UUID, + Name: bundleProfile.Name, + Price: bundleProfile.Price, + PriceType: bundleProfile.PriceType, + Contract: bundleProfile.Contract, + Content: bundleProfile.Content, + Language: bundleProfile.Language, + CreatedAt: bundleProfile.CreatedAt.String(), + UpdatedAt: bundleProfile.UpdatedAt.String(), + CompanySign: bundleProfile.CompanySign, + ContractDuration: int64(bundleProfile.ContractDuration), }) } @@ -108,15 +110,17 @@ func BundleDetail(uuid string) (res *bundle.BundleProfile, err error) { //_ = copier.CopyWithOption(&res, bundle, copier.Option{DeepCopy: true}) res = &bundle.BundleProfile{ - Uuid: bundleProfile.UUID, - Name: bundleProfile.Name, - Price: bundleProfile.Price, - PriceType: bundleProfile.PriceType, - Contract: bundleProfile.Contract, - Content: bundleProfile.Content, - Language: bundleProfile.Language, - CreatedAt: bundleProfile.CreatedAt.String(), - UpdatedAt: bundleProfile.UpdatedAt.String(), + Uuid: bundleProfile.UUID, + Name: bundleProfile.Name, + Price: bundleProfile.Price, + PriceType: bundleProfile.PriceType, + Contract: bundleProfile.Contract, + Content: bundleProfile.Content, + Language: bundleProfile.Language, + CreatedAt: bundleProfile.CreatedAt.String(), + UpdatedAt: bundleProfile.UpdatedAt.String(), + CompanySign: bundleProfile.CompanySign, + ContractDuration: int64(bundleProfile.ContractDuration), } return } diff --git a/internal/dao/orderRecordsDao.go b/internal/dao/orderRecordsDao.go index 2083419..c83a82b 100644 --- a/internal/dao/orderRecordsDao.go +++ b/internal/dao/orderRecordsDao.go @@ -131,6 +131,7 @@ func OrderRecordsList(req *bundle.OrderRecordsRequest) (res *bundle.OrderRecords CheckoutSessionId: record.CheckoutSessionId, CheckoutSessionUrl: record.CheckoutSessionUrl, Status: record.Status, + ContractNo: record.ContractNo, }) } @@ -185,6 +186,7 @@ func OrderRecordDetail(req *bundle.OrderRecordsDetailRequest) (res *bundle.Order CheckoutSessionId: orderRecord.CheckoutSessionId, CheckoutSessionUrl: orderRecord.CheckoutSessionUrl, Status: orderRecord.Status, + ContractNo: orderRecord.ContractNo, } return }