liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-05-13 13:47:38 +08:00
parent 9293116e03
commit b43d885436
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/user2.go
View File

@@ -806,7 +806,7 @@ func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *dao.GetSelfInfoResu
tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken()) tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
if err == nil { if err == nil {
if getSelfInfoResult, err = dao.GetUserByIDWithMembers(dao.GetDB(), "user_id", tokenInfo.GetID()); err == nil { if getSelfInfoResult, err = dao.GetUserByIDWithMembers(dao.GetDB(), "user_id", tokenInfo.GetID()); err == nil {
if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.UserID, "", 0, model.YES); err3 == nil { if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.UserID, "", "", model.VendorIDJX, 0, model.YES); err3 == nil {
getSelfInfoResult.UserMembers = userMembers getSelfInfoResult.UserMembers = userMembers
} else { } else {
err = err3 err = err3
@@ -1159,7 +1159,7 @@ func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
) )
userMembers, err := dao.GetUserMember(db, "", "", model.MemberTypeDiscountCard, -1) userMembers, err := dao.GetUserMember(db, "", "", "", -1, model.MemberTypeDiscountCard, -1)
for _, userMember := range userMembers { for _, userMember := range userMembers {
if time.Now().Sub(userMember.EndAt) > 0 { if time.Now().Sub(userMember.EndAt) > 0 {
userMember.DeletedAt = time.Now() userMember.DeletedAt = time.Now()

10
business/model/dao/dao_user.go
View File

@@ -283,7 +283,7 @@ func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOr
return userOrderSms, err return userOrderSms, err
} }
func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay int) (userMembers []*model.UserMember, err error) { func GetUserMember(db *DaoDB, userID, vendorOrderID, mobile string, vendorID, memberType, isPay int) (userMembers []*model.UserMember, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM user_member FROM user_member
@@ -298,6 +298,10 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay in
sql += " AND vendor_order_id = ?" sql += " AND vendor_order_id = ?"
sqlParams = append(sqlParams, vendorOrderID) sqlParams = append(sqlParams, vendorOrderID)
} }
if mobile != "" {
sql += " AND mobile = ?"
sqlParams = append(sqlParams, mobile)
}
if memberType != 0 { if memberType != 0 {
sql += " AND member_type = ?" sql += " AND member_type = ?"
sqlParams = append(sqlParams, memberType) sqlParams = append(sqlParams, memberType)
@@ -306,6 +310,10 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay in
sql += " AND is_pay = ?" sql += " AND is_pay = ?"
sqlParams = append(sqlParams, isPay) sqlParams = append(sqlParams, isPay)
} }
if vendorID != -1 {
sql += " AND vendor_id = ?"
sqlParams = append(sqlParams, vendorID)
}
err = GetRows(db, &userMembers, sql, sqlParams) err = GetRows(db, &userMembers, sql, sqlParams)
return userMembers, err return userMembers, err
} }

5
business/partner/purchase/jx/localjx/order.go
View File

@@ -372,13 +372,16 @@ func Pay4User(ctx *jxcontext.Context, thingID int, vendorOrderID string, payType
dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
err = dao.CreateEntity(dao.GetDB(), orderPay) err = dao.CreateEntity(dao.GetDB(), orderPay)
} }
mobile, userID := ctx.GetMobileAndUserID()
userMember := &model.UserMember{ userMember := &model.UserMember{
VendorOrderID: vendorOrderID, VendorOrderID: vendorOrderID,
UserID: ctx.GetUserID(), UserID: userID,
MemberType: model.MemberTypeDiscountCard, MemberType: model.MemberTypeDiscountCard,
EndAt: utils.Str2Time(time.Now().AddDate(0, 1, 0).AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59"), EndAt: utils.Str2Time(time.Now().AddDate(0, 1, 0).AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59"),
MemberTypeID: thingID, MemberTypeID: thingID,
IsPay: model.NO, IsPay: model.NO,
VendorID: model.VendorIDJX,
Mobile: mobile,
} }
dao.WrapAddIDCULDEntity(userMember, ctx.GetUserName()) dao.WrapAddIDCULDEntity(userMember, ctx.GetUserName())
if flag == 0 { if flag == 0 {