From 08332b9f72d041a64d0919cdd10d88b5442e6bfb 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:52:07 +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 | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 952445542..c6bf46ab6 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -498,16 +498,25 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						}
 					}
 					if jxSku != nil {
-						outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 						if fromStoreID == 0 {
+							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
 						} else {
 							if jxSku.SkuID == 6039382 {
 								if bagMap[jxSku.SkuID] != 0 {
 									if sum > 0 {
 										if bagMap[jxSku.SkuID]*jxSku.Count <= sum+100 {
+											jxSku.SalePrice = 1
+											outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 											outJxOrder.OrderPrice += int64(1 * jxSku.Count)
 										} else {
+											jxSku2 := *jxSku
+											jxSku2.SalePrice = jxSku.SalePrice
+											jxSku2.Count = int(int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/100)))
+											jxSku.SalePrice = 1
+											jxSku.Count = int(utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum) / 100)))
+											outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
+											outJxOrder.Skus = append(outJxOrder.Skus, &jxSku2)
 											outJxOrder.OrderPrice += int64(1 * math.Ceil(utils.Int2Float64(sum)/100))
 											outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/100))) * jxSku.SalePrice
 										}
@@ -519,14 +528,21 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 							}
 							if jxSku.SkuID == 6039383 || jxSku.SkuID == 6039384 || jxSku.SkuID == 6039387 || jxSku.SkuID == 6039390 {
 								if bagMap[jxSku.SkuID] != 0 {
-									globals.SugarLogger.Debugf("daizi1,[%v]", sum)
 									if sum > 0 {
 										if bagMap[jxSku.SkuID]*jxSku.Count <= sum+200 {
+											jxSku.SalePrice = 1
+											outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 											outJxOrder.OrderPrice += int64(1 * jxSku.Count)
 										} else {
+											jxSku2 := *jxSku
+											jxSku2.SalePrice = jxSku.SalePrice
+											jxSku2.Count = int(int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/200)))
+											jxSku.SalePrice = 1
+											jxSku.Count = int(utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum) / 200)))
+											outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
+											outJxOrder.Skus = append(outJxOrder.Skus, &jxSku2)
 											outJxOrder.OrderPrice += int64(1 * math.Ceil(utils.Int2Float64(sum)/200))
 											outJxOrder.OrderPrice += (int64(jxSku.Count) - utils.Float64TwoInt64(math.Ceil(utils.Int2Float64(sum)/200))) * jxSku.SalePrice
-											globals.SugarLogger.Debugf("daizi2,[%v]", outJxOrder.OrderPrice)
 										}
 									} else {
 										outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
@@ -534,6 +550,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 									sum = sum - bagMap[jxSku.SkuID]*jxSku.Count
 								}
 							}
+							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
 						}
 						outJxOrder.Weight += jxSku.Count * jxSku.Weight
 					}