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

活动

Browse Source
This commit is contained in:
苏尹岚
2020-09-18 11:19:34 +08:00
parent b03dd51b8c
commit 6389f4904b
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,7 +787,7 @@ func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *GetSelfInfoResult,
tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken()) tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
if err == nil { if err == nil {
if user, err2 := dao.GetUserByID(dao.GetDB(), "user_id", tokenInfo.GetID()); err2 == nil { if user, err2 := dao.GetUserByID(dao.GetDB(), "user_id", tokenInfo.GetID()); err2 == nil {
if userMembers, err3 := dao.GetUserMember(dao.GetDB(), user.UserID, ""); err3 == nil { if userMembers, err3 := dao.GetUserMember(dao.GetDB(), user.UserID, "", 0); err3 == nil {
getSelfInfoResult = &GetSelfInfoResult{ getSelfInfoResult = &GetSelfInfoResult{
User: user, User: user,
UserMembers: userMembers, UserMembers: userMembers,

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

@@ -259,7 +259,7 @@ func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOr
return userOrderSms, err return userOrderSms, err
} }
func GetUserMember(db *DaoDB, userID, vendorOrderID string) (userMembers []*model.UserMember, err error) { func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType int) (userMembers []*model.UserMember, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM user_member FROM user_member
@@ -274,5 +274,9 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string) (userMembers []*mode
sql += " AND vendor_order_id = ?" sql += " AND vendor_order_id = ?"
sqlParams = append(sqlParams, vendorOrderID) sqlParams = append(sqlParams, vendorOrderID)
} }
if memberType != 0 {
sql += " AND member_type = ?"
sqlParams = append(sqlParams, memberType)
}
return userMembers, err return userMembers, err
} }

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

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