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

accountbalacne

Browse Source
This commit is contained in:
苏尹岚
2020-10-20 10:34:35 +08:00
parent adf90f21e0
commit ac20216437
9 changed files with 33 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxstore/cms/job.go
View File

@@ -49,10 +49,7 @@ func getWeekTime() (weekTimeBegin, weekTimeEnd time.Time) {
func PublishJob(ctx *jxcontext.Context, job *model.Job) (err error) {
var (
db = dao.GetDB()
timeNow = utils.Time2Date(time.Now())
fromTime = utils.Time2Str(timeNow) + "00:00:00"
toTime = utils.Time2Str(timeNow) + "23:59:59"
db = dao.GetDB()
)
//需根据任务类型做一些参数判断，比如门店商品链接，地址
// switch job.JobCategoryID {
@@ -78,7 +75,7 @@ func PublishJob(ctx *jxcontext.Context, job *model.Job) (err error) {
if job.UserID == "" {
return fmt.Errorf("任务发起人不能为空！")
}
jobs, err := dao.GetJobsNoPage(db, []string{job.UserID}, nil, nil, utils.Str2Time(fromTime), utils.Str2Time(toTime), false)
jobs, err := dao.GetJobsNoPage(db, []string{job.UserID}, nil, nil, DayTimeBegin, DayTimeEnd, false)
if len(jobs) > 0 {
members, err := dao.GetUserMember(db, job.UserID, model.MemberTypeNormal)
if err != nil {

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

@@ -540,25 +540,6 @@ func DeleteUserInfo(ctx *jxcontext.Context, userID string) (err error) {
return err
}
func CreateUserAgreement(ctx *jxcontext.Context, userAgrs []*model.UserAgreement) (err error) {
var (
db = dao.GetDB()
)
for _, v := range userAgrs {
dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
}
err = dao.CreateMultiEntities(db, userAgrs)
return err
}
func GetUserAgreement(ctx *jxcontext.Context, name, idNumber, bankNumber, mobile string) (userAgrs []*model.UserAgreement, err error) {
var (
db = dao.GetDB()
)
userAgrs, err = dao.GetUserAgreement(db, name, idNumber, bankNumber, mobile)
return userAgrs, err
}
func CleanUserOrderSMSMark(ctx *jxcontext.Context) (err error) {
var (
db = dao.GetDB()
@@ -588,7 +569,7 @@ func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
return err
}
func InvestMember(ctx *jxcontext.Context, memberID int) (err error) {
func InvestMember(ctx *jxcontext.Context, memberID int) (errCode string, err error) {
var (
db = dao.GetDB()
memberCards []*model.MemberCard
@@ -598,18 +579,21 @@ func InvestMember(ctx *jxcontext.Context, memberID int) (err error) {
configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "")
userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
if len(configList) <= 0 {
return fmt.Errorf("未找到会员卡配置！")
return "", fmt.Errorf("未找到会员卡配置！")
}
config := configList[0]
err = jxutils.Strings2Objs(config.Value, &memberCards)
if err != nil {
return err
return "", err
}
for _, v := range memberCards {
if v.ID == memberID {
memberCard = v
}
}
if userBill.AccountBalance < memberCard.Price {
return model.ErrCodeAccountBalanceNotEnough, err
}
dao.Begin(db)
defer func() {
if r := recover(); r != nil {
@@ -654,5 +638,5 @@ func InvestMember(ctx *jxcontext.Context, memberID int) (err error) {
dao.Rollback(db)
}
dao.Commit(db)
return err
return errCode, err
}