From 4fa27150dc77216b92a5270b600aa500b87f727e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 28 Oct 2020 13:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E4=BC=9A=E5=91=98=E5=92=8C?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E7=89=A9=E6=B5=81=E8=87=AA=E5=8A=A8=E5=85=85?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/job.go   | 25 +++++++++++++++++++++----
 business/model/job.go         |  3 ++-
 controllers/job_controller.go |  4 ++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 71264e2fa..3d9cb667e 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -532,25 +532,42 @@ func ImprotMtMembers(ctx *jxcontext.Context, mtMembers []*model.MtMember) (err e
 	return err
 }
 
-func RechargeMtMembers(ctx *jxcontext.Context, phone int) (err error) {
+func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err error) {
 	var (
 		db = dao.GetDB()
 	)
-	mtMember, err := dao.GetMtMember(db)
+	errCode, err = AcceptJob(ctx, model.JobIDMtMembers)
+	if errCode != "" {
+		return errCode, err
+	}
 	if err != nil {
-		return err
+		return errCode, err
+	}
+	mtMember, err := dao.GetMtMember(db)
+	if mtMember == nil {
+		return errCode, fmt.Errorf("美团会员数量不足，请等待补充！")
+	}
+	if err != nil {
+		return errCode, err
 	}
 	if err = api.MtMemberAPI.RechargeExchange(phone, mtMember.ShortLink); err == nil {
 		mtMember.DeletedAt = time.Now()
 		dao.UpdateEntity(db, mtMember, "DeletedAt")
 	}
-	return err
+	return errCode, err
 }
 
 func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCode string, err error) {
 	var (
 		db = dao.GetDB()
 	)
+	errCode, err = AcceptJob(ctx, model.JobIDJdDelivery)
+	if errCode != "" {
+		return errCode, err
+	}
+	if err != nil {
+		return errCode, err
+	}
 	sendDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliverySendID), nil, 0, 0)
 	receiveDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliveryReceiveID), nil, 0, 0)
 	userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
diff --git a/business/model/job.go b/business/model/job.go
index 5e9adfda9..dc9e74def 100644
--- a/business/model/job.go
+++ b/business/model/job.go
@@ -21,7 +21,8 @@ const (
 	JobOrderStatusFinish      = 110
 	JobOrderStatusCancel      = 115
 
-	JobIDMtMembers = 1
+	JobIDMtMembers  = 1 //美团会员任务ID
+	JobIDJdDelivery = 2 //京东物流任务ID
 
 	JobTimerTypeAccept = 1 //接受任务
 	JobTimerTypeSubmit = 2 //交任务
diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index bdc9e5efa..af55c3c3a 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -213,8 +213,8 @@ func (c *JobController) ImprotMtMembers() {
 // @router /RechargeMtMembers [post]
 func (c *JobController) RechargeMtMembers() {
 	c.callRechargeMtMembers(func(params *tJobRechargeMtMembersParams) (retVal interface{}, errCode string, err error) {
-		err = cms.RechargeMtMembers(params.Ctx, params.Phone)
-		return retVal, "", err
+		errCode, err = cms.RechargeMtMembers(params.Ctx, params.Phone)
+		return retVal, errCode, err
 	})
 }