From 2596d7a526624baf3916390f779588e4b93bb383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 3 Apr 2020 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/basesch/basesch_ext.go | 4 ++++
 business/model/const.go                              | 1 +
 business/model/sync_map.go                           | 1 +
 3 files changed, 6 insertions(+)

diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index 4cc88ca45..3d403a364 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -6,6 +6,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/errlist"
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -128,6 +129,9 @@ func (c *BaseScheduler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOr
 
 func (c *BaseScheduler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
 	if c.IsReallyCallPlatformAPI {
+		if globals.IsAddEvent {
+			err = cms.AddEventDetail(dao.GetDB(), ctx, model.OperateUpdate, order.StoreID, model.ThingTypeOrder, order.StoreID, order.VendorOrderID, order.StoreName)
+		}
 		err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).CancelOrder(ctx, order, reason)
 	}
 	return err
diff --git a/business/model/const.go b/business/model/const.go
index 03ac5307f..bf657e366 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -139,6 +139,7 @@ var (
 		"RegisterUser":          "注册",
 		"AutoPayForPopluarMan":  "每日订单打款",
 		"SyncStoresQualify":     "上传门店营业资质",
+		"CancelOrder":           "取消订单",
 	}
 
 	MultiStoresVendorMap = map[int]int{
diff --git a/business/model/sync_map.go b/business/model/sync_map.go
index 3d1ccf360..6fc3a7d09 100644
--- a/business/model/sync_map.go
+++ b/business/model/sync_map.go
@@ -6,6 +6,7 @@ const (
 	ThingTypeSku      = 3
 	ThingTypeStore    = 4
 	ThingTypeUser     = 5
+	ThingTypeOrder    = 6
 )
 
 type ThingMap struct {