From 7a51e5675d1ba39c8eeb6a0e77fbdd05bdca28e9 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, 18 Sep 2020 12:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index e2bf07761..bb8c208ec 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -916,34 +916,35 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		if IsDeliverySelf {
 			outJxOrder.FreightPrice = 0
 		}
-
-		// 判断用户是否是会员
-		var (
-			tuserID      string
-			dicountCards []*model.DiscountCard
-		)
-		if userID == "" {
-			tuserID = deliveryAddress.UserID
-		} else {
-			tuserID = userID
-		}
-		userMembers, _ := dao.GetUserMember(db, tuserID, "", model.MemberTypeDiscountCard)
-		if len(userMembers) > 0 {
-			if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil {
-				jxutils.Strings2Objs(configList[0].Value, &dicountCards)
-				discountCard := findDiscountCard(dicountCards, userMembers[0].MemberTypeID)
-				outJxOrder.OrderPrice = outJxOrder.OrderPrice * int64(discountCard.PicePercentage) / 100
-			}
-		}
 	}
 	if err == nil {
 		if jxOrder.OrderType == model.OrderTypeNormal {
-
-		}
-		outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
-		outJxOrder.ActualPayPrice = outJxOrder.TotalPrice
-		if jxOrder.OrderType == model.OrderTypeDefendPrice {
+			outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
+			// 判断用户是否是会员
+			var (
+				tuserID      string
+				dicountCards []*model.DiscountCard
+			)
+			if userID == "" {
+				tuserID = deliveryAddress.UserID
+			} else {
+				tuserID = userID
+			}
+			userMembers, _ := dao.GetUserMember(db, tuserID, "", model.MemberTypeDiscountCard)
+			if len(userMembers) > 0 {
+				if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil {
+					jxutils.Strings2Objs(configList[0].Value, &dicountCards)
+					discountCard := findDiscountCard(dicountCards, userMembers[0].MemberTypeID)
+					outJxOrder.OrderPrice = outJxOrder.OrderPrice * int64(discountCard.PicePercentage) / 100
+				}
+			}
+			outJxOrder.ActualPayPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
+		} else if jxOrder.OrderType == model.OrderTypeDefendPrice {
 			outJxOrder.Skus[0].DefendPrice = jxOrder.Skus[0].DefendPrice
+
+		} else {
+			outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
+			outJxOrder.ActualPayPrice = outJxOrder.TotalPrice
 		}
 		if jxOrder.UserID != "" {
 			outJxOrder.UserID = jxOrder.UserID