feat:订单模块新增商品单位
This commit is contained in:
@@ -411,7 +411,7 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic
|
||||
productNum := orderProduct.PurchaseQuantity.Current.(string)
|
||||
var productNumStr = productNum
|
||||
|
||||
var productsInfo = fmt.Sprintf(model00301, orderProduct.ProductName, price, productNumStr, priceTotal)
|
||||
var productsInfo = fmt.Sprintf(model00301, orderProduct.ProductName, price, productNumStr, orderProduct.ProductWebsiteUnit, priceTotal)
|
||||
products = products + productsInfo
|
||||
}
|
||||
model003 = fmt.Sprintf(constants.INVOICE_TEMPLATE_03, products)
|
||||
@@ -1527,9 +1527,10 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
|
||||
ProductId: *shoppingCart.ProductId,
|
||||
ProductCover: *shoppingCart.ShoppingCartProduct.Cover,
|
||||
ProductCoverMetadata: productCoverMetadata,
|
||||
ProductName: *shoppingCart.ShoppingCartProduct.Title,
|
||||
ProductName: shoppingCartSnapshot.ProductInfo.ProductName,
|
||||
ProductSn: shoppingCartSnapshot.ProductInfo.ProductSn,
|
||||
ProductWebsiteUnit: shoppingCartSnapshot.ProductInfo.ProductWebsiteUnit,
|
||||
|
||||
ProductSn: *shoppingCart.ShoppingCartProduct.Sn,
|
||||
DiyInformation: &shoppingCartSnapshot.UserDiyInformation,
|
||||
FittingInfo: &gmodel.OrderProductFittingInfo{
|
||||
FittingID: *shoppingCart.FittingId,
|
||||
@@ -1817,9 +1818,11 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
|
||||
|
||||
ProductId: productValue.ProductId,
|
||||
ProductSn: productValue.ProductSn,
|
||||
ProductWebsiteUnit: productValue.ProductWebsiteUnit,
|
||||
ProductName: productValue.ProductName,
|
||||
ProductCover: productValue.ProductCover,
|
||||
ProductCoverMetadata: productValue.ProductCoverMetadata,
|
||||
|
||||
ShoppingCartSnapshot: &shoppingCartSnapshotData,
|
||||
ExpectedDeliveryTime: &expectedDeliveryTime,
|
||||
PurchaseQuantity: order.GetPurchaseQuantity(productValue.PurchaseQuantity, true),
|
||||
|
||||
Reference in New Issue
Block a user