From 74c5171972a86c263f37fa4ea64b86dd564faa7e 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, 24 Mar 2021 13:48:16 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go              | 2 ++
 business/jxstore/vendor/jds/jds.go       | 1 +
 business/jxstore/vendor/mt/mt.go         | 1 +
 business/jxstore/vendor/partner.go       | 1 +
 business/jxstore/vendor/pdd/pdd.go       | 1 +
 business/jxstore/vendor/taobao/taobao.go | 1 +
 business/model/job.go                    | 3 ++-
 conf/app.conf                            | 3 ++-
 8 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 business/jxstore/vendor/jds/jds.go
 create mode 100644 business/jxstore/vendor/mt/mt.go
 create mode 100644 business/jxstore/vendor/partner.go
 create mode 100644 business/jxstore/vendor/pdd/pdd.go
 create mode 100644 business/jxstore/vendor/taobao/taobao.go

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index c9dbe92e1..9df4b6572 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -394,6 +394,8 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
 			jobOrder.DropShippingDistrictCode = delivery.DistrictCode
 		}
 		// jobOrder.Status = model.JobOrderStatusWaitAudit
+	} else if job.JobCategoryID == model.JobCategoryIDUnion {
+		jobOrder.Status = model.JobOrderStatusSpec
 	}
 	dao.Begin(db)
 	defer func() {
diff --git a/business/jxstore/vendor/jds/jds.go b/business/jxstore/vendor/jds/jds.go
new file mode 100644
index 000000000..2d29a4c1e
--- /dev/null
+++ b/business/jxstore/vendor/jds/jds.go
@@ -0,0 +1 @@
+package jds
diff --git a/business/jxstore/vendor/mt/mt.go b/business/jxstore/vendor/mt/mt.go
new file mode 100644
index 000000000..73ffade96
--- /dev/null
+++ b/business/jxstore/vendor/mt/mt.go
@@ -0,0 +1 @@
+package mt
diff --git a/business/jxstore/vendor/partner.go b/business/jxstore/vendor/partner.go
new file mode 100644
index 000000000..0a00424a4
--- /dev/null
+++ b/business/jxstore/vendor/partner.go
@@ -0,0 +1 @@
+package vendor
diff --git a/business/jxstore/vendor/pdd/pdd.go b/business/jxstore/vendor/pdd/pdd.go
new file mode 100644
index 000000000..695f07a9c
--- /dev/null
+++ b/business/jxstore/vendor/pdd/pdd.go
@@ -0,0 +1 @@
+package pdd
diff --git a/business/jxstore/vendor/taobao/taobao.go b/business/jxstore/vendor/taobao/taobao.go
new file mode 100644
index 000000000..2f953b748
--- /dev/null
+++ b/business/jxstore/vendor/taobao/taobao.go
@@ -0,0 +1 @@
+package taobao
diff --git a/business/model/job.go b/business/model/job.go
index 878ee420f..c33c4a40d 100644
--- a/business/model/job.go
+++ b/business/model/job.go
@@ -17,7 +17,7 @@ const (
 	JobLimitCountTypePWO     = 3 //每人每周一次
 	JobLimitCountTypeNoLimit = 4 //不限制
 
-	JobOrderStatusSpec        = 1
+	JobOrderStatusSpec        = 1 //特殊状态（联盟任务）
 	JobOrderStatusAccept      = 5
 	JobOrderStatusWaitAudit   = 10
 	JobOrderStatusAuditPass   = 15
@@ -42,6 +42,7 @@ const (
 	JobCategoryIDwmtg         = 3 //任务类型外卖推广
 	JobCategoryIDOther        = 4 //其他任务类型
 	JobCategoryIDDropShipping = 5 //一件代发
+	JobCategoryIDUnion        = 6 //联盟任务
 
 	JobSpanTop       = 1 //置顶
 	JobSpanRecommend = 2 //推荐
diff --git a/conf/app.conf b/conf/app.conf
index c4b828ecd..668f57b12 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -294,4 +294,5 @@ ejyBeforeKey = "htvse3XEDhBnCTNo"
 ejyAfterKey = "QM5RnGl6kNh3ENLT"
 
 txCloudSecretID = "AKIDFNmm1U7vhITlVItry0ng5Q268lGjDZyQUR6"
-txCloudSecretKey = "25p3aynr97hOMJEfpvr0LoXD0gI62l7wcHA7nsM6"
\ No newline at end of file
+txCloudSecretKey = "25p3aynr97hOMJEfpvr0LoXD0gI62l7wcHA7nsM6"
+