From 4cc18d9ffb640e74fa498c068da1b0a2baa51b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 12 Mar 2020 10:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E8=A2=8B?=
 =?UTF-8?q?=E5=AD=90=E6=95=B0=E9=87=8F=E8=B6=85=E6=A0=87=E7=89=A9=E5=93=81?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index c6bf46ab6..35eab05d6 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -501,7 +501,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						if fromStoreID == 0 {
 							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
-						} else {
+						} else { //以下else为物料订单袋子金额和数量处理
 							if jxSku.SkuID == 6039382 {
 								if bagMap[jxSku.SkuID] != 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
 										}
 									} else {
+										outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 										outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
 									}
 									sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
 								}
-							}
-							if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039384 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 {
+							} else if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039384 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 {
 								if bagMap[jxSku.SkuID] != 0 {
 									if sum > 0 {
 										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
 										}
 									} else {
+										outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 										outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
 									}
 									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
 					}