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 14:58:53 +08:00
parent b43d885436
commit 1652f1c5b1
3 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,7 +417,7 @@ func Pay4User(ctx *jxcontext.Context, thingID int, vendorOrderID string, payType
//1 续费
//-1 不能购买
func checkMember(db *dao.DaoDB, userID string, discountCard *model.DiscountCard) (flag int, userMember *model.UserMember, err error) {
userMembers, err := dao.GetUserMember(db, userID, "", model.MemberTypeDiscountCard, model.YES)
userMembers, err := dao.GetUserMember(db, userID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES)
if len(userMembers) > 0 {
userMember = userMembers[0]
if userMember.ID < discountCard.ID {
@@ -555,7 +555,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
} else {
switch orderPay.PayType {
case model.PayTypeTL_DiscountCard:
userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID, model.MemberTypeDiscountCard, model.NO)
userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID, "", model.VendorIDJX, model.MemberTypeDiscountCard, model.NO)
if len(userMembers) > 0 {
userMembers[0].IsPay = model.YES
dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay")
@@ -1015,7 +1015,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
}
}
// 2.判断用户是否是会员
userMembers, _ := dao.GetUserMember(db, tuserID, "", model.MemberTypeDiscountCard, model.YES)
userMembers, _ := dao.GetUserMember(db, tuserID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES)
if len(userMembers) > 0 {
if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil {
jxutils.Strings2Objs(configList[0].Value, &dicountCards)

2
business/partner/purchase/jx/localjx/user.go
View File

@@ -67,7 +67,7 @@ func GetJxShopUsers(ctx *jxcontext.Context, keyword, fromTime, toTime string, ve
// Data: requestList,
}
for _, v := range requestList {
userMembers, _ := dao.GetUserMember(db, v.UserID, "", model.MemberTypeDiscountCard, model.YES)
userMembers, _ := dao.GetUserMember(db, v.UserID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES)
v.UserMembers = userMembers
}
pagedInfo.Data = requestList