From 1cd87fb87c8ca38bcac24e138868337c083d3c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 20 Apr 2021 11:27:08 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go | 25 ++++++++++++++-----------
 business/model/job.go       |  2 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 9586b7a67..4b06663cd 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -95,6 +95,10 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
 		job.LimitCountType = model.JobLimitCountTypeNoLimit
 		job.JobLimitAt = 0
 		job.AuditLimitAt = 0
+	case model.JobCategoryIDUnion:
+		if job.UnionImg == "" || job.UnionQrcodePosition == "" {
+			return errCode, fmt.Errorf("联盟任务发布请输入分享的背景图和二维码图方位！")
+		}
 	default:
 		return errCode, fmt.Errorf("暂不支持的任务类型！ %v", job.JobCategoryID)
 	}
@@ -108,8 +112,12 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
 	default:
 		return errCode, fmt.Errorf("暂不支持的返现类型！ %v", job.CashbackType)
 	}
+	if job.Count <= 0 {
+		return errCode, fmt.Errorf("任务数量不能为0！")
+	}
+	job.SurplusCount = job.Count
 	if job.UserID == "" {
-		return errCode, fmt.Errorf("参数有误！")
+		return errCode, fmt.Errorf("任务发起人不能为空！")
 	}
 	if ctx.GetUserID() != job.UserID {
 		return errCode, fmt.Errorf("用户信息已过期，请重新登录！")
@@ -127,6 +135,7 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
 	if err = auth2.CheckWeixinminiAuthBind(ctx.GetUserID()); err != nil {
 		return "", err
 	}
+	fmt.Println("1111111111111111111111111111111111", ctx.GetLoginType())
 	//发布任务要扣除任务总额的保证金，不够扣就要进行充值
 	userBill, err := dao.GetUserBill(db, job.UserID, "")
 	if userBill == nil {
@@ -136,13 +145,7 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
 	if userBill.AccountBalance < job.TotalPrice {
 		return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足！")
 	}
-	if job.Count <= 0 {
-		return errCode, fmt.Errorf("任务数量不能为0！")
-	}
-	job.SurplusCount = job.Count
-	if job.UserID == "" {
-		return errCode, fmt.Errorf("任务发起人不能为空！")
-	}
+
 	jobs, err := dao.GetJobsNoPage(db, []string{job.UserID}, nil, nil, nil, DayTimeBegin, DayTimeEnd, 0, false)
 	if len(jobs) > 0 {
 		members, err := dao.GetUserMember(db, job.UserID, model.MemberTypeNormal)
@@ -169,19 +172,19 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
 			panic(r)
 		}
 	}()
-	if err = dao.CreateEntity(db, job); err != nil {
+	if err = dao.CreateEntityTx(txDB, job); err != nil {
 		dao.Rollback(db, txDB)
 		return
 	}
 	for _, v := range jobExt.JobSteps {
 		dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
 		v.JobID = job.ID
-		err = dao.CreateEntity(db, v)
+		err = dao.CreateEntityTx(txDB, v)
 	}
 	for _, v := range jobExt.JobImgs {
 		dao.WrapAddIDCULEntity(v, ctx.GetUserName())
 		v.JobID = job.ID
-		err = dao.CreateEntity(db, v)
+		err = dao.CreateEntityTx(txDB, v)
 	}
 	if err != nil {
 		dao.Rollback(db, txDB)
diff --git a/business/model/job.go b/business/model/job.go
index c33c4a40d..2594a6d3c 100644
--- a/business/model/job.go
+++ b/business/model/job.go
@@ -123,6 +123,8 @@ type Job struct {
 	SkuURL               string     `orm:"column(sku_url)" json:"skuURL"`                //商品优惠券链接
 	Type                 int        `json:"type"`                                        //任务类型，0为普通任务，1为特殊任务
 	BrowseCount          int        `json:"browseCount"`                                 //任务浏览量，点一下加一下
+	UnionImg             string     `json:"unionImg"`                                    //联盟任务分享链接的背景图
+	UnionQrcodePosition  string     `json:"unionQrcodePosition"`                         //联盟任务分享链接的二维码图的方位
 	// JobSteps             []*JobStep `orm:"-" json:"jobSteps"`
 	// JobImgs              []*JobImg  `orm:"-" json:"jobImgs"`
 }