member

business/model/dao/dao_user.go

@@ -222,11 +222,10 @@ func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOr
 	return userOrderSms, err
 }
 
-func GetUserMember(db *DaoDB, userID string, orderID int64, memberType int, isPay bool) (userMembers []*model.UserMember, err error) {
+func GetUserMember(db *DaoDB, userID string, memberType int) (userMembers []*model.UserMember, err error) {
 	sql := `
 		SELECT a.* 
 		  FROM user_member a
-		  JOIN order b ON b.id = a.order_id
 		 WHERE a.deleted_at = ? 
 	`
 	sqlParams := []interface{}{utils.DefaultTimeValue}
@@ -234,18 +233,10 @@ func GetUserMember(db *DaoDB, userID string, orderID int64, memberType int, isPa
 		sql += " AND a.user_id = ?"
 		sqlParams = append(sqlParams, userID)
 	}
-	if orderID != 0 {
-		sql += " AND a.order_id = ?"
-		sqlParams = append(sqlParams, orderID)
-	}
 	if memberType != 0 {
 		sql += " AND a.member_type = ?"
 		sqlParams = append(sqlParams, memberType)
 	}
-	if isPay {
-		sql += " AND b.status = ?"
-		sqlParams = append(sqlParams, isPay)
-	}
 	err = GetRows(db, &userMembers, sql, sqlParams)
 	return userMembers, err
 }

business/model/new_config.go

@@ -1,14 +1,14 @@
 package model
 
 const (
-	ConfigTypeSys          = "Sys"
-	ConfigTypePricePack    = "PricePack"
-	ConfigTypeFreightPack  = "FreightPack"
-	ConfigTypeBank         = "Bank"
-	ConfigTypeRole         = "Role"
-	ConfigTypeJxStore      = "JxStore"
-	ConfigTypeCookie       = "Cookie"
-	ConfigTypeDiscountCard = "DiscountCard"
+	ConfigTypeSys         = "Sys"
+	ConfigTypePricePack   = "PricePack"
+	ConfigTypeFreightPack = "FreightPack"
+	ConfigTypeBank        = "Bank"
+	ConfigTypeRole        = "Role"
+	ConfigTypeJxStore     = "JxStore"
+	ConfigTypeCookie      = "Cookie"
+	ConfigTypeMemberCard  = "MemberCard"
 )
 
 const (
@@ -18,16 +18,21 @@ const (
 	ConfigSysMtwmSkuBoxFee    = "MtwmSkuBoxFee"    // 美团外卖单商品打包费
 )
 
+const (
+	MemberCardTypeMonth = 1 //1个月的会员
+	MemberCardTypeYear  = 2 //1年的会员
+)
+
 var (
 	ConfigTypeName = map[string]string{
-		ConfigTypeSys:          "系统",
-		ConfigTypePricePack:    "价格包",
-		ConfigTypeFreightPack:  "免运包",
-		ConfigTypeBank:         "银行",
-		ConfigTypeRole:         "角色",
-		ConfigTypeJxStore:      "京西商城",
-		ConfigTypeCookie:       "Cookie",
-		ConfigTypeDiscountCard: "会员折扣卡",
+		ConfigTypeSys:         "系统",
+		ConfigTypePricePack:   "价格包",
+		ConfigTypeFreightPack: "免运包",
+		ConfigTypeBank:        "银行",
+		ConfigTypeRole:        "角色",
+		ConfigTypeJxStore:     "京西商城",
+		ConfigTypeCookie:      "Cookie",
+		ConfigTypeMemberCard:  "会员卡",
 	}
 )
 

business/model/order.go

@@ -33,8 +33,7 @@ const (
 	OrderTypeSupplyGoods = 2  //进货订单
 	OrderTypeDefendPrice = 3  //守价订单
 
-	OrderTypeAccount = 1 //任务保证金
-	OrderTypeMember  = 2 //开通会员
+	OrderTypeAccount = 1 //账户余额
 )
 
 var (

business/model/user.go

@@ -18,7 +18,7 @@ const (
 	UserTypeBoss        = 8
 	UserTypeNonConsumer = ^1
 
-	MemberTypeDiscountCard = 1 //会员折扣卡
+	MemberTypeNormal = 1 //普通会员
 )
 
 var (
@@ -30,10 +30,9 @@ var (
 	}
 )
 
-type DiscountCard struct {
-	ID             int `orm:"column(id)" json:"id"`
-	PicePercentage int `json:"pricePercentage"`
-	Price          int `json:"price"`
+type MemberCard struct {
+	ID    int `orm:"column(id)" json:"id"`
+	Price int `json:"price"`
 }
 
 type User struct {
@@ -206,7 +205,6 @@ func (*UserOrderSms) TableUnique() [][]string {
 type UserMember struct {
 	ModelIDCULD
 
-	OrderID      string    `orm:"column(order_id);size(48)" json:"orderID"`   //和order_pay关联的，不知道有没用，先加上把
 	UserID       string    `orm:"size(48);column(user_id)" json:"userID"`     //内部唯一标识
 	MemberType   int       `json:"memberType"`                                //会员类型， 1为折扣卡
 	MemberTypeID int       `orm:"column(member_type_id)" json:"memberTypeID"` //会员类型ID，折扣卡的话代表几档