From a6a80a1ac58b2e6413d0a48ad4c59fd01a4010e2 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, 17 Sep 2020 15:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 3bfc81402..4eb268640 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -357,6 +357,7 @@ func Pay4User(ctx *jxcontext.Context, thingID, payType int, vendorPayType string
 	switch payType {
 	case model.PayTypeTL_DiscountCard:
 		if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil {
+			fmt.Println("test11111111111111111111111111111111111111")
 			err = jxutils.Strings2Objs(configList[0], &dicountCards)
 			discountCard := findDiscountCard(dicountCards, thingID)
 			vendorOrderID = utils.Int64ToStr(GenOrderNo(ctx))
@@ -379,6 +380,8 @@ func Pay4User(ctx *jxcontext.Context, thingID, payType int, vendorPayType string
 			}
 			dao.WrapAddIDCULDEntity(userMember, ctx.GetUserName())
 			dao.CreateEntity(db, userMember)
+		} else {
+			fmt.Println("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
 		}
 	default:
 		err = fmt.Errorf("支付方式:%d当前不支持", payType)
@@ -913,6 +916,18 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		if IsDeliverySelf {
 			outJxOrder.FreightPrice = 0
 		}
+
+		//判断用户是否是会员
+		// var tuserID string
+		// if userID == "" {
+		// 	tuserID = deliveryAddress.UserID
+		// } else {
+		// 	tuserID = userID
+		// }
+		// userMembers, err := dao.GetUserMember(db, tuserID, "")
+		// if err == nil {
+
+		// }
 	}
 	if err == nil {
 		outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice