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

aa

Browse Source
This commit is contained in:
suyl
2021-04-22 16:41:21 +08:00
parent b2c03d6956
commit 910e83ea4b
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,14 +332,18 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
job.ID = jobID
err = dao.GetEntity(db, job)
if job.UserID == "" || job.Status == model.JobStatusFailed || job.Status == model.JobStatusOverdue || job.FinishedAt.Sub(time.Now()) <= 0 || job.SurplusCount <= 0 || job.LimitCountType <= 0 {
return 0, errCode, fmt.Errorf("未找到该任务或该任务状态不正常，无法接单！")
if job.JobCategoryID == model.JobCategoryIDUnion {
return 0, errCode, fmt.Errorf("活动已结束，请等待下批次活动！")
} else {
return 0, errCode, fmt.Errorf("未找到该任务或该任务状态不正常，无法接单！")
}
}
// num, err = checkJobOrders(db, 0, "<= "+utils.Int2Str(model.JobOrderStatusAccept), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)
// if num >= AcceptMaxCount {
// return 0, errCode, fmt.Errorf("每人最多接取" + utils.Int2Str(AcceptMaxCount) + "个任务，请核实！")
// }
//非快递任务
if jobID != 2 {
if jobID != 2 && job.JobCategoryID != model.JobCategoryIDUnion {
num, err = checkJobOrders(db, jobID, "<= "+utils.Int2Str(model.JobOrderStatusWaitAudit), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)
if num > 0 {
return 0, errCode, fmt.Errorf("您还有此任务未完成，请完成后再接取！")
@@ -1961,26 +1965,24 @@ func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (actList []*
return actList, err
}
func ShareUnionLink(ctx *jxcontext.Context, jobID, linkType int) (link string, err error) {
func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType int) (link string, err error) {
var (
db = dao.GetDB()
job = &model.Job{}
jobOrder = &model.JobOrder{}
job = &model.Job{}
sid string
jobOrderID int64
)
job.ID = jobID
err = dao.GetEntity(db, job)
if err != nil {
return link, err
if shareType == partner.ShareTypeOther {
jobOrderID, _, _ = AcceptJob(ctx, jobID, 0, 0)
} else {
sid = partner.MtUnionJxSID
}
jobOrder.JobID = job.ID
err = dao.GetEntity(db, jobOrder, "JobID")
if err != nil {
return link, err
if jobOrderID != 0 {
sid = utils.Int64ToStr(jobOrderID)
}
if handler := partner.GetHandler(job.VendorID); handler != nil {
link, err = handler.ShareUnionLink(ctx, linkType, job.UnionActID, utils.Int64ToStr(jobOrder.ID))
link, err = handler.ShareUnionLink(ctx, linkType, job.UnionActID, sid)
if job.VendorID == model.VendorIDMTWM && linkType == partner.LinkTypeWeiXinMini {
if resBinary, _, err := jxutils.DownloadFileByURL(link + "?imageView2/1/w/100/h/100/q/75"); err == nil {
if resBinary, _, err := jxutils.DownloadFileByURL(link + "?imageView2/1/w/150/h/150/q/75"); err == nil {
if downloadURL, err := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+link[strings.LastIndex(link, "/")+1:len(link)]); err == nil {
if err == nil {
link = jxutils.MixWatermarkImg(downloadURL, job.UnionImg, job.UnionQrcodePosition)

7
business/jxstore/cms/order.go
View File

@@ -194,7 +194,12 @@ func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) {
jobOrder = &model.JobOrder{}
db = dao.GetDB()
)
jobOrder.ID = unionOrder.JobOrderID
if unionOrder.SID == partner.MtUnionJxSID {
globals.SugarLogger.Debugf("result UnionOrderCallBack jxsysorder")
return err
}
jobOrder.ID = utils.Str2Int64(unionOrder.SID)
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {