活动

business/partner/purchase/jx/localjx/order.go

@@ -497,7 +497,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 	} else {
 		switch orderPay.PayType {
 		case model.PayTypeTL_DiscountCard:
-			userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID)
+			userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID, model.MemberTypeDiscountCard)
 			if len(userMembers) > 0 {
 				userMembers[0].IsPay = model.YES
 				dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay")
@@ -917,19 +917,29 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 			outJxOrder.FreightPrice = 0
 		}
 
-		//判断用户是否是会员
-		// var tuserID string
-		// if userID == "" {
-		// 	tuserID = deliveryAddress.UserID
-		// } else {
-		// 	tuserID = userID
-		// }
-		// userMembers, err := dao.GetUserMember(db, tuserID, "")
-		// if err == nil {
-
-		// }
+		// 判断用户是否是会员
+		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 {