From 3ff2c41fc8c6b9c34beb7d86c703844c4f1c98db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 13 Jul 2022 18:44:07 +0800
Subject: [PATCH] 1

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index b85c278a9..8f6ea9dd2 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -840,7 +840,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
 							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
-						} else { //以下else为物料订单袋子金额和数量处理
+						} else {              //以下else为物料订单袋子金额和数量处理
 							if !result.Flag { //只要flag是false就按原价申请，是true再按订单量
 								outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 								outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
@@ -1022,7 +1022,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee)
 	}
 	// ?????????????????????? 测试
-	if storeDetail.ID == 668470 || jxOrder.UserID == "13E23ABEAE7811EC8D3F525400AE46A6" {
+	if storeDetail.ID == 668470 || storeDetail.ID == 668469 {
 		outJxOrder.FreightPrice = 1
 	}
 	if err == nil {