From 5c678d11172ab73b67e81cdbca7afad7af4095c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 17 Dec 2020 14:15:39 +0800 Subject: [PATCH] a --- business/jxstore/cms/job.go | 7 +++++-- business/model/dao/dao_job.go | 9 --------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 46ac12567..d23092df0 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -714,8 +714,10 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err e }() nums, err := dao.GetMtMembers(db) if nums < 10 { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "F4836F9238F611EB9101525400C36BDA", "美团会员券", "美团会员券仅剩"+utils.Int2Str(nums)+"张了!") - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "EFA9876238FC11EB9101525400C36BDA", "美团会员券", "美团会员券仅剩"+utils.Int2Str(nums)+"张了!") + utils.CallFuncAsync(func() { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "F4836F9238F611EB9101525400C36BDA", "美团会员券", "美团会员券仅剩"+utils.Int2Str(nums)+"张了!") + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "EFA9876238FC11EB9101525400C36BDA", "美团会员券", "美团会员券仅剩"+utils.Int2Str(nums)+"张了!") + }) } if err != nil { dao.Rollback(db) @@ -723,6 +725,7 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err e } //验证微信绑定 if err = auth2.CheckWeixinminiAuthBind(userID); err != nil { + dao.Rollback(db) return "", err } //特殊任务,如美团会员,是直接要支付 diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index b5fb2036f..cf473a33a 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -140,19 +140,10 @@ func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types v.JobSteps = jobSteps } } - // var ( - // distance float64 - // ) if jobImgs, err := GetJobImgs(db, v.ID); err == nil && len(jobImgs) > 0 { v.JobImgs = jobImgs v.IndexImg = jobImgs[0].Img } - // if v.Lng != 0 && v.Lat != 0 { - // distance = jxutils.EarthDistance(lng, lat, jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat)) - // } else { - // distance = 0 - // } - // v.Distance = distance } pagedInfo.Data = jobs }