1
This commit is contained in:
@@ -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
|
||||||
@@ -905,7 +905,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
} else {
|
} else {
|
||||||
//袋子总数小于等于销量就是1分钱,只要大于销量其他就按原价
|
//袋子总数小于等于销量就是1分钱,只要大于销量其他就按原价
|
||||||
//这个袋子规格是一份100个
|
//这个袋子规格是一份100个
|
||||||
if jxSku.SkuID == 6039382 {
|
if jxSku.SkuID == 6039382 || 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+100 {
|
if bagMap[jxSku.SkuID]*jxSku.Count <= sum+100 {
|
||||||
|
|||||||
Reference in New Issue
Block a user