This commit is contained in:
邹宗楠
2023-07-03 14:03:57 +08:00
parent 464b77f290
commit deb4270101

View File

@@ -95,8 +95,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
order.ConsigneeLat = jxutils.StandardCoordinate2Int(utils.Str2Float64(originalList[1])) order.ConsigneeLat = jxutils.StandardCoordinate2Int(utils.Str2Float64(originalList[1]))
order.DiscountMoney = *orderDetail.DiscountFee order.DiscountMoney = *orderDetail.DiscountFee
var salePrice int64 = 0 //var salePrice int64 = 0
var weight int = 0 //var weight int = 0
order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠 order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠
// 添加需要赠送的东西(暂时没有赠品套餐直接商品) // 添加需要赠送的东西(暂时没有赠品套餐直接商品)
multiSkuMap := make(map[int]int) multiSkuMap := make(map[int]int)
@@ -114,9 +114,9 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
SkuName: *extra.SkuName, SkuName: *extra.SkuName,
ShopPrice: *extra.Price, ShopPrice: *extra.Price,
VendorPrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity), VendorPrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity),
SalePrice: *extra.OriginalFee, SalePrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity),
EarningPrice: 0, EarningPrice: 0,
Weight: int(*extra.Weight), Weight: int(*extra.Weight / utils.Float64TwoInt64(*extra.BuySaleQuantity)),
SkuType: 0, SkuType: 0,
PromotionType: 0, PromotionType: 0,
OrderCreatedAt: order.OrderCreatedAt, OrderCreatedAt: order.OrderCreatedAt,
@@ -155,14 +155,14 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
} }
multiSkuMap[sku.SkuID]++ multiSkuMap[sku.SkuID]++
order.Skus = append(order.Skus, sku) order.Skus = append(order.Skus, sku)
salePrice += sku.SalePrice //salePrice += sku.SalePrice
weight += sku.Weight //weight += sku.Weight
globals.SugarLogger.Debugf("=====skuPrice := %d", sku.SalePrice) globals.SugarLogger.Debugf("=====skuPrice := %d", sku.SalePrice)
} }
} }
order.SalePrice = salePrice //order.SalePrice = salePrice
order.Weight = weight //order.Weight = weight
globals.SugarLogger.Debugf("=====skuPrice := %d", salePrice) //globals.SugarLogger.Debugf("=====skuPrice := %d", salePrice)
// 淘宝默认自配送 // 淘宝默认自配送
if *orderDetail.DeliveryType == tao_vegetable.OrderDeliveryTypeTime { if *orderDetail.DeliveryType == tao_vegetable.OrderDeliveryTypeTime {