This commit is contained in:
邹宗楠
2026-05-15 18:21:53 +08:00
parent 9612729837
commit 17342da47c

View File

@@ -153,7 +153,7 @@ var (
bagMap = map[int]int{ bagMap = map[int]int{
6039382: 100, 6039382: 100,
6039383: 200, 6039383: 200,
6039384: 200, 6039384: 100,
6039387: 200, 6039387: 200,
6039390: 200, 6039390: 200,
} }
@@ -871,7 +871,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
@@ -930,7 +930,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
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 { //这些袋子是一份200个 } else if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 { //这些袋子是一份200个 jxSku.SkuID == 6039384 ||
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 {