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

auditmilit at

Browse Source
This commit is contained in:
苏尹岚
2020-11-05 15:17:13 +08:00
parent bb373ef391
commit 2b7720be38
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,14 +576,6 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err e
var ( var (
db = dao.GetDB() db = dao.GetDB()
) )
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeMtMember}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}
if err != nil {
return errCode, err
}
mtMember, err := dao.GetMtMember(db) mtMember, err := dao.GetMtMember(db)
if mtMember == nil { if mtMember == nil {
return errCode, fmt.Errorf("美团会员数量不足，请等待补充！") return errCode, fmt.Errorf("美团会员数量不足，请等待补充！")
@@ -594,6 +586,15 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err e
if err = api.MtMemberAPI.RechargeExchange(phone, mtMember.ShortLink); err == nil { if err = api.MtMemberAPI.RechargeExchange(phone, mtMember.ShortLink); err == nil {
mtMember.DeletedAt = time.Now() mtMember.DeletedAt = time.Now()
dao.UpdateEntity(db, mtMember, "DeletedAt") dao.UpdateEntity(db, mtMember, "DeletedAt")
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeMtMember}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}
if err != nil {
return errCode, err
}
} }
return errCode, err return errCode, err
} }
@@ -602,14 +603,6 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
var ( var (
db = dao.GetDB() db = dao.GetDB()
) )
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeJdDelivery}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}
if err != nil {
return errCode, err
}
if dOrder.Weight == 0 { if dOrder.Weight == 0 {
return errCode, fmt.Errorf("重量必须填写！") return errCode, fmt.Errorf("重量必须填写！")
} }
@@ -676,12 +669,22 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
}() }()
if err = dao.CreateEntity(db, dOrder); err != nil { if err = dao.CreateEntity(db, dOrder); err != nil {
dao.Rollback(db) dao.Rollback(db)
return
} }
//账户支出明细 //账户支出明细
if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeSpJob, dOrder.PayPrice); err != nil { if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeSpJob, dOrder.PayPrice); err != nil {
dao.Rollback(db) dao.Rollback(db)
return
} }
dao.Commit(db) dao.Commit(db)
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeJdDelivery}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}
if err != nil {
return errCode, err
}
return errCode, err return errCode, err
} }