From 89d722c7293701f2f76d8b71414db32c22626b50 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, 9 Mar 2021 18:01:11 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sku.go           |  3 +++
 business/jxstore/report/report.go     |  4 +++-
 business/partner/purchase/mtwm/act.go | 14 ++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index b3ee2f130..4ed8c3a3a 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2977,5 +2977,8 @@ func LoadStoreVendorCategories(ctx *jxcontext.Context, vendorOrgCode string, ven
 			OnCreateThing(ctx, db, vendorOrgCodes, int64(v.CategoryID), model.ThingTypeCategory, model.SyncFlagNewMask, true)
 		}
 	}
+	if _, err = SyncCategories(ctx, nil, []int{vendorID}, []string{vendorOrgCode}, nil, false); err == nil {
+		SyncReorderCategories2(ctx, 0, vendorID, vendorOrgCode)
+	}
 	return err
 }
diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index 2df4b33e6..9360389ec 100644
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -471,7 +471,9 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
 		result.SkuCount = skuCount
 		result.HighSkuCount = highSkuCount
 		//活动丰富度
-
+		handler := partner.GetPurchasePlatformFromVendorID(vendorID)
+		ample, _ := handler.GetActAmple(ctx, storeDetail.VendorStoreID, storeDetail.VendorStoreID)
+		result.ActAmple = ample
 		getStoreManageStateResult = append(getStoreManageStateResult, result)
 	}
 	return getStoreManageStateResult, err
diff --git a/business/partner/purchase/mtwm/act.go b/business/partner/purchase/mtwm/act.go
index e8776fe26..6b4d0766b 100644
--- a/business/partner/purchase/mtwm/act.go
+++ b/business/partner/purchase/mtwm/act.go
@@ -260,13 +260,11 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 }
 
 func (c *PurchaseHandler) GetActAmple(ctx *jxcontext.Context, vendorStoreID, vendorOrgCode string) (ample int, err error) {
-	// for _, v := range mtwmapi.ActTypeList {
-	// 	//1表示进行中
-	// 	if actList, err := getAPI(vendorOrgCode, 0, vendorStoreID).GetByAppPoiCodeAndType(vendorOrgCode, 1, v); err == nil {
-	// 		for _, vv := range actList {
-
-	// 		}
-	// 	}
-	// }
+	for _, v := range mtwmapi.ActTypeList {
+		//1表示进行中
+		if actList, err := getAPI(vendorOrgCode, 0, vendorStoreID).GetByAppPoiCodeAndType(vendorOrgCode, 1, v); err == nil {
+			ample += len(actList)
+		}
+	}
 	return ample, err
 }