物料订单袋子数量超标物品拆分
This commit is contained in:
@@ -501,7 +501,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
if fromStoreID == 0 {
|
if fromStoreID == 0 {
|
||||||
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为物料订单袋子金额和数量处理
|
||||||
if jxSku.SkuID == 6039382 {
|
if jxSku.SkuID == 6039382 {
|
||||||
if bagMap[jxSku.SkuID] != 0 {
|
if bagMap[jxSku.SkuID] != 0 {
|
||||||
if sum > 0 {
|
if sum > 0 {
|
||||||
@@ -521,12 +521,12 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/100))) * jxSku.SalePrice
|
outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/100))) * jxSku.SalePrice
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
|
||||||
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
||||||
}
|
}
|
||||||
sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
|
sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
|
||||||
}
|
}
|
||||||
}
|
} else if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039384 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 {
|
||||||
if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039384 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 {
|
|
||||||
if bagMap[jxSku.SkuID] != 0 {
|
if bagMap[jxSku.SkuID] != 0 {
|
||||||
if sum > 0 {
|
if sum > 0 {
|
||||||
if bagMap[jxSku.SkuID]*jxSku.Count <= sum+200 {
|
if bagMap[jxSku.SkuID]*jxSku.Count <= sum+200 {
|
||||||
@@ -545,12 +545,15 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/200))) * jxSku.SalePrice
|
outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/200))) * jxSku.SalePrice
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
|
||||||
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
||||||
}
|
}
|
||||||
sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
|
sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
|
||||||
|
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
||||||
}
|
}
|
||||||
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
|
|
||||||
}
|
}
|
||||||
outJxOrder.Weight += jxSku.Count * jxSku.Weight
|
outJxOrder.Weight += jxSku.Count * jxSku.Weight
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user