@things-factory/sales-base 4.3.105-alpha.0 → 4.3.106

package/server/service/draft-release-good/draft-release-good.ts

@@ -125,6 +125,26 @@ export class DraftReleaseGood {
   @Field(type => ShippingOrderInfo, { nullable: true })
   shippingOrderInfo?: ShippingOrderInfo
 
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  discountAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  promotionAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  taxAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  shippingFee?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  paidAmount: number
+
   @OneToMany(type => OrderProduct, orderProduct => orderProduct.draftReleaseGood)
   @Field(type => [OrderProduct], { nullable: true })
   orderProducts: OrderProduct[]
@@ -153,6 +173,18 @@ export class DraftReleaseGood {
   @Field({ nullable: true })
   remark: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformName: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   marketplaceOrderStatus: string

package/server/service/invoice-product/invoice-product.ts

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Invoice } from '../invoice/invoice'
@@ -77,10 +77,6 @@ export class InvoiceProduct {
   @Field({ nullable: true })
   shippingFeePaidByCustomer: number
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @CreateDateColumn()
   @Field()
   createdAt: Date

package/server/service/order-inventory/order-inventory-query.ts

@@ -286,7 +286,6 @@ export class OrderInventoryQuery {
       .leftJoinAndSelect('oi.bizplace', 'bizplace')
       .leftJoinAndSelect('oi.inventory', 'inventory')
       .leftJoinAndSelect('inventory.product', 'product')
-      .leftJoinAndSelect('inventory.productDetail', 'productDetail')
       .leftJoinAndSelect('oi.creator', 'creator')
       .leftJoinAndSelect('oi.updater', 'updater')
 
@@ -300,7 +299,6 @@ export class OrderInventoryQuery {
         releaseGoodName: item.releaseGood.name,
         palletId: item.inventory.palletId,
         productId: item.inventory.product.id,
-        productDetailId: item.inventory.productDetail.id,
         productName: item.inventory.product.name,
         productSKU: item.inventory.product.sku,
         productBrand: item.inventory.product.brand,

package/server/service/order-inventory/order-inventory-types.ts

@@ -41,9 +41,6 @@ export class NewOrderInventory {
   @Field(type => NewProduct, { nullable: true })
   product: NewProduct
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field({ nullable: true })
   productSKU: string
 
@@ -203,9 +200,6 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   productId: string
 
-  @Field({ nullable: true })
-  productDetailId: string
-
   @Field({ nullable: true })
   orderProductId: string
 

package/server/service/order-inventory/order-inventory.ts

@@ -13,7 +13,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail} from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -341,13 +341,6 @@ export class OrderInventory {
   @Field({ nullable: true })
   loadedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
-  @Field({ nullable: true })
-  productDetailId: String
-
   @Field({ nullable: true })
   dispatchedAt: Date
 

package/server/service/order-product/order-product-query.ts

@@ -26,7 +26,6 @@ export class OrderProductQuery {
 
     let qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct).createQueryBuilder('op')
     qb.leftJoinAndSelect('op.product', 'product')
-      .leftJoinAndSelect('op.productDetail', 'productDetail')
       .leftJoinAndSelect('op.domain', 'domain')
       .leftJoinAndSelect('op.bizplace', 'bizplace')
       .leftJoinAndSelect('bizplace.company', 'company')

package/server/service/order-product/order-product-types.ts

@@ -41,6 +41,12 @@ export class InboundProduct {
 
   @Field(type => Float, { nullable: true })
   uomValue: number
+
+  @Field(type => Float, { nullable: true })
+  sellingPrice: number
+
+  @Field(type => Float, { nullable: true })
+  paidAmount: number
 }
 
 @InputType()
@@ -84,9 +90,6 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -228,9 +231,6 @@ export class NewOrderProduct {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -332,4 +332,10 @@ export class NewOrderProduct {
 
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate: Date
+
+  @Field(type => Float, { nullable: true })
+  sellingPrice: number
+
+  @Field(type => Float, { nullable: true })
+  paidAmount: number
 }

package/server/service/order-product/order-product.ts

@@ -1,30 +1,30 @@
-import { Field, ID, ObjectType, Float } from 'type-graphql'
+import { Field, Float, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
   Entity,
   Index,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
   RelationId,
-  UpdateDateColumn,
-  OneToMany
+  UpdateDateColumn
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail, ProductBundle } from '@things-factory/product-base'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { CollectionOrder } from '../collection-order/collection-order'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
+import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
+import { OrderInventory } from '../order-inventory/order-inventory'
 import { PurchaseOrder } from '../purchase-order/purchase-order'
 import { ReleaseGood } from '../release-good/release-good'
-import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
 import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
-import { OrderInventory } from '../order-inventory/order-inventory'
 
 @Entity()
 @Index('ix_order-product_0', (orderProduct: OrderProduct) => [orderProduct.domain, orderProduct.name], {
@@ -59,13 +59,7 @@ import { OrderInventory } from '../order-inventory/order-inventory'
   ],
   { unique: true }
 )
-@Index(
-  'ix_order-product_4',
-  (orderProduct: OrderProduct) => [
-    orderProduct.draftReleaseGood
-  ],
-  { unique: false }
-)
+@Index('ix_order-product_4', (orderProduct: OrderProduct) => [orderProduct.draftReleaseGood], { unique: false })
 @ObjectType()
 export class OrderProduct {
   @PrimaryGeneratedColumn('uuid')
@@ -269,6 +263,14 @@ export class OrderProduct {
   @Field({ nullable: true })
   unitPrice: number
 
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  sellingPrice: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  paidAmount: number
+
   @Column('float', { nullable: true })
   @Field({ nullable: true })
   adjustedUnitPrice: number

package/server/service/order-vas/order-vas.ts

@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -200,10 +200,6 @@ export class OrderVas {
   @Field()
   updatedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   creator: User
@@ -217,5 +213,4 @@ export class OrderVas {
 
   @RelationId((orderVas: OrderVas) => orderVas.updater)
   updaterId: string
-
 }