liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-04-11 14:10:41 +08:00
parent 9bc1ba4cbc
commit b352e8f440
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/partner/purchase/jx/localjx/order.go
View File

@@ -843,7 +843,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) { if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
} else { //以下else为物料订单袋子金额和数量处理 } else { //以下else为物料订单袋子金额和数量处理
if !result.Flag { //只要flag是false就按原价申请，是true再按订单量 if !result.Flag { //只要flag是false就按原价申请，是true再按订单量
outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
@@ -1032,6 +1032,11 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
if storeDetail.ID == 668470 || storeDetail.ID == 668469 { if storeDetail.ID == 668470 || storeDetail.ID == 668469 {
outJxOrder.FreightPrice = 1 outJxOrder.FreightPrice = 1
} }
if IsDeliverySelf {
outJxOrder.FreightPrice = 0
}
if err == nil { if err == nil {
if jxOrder.OrderType == model.OrderTypeNormal { if jxOrder.OrderType == model.OrderTypeNormal {
outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice