minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_hm_pay_original' into dev_erp_retail_original

Browse Source
This commit is contained in:
li 2023-01-11 14:41:14 +08:00
commit e11d1350f4
2 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
controller/game_card.go
View File

@ -1297,6 +1297,7 @@ func HmPushWXPayNotice(c *gin.Context) {
if !user.OpenMemberTime.IsZero() {
spendType = 3
}
isShopAssistantCode := false
expireTime := newTime.AddDate(1, 0, 0)
if user.MemberExpire.After(newTime) {
expireTime = user.MemberExpire.AddDate(1, 0, 0)
@ -1346,6 +1347,7 @@ func HmPushWXPayNotice(c *gin.Context) {
logger.Error("user coupon err:", err)
} else {
if userCoupon.Approach == 1 {
isShopAssistantCode = true
err = model.StorePromotion(userCoupon.PromotionalSales, userCoupon.Uid, nil, &user)
if err != nil {
logger.Error("store promotion err:", err)
@ -1392,6 +1394,9 @@ func HmPushWXPayNotice(c *gin.Context) {
//if user.MemberLevel != 2 {
// qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
//}
if isShopAssistantCode {
qs = qs.SetInviteForm(1)
}
qs = qs.SetMemberOpenTime(newTime).SetMemberLevel(record.MemberLevel)
_, err = qs.SetMemberType(2).SetMemberStatus(2).
SetAction(2).SetSpendType(spendType).UpdateNum()
@ -1440,11 +1445,13 @@ func HmPushWXPayNotice(c *gin.Context) {
UserInviteRecordId: inviteRecordNew.ID,
FirstInvite: 0,
}
if isShopAssistantCode {
userInviteNew.InviteForm = 1
}
err = model.DB.Create(userInviteNew).Error
if err != nil {
logger.Error("create invite record err:", err)
}
}
if invite.FromUid != 0 {

90
model/autogenerated_user.go
View File

@ -10915,6 +10915,74 @@ func (qs UserOpenMemberRecordQuerySet) All(ret *[]UserOpenMemberRecord) error {
return qs.db.Find(ret).Error
}
// AttachEq is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachEq(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach = ?", attach))
}
// AttachGt is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachGt(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach > ?", attach))
}
// AttachGte is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachGte(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach >= ?", attach))
}
// AttachIn is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachIn(attach ...string) UserOpenMemberRecordQuerySet {
if len(attach) == 0 {
qs.db.AddError(errors.New("must at least pass one attach in AttachIn"))
return qs.w(qs.db)
}
return qs.w(qs.db.Where("attach IN (?)", attach))
}
// AttachLike is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachLike(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach LIKE ?", attach))
}
// AttachLt is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachLt(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach < ?", attach))
}
// AttachLte is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachLte(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach <= ?", attach))
}
// AttachNe is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachNe(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach != ?", attach))
}
// AttachNotIn is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachNotIn(attach ...string) UserOpenMemberRecordQuerySet {
if len(attach) == 0 {
qs.db.AddError(errors.New("must at least pass one attach in AttachNotIn"))
return qs.w(qs.db)
}
return qs.w(qs.db.Where("attach NOT IN (?)", attach))
}
// AttachNotlike is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) AttachNotlike(attach string) UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Where("attach NOT LIKE ?", attach))
}
// Count is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) Count() (int, error) {
@ -11385,6 +11453,12 @@ func (qs UserOpenMemberRecordQuerySet) OpenNoNotlike(openNo string) UserOpenMemb
return qs.w(qs.db.Where("open_no NOT LIKE ?", openNo))
}
// OrderAscByAttach is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) OrderAscByAttach() UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Order("attach ASC"))
}
// OrderAscByCreatedAt is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) OrderAscByCreatedAt() UserOpenMemberRecordQuerySet {
@ -11469,6 +11543,12 @@ func (qs UserOpenMemberRecordQuerySet) OrderAscByUserCouponId() UserOpenMemberRe
return qs.w(qs.db.Order("user_coupon_id ASC"))
}
// OrderDescByAttach is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) OrderDescByAttach() UserOpenMemberRecordQuerySet {
return qs.w(qs.db.Order("attach DESC"))
}
// OrderDescByCreatedAt is an autogenerated method
// nolint: dupl
func (qs UserOpenMemberRecordQuerySet) OrderDescByCreatedAt() UserOpenMemberRecordQuerySet {
@ -11869,6 +11949,13 @@ func (qs UserOpenMemberRecordQuerySet) UserCouponIdNotIn(userCouponId ...uint32)
return qs.w(qs.db.Where("user_coupon_id NOT IN (?)", userCouponId))
}
// SetAttach is an autogenerated method
// nolint: dupl
func (u UserOpenMemberRecordUpdater) SetAttach(attach string) UserOpenMemberRecordUpdater {
u.fields[string(UserOpenMemberRecordDBSchema.Attach)] = attach
return u
}
// SetCreatedAt is an autogenerated method
// nolint: dupl
func (u UserOpenMemberRecordUpdater) SetCreatedAt(createdAt time.Time) UserOpenMemberRecordUpdater {
@ -12009,6 +12096,7 @@ var UserOpenMemberRecordDBSchema = struct {
State UserOpenMemberRecordDBSchemaField
DeductionDays UserOpenMemberRecordDBSchemaField
DeductionFee UserOpenMemberRecordDBSchemaField
Attach UserOpenMemberRecordDBSchemaField
}{
ID: UserOpenMemberRecordDBSchemaField("id"),
@ -12025,6 +12113,7 @@ var UserOpenMemberRecordDBSchema = struct {
State: UserOpenMemberRecordDBSchemaField("state"),
DeductionDays: UserOpenMemberRecordDBSchemaField("deduction_days"),
DeductionFee: UserOpenMemberRecordDBSchemaField("deduction_fee"),
Attach: UserOpenMemberRecordDBSchemaField("attach"),
}
// Update updates UserOpenMemberRecord fields by primary key
@ -12045,6 +12134,7 @@ func (o *UserOpenMemberRecord) Update(db *gorm.DB, fields ...UserOpenMemberRecor
"state": o.State,
"deduction_days": o.DeductionDays,
"deduction_fee": o.DeductionFee,
"attach": o.Attach,
}
u := map[string]interface{}{}
for _, f := range fields {