From 7f90df02abfa590b8ae70504ee9ec8cada9d8627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 28 Aug 2020 18:23:52 +0800
Subject: [PATCH] bug

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 7deb9cb19..76b87e0cc 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -815,18 +815,20 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		outJxOrder.FreightPrice = 500
 		// }
 		//如果是守价的订单，需要查询本期中该用户是否已经守价过，如果守价过就只算一次运费
-		priceDefendOrders, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 1, deliveryAddress.UserID, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
-		if len(priceDefendOrders) > 0 {
-			flag2 := false
-			for _, v := range priceDefendOrders {
-				if v.StoreID != jxOrder.StoreID {
-					flag2 = true
+		if jxOrder.OrderType == model.OrderTypeDefendPrice {
+			priceDefendOrders, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 1, deliveryAddress.UserID, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
+			if len(priceDefendOrders) > 0 {
+				flag2 := false
+				for _, v := range priceDefendOrders {
+					if v.StoreID != jxOrder.StoreID {
+						flag2 = true
+					}
 				}
+				if flag2 {
+					return nil, nil, fmt.Errorf("同一期不允许相同用户在不同门店进行守价!")
+				}
+				outJxOrder.FreightPrice = 0
 			}
-			if flag2 {
-				return nil, nil, fmt.Errorf("同一期不允许相同用户在不同门店进行守价!")
-			}
-			outJxOrder.FreightPrice = 0
 		}
 	} else {
 		outJxOrder.FreightPrice = 0