From 8593e8b44bbab6c3b1b334cd63406d0a793407b3 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 18 Sep 2018 22:58:15 +0800
Subject: [PATCH] - ReorderCategories

---
 business/jxstore/cms/sku.go         |  7 ++++++-
 business/partner/purchase/jd/sku.go | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 0c1e90365..6f172de83 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -74,7 +74,12 @@ func ReorderCategories(parentID int, categoryIDs []int, userName string) (err er
 	parentCat := &model.SkuCategory{}
 	parentCat.ID = parentID
 	db := dao.GetDB()
-	if err = dao.GetEntity(db, parentCat); err == nil {
+	if parentID != 0 {
+		err = dao.GetEntity(db, parentCat)
+	} else {
+		parentCat = nil
+	}
+	if err == nil {
 		if err = dao.GetEntities(db, &cats, utils.Params2Map(model.FieldParentID, parentID), false); err == nil {
 			catsLen := len(cats)
 			if catsLen != len(categoryIDs) {
diff --git a/business/partner/purchase/jd/sku.go b/business/partner/purchase/jd/sku.go
index b35a9be3b..7c9ba362d 100644
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -93,14 +93,20 @@ func (p *PurchaseHandler) DeleteCategory(cat *model.SkuCategory, userName string
 }
 
 func (p *PurchaseHandler) ReorderCategories(parentCat *model.SkuCategory, userName string) (err error) {
+	parentID := 0
+	var parentJDID int64
+	if parentCat != nil {
+		parentID = parentCat.ID
+		parentJDID = parentCat.JdID
+	}
 	var cats []*model.SkuCategory
-	if err = dao.GetRows(nil, &cats, "SELECT * FROM sku_category WHERE parent_id = ? ORDER BY seq", parentCat.ID); err == nil {
+	if err = dao.GetRows(nil, &cats, "SELECT * FROM sku_category WHERE parent_id = ? ORDER BY seq", parentID); err == nil {
 		jdCatIDs := make([]int64, len(cats))
 		for k, v := range cats {
 			jdCatIDs[k] = v.JdID
 		}
 		if globals.EnableStoreWrite {
-			err = api.JdAPI.ChangeShopCategoryOrder(parentCat.JdID, jdCatIDs)
+			err = api.JdAPI.ChangeShopCategoryOrder(parentJDID, jdCatIDs)
 		}
 	}
 	return err