From 4b881304bd40f6bf2b8a7abe706182fd08974dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 7 Sep 2020 08:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/dao_user.go | 18 ++++++++++++++++++ business/model/user.go | 2 ++ business/partner/purchase/jx/localjx/order.go | 14 +++++++++++--- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go index 4206a2979..3243b61d5 100644 --- a/business/model/dao/dao_user.go +++ b/business/model/dao/dao_user.go @@ -258,3 +258,21 @@ func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOr err = GetRow(db, &userOrderSms, sql, sqlParams) return userOrderSms, err } + +func GetUserMember(db *DaoDB, userID, vendorOrderID string) (userMembers []*model.UserMember, err error) { + sql := ` + SELECT * + FROM user_member + WHERE deleted_at = ? + ` + sqlParams := []interface{}{utils.DefaultTimeValue} + if userID != "" { + sql += " AND user_id = ?" + sqlParams = append(sqlParams, userID) + } + if vendorOrderID != "" { + sql += " AND vendor_order_id = ?" + sqlParams = append(sqlParams, vendorOrderID) + } + return userMembers, err +} diff --git a/business/model/user.go b/business/model/user.go index 0ea9091d1..3d749df82 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -17,6 +17,8 @@ const ( UserTypeOperator = 4 UserTypeBoss = 8 UserTypeNonConsumer = ^1 + + MemberTypeDiscountCard = 1 //会员折扣卡 ) var ( diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 40d71394a..6adddd84e 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -372,10 +372,13 @@ func Pay4User(ctx *jxcontext.Context, thingID, payType int, vendorPayType string userMember := &model.UserMember{ VendorOrderID: vendorOrderID, UserID: ctx.GetUserID(), - MemberType: , + MemberType: model.MemberTypeDiscountCard, + EndAt: utils.Str2Time(time.Now().AddDate(0, 1, 0).AddDate(0, 0, -1).Format("2006-01-02") + "23:59:59"), + MemberTypeID: thingID, + IsPay: model.NO, } dao.WrapAddIDCULDEntity(userMember, ctx.GetUserName()) - + dao.CreateEntity(db, userMember) } default: err = fmt.Errorf("支付方式:%d当前不支持", payType) @@ -491,7 +494,12 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { } else { switch orderPay.PayType { case model.PayTypeTL_DiscountCard: - + userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID) + if len(userMembers) > 0 { + userMembers[0].IsPay = model.YES + dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay") + err = nil + } default: priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) if len(priceDefendOrders) > 0 {