- refactor partner.

This commit is contained in:
gazebo
2018-09-21 10:57:00 +08:00
parent d10869cef4
commit 804c9c146c
14 changed files with 150 additions and 173 deletions

View File

@@ -25,12 +25,12 @@ type skuInfoExt struct {
SkuCatID int64 `orm:"column(sku_cat_id)"` // 商家特殊类别
}
func (p *PurchaseHandler) CreateCategory(cat *model.SkuCategory, userName string) (err error) {
func (p *PurchaseHandler) CreateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) (err error) {
var jdPid int64
if cat.ParentID != 0 {
pCat := &model.SkuCategory{}
pCat.ID = cat.ParentID
if err = dao.GetEntity(nil, pCat); err == nil {
if err = dao.GetEntity(db, pCat); err == nil {
jdPid = pCat.JdID
} else {
return err
@@ -47,19 +47,6 @@ func (p *PurchaseHandler) CreateCategory(cat *model.SkuCategory, userName string
return err
}
func (p *PurchaseHandler) ReadCategory(vendorCatID string) (cat *model.SkuCategory, err error) {
result, err := p.ReadCategories()
if err == nil {
jdID := utils.Str2Int64(vendorCatID)
for _, v := range result {
if v.JdID == jdID {
return v, nil
}
}
}
return nil, err
}
func (p *PurchaseHandler) ReadCategories() (cats []*model.SkuCategory, err error) {
result, err := api.JdAPI.QueryCategoriesByOrgCode()
if err == nil {
@@ -78,29 +65,32 @@ func (p *PurchaseHandler) ReadCategories() (cats []*model.SkuCategory, err error
return nil, err
}
func (p *PurchaseHandler) UpdateCategory(cat *model.SkuCategory, userName string) error {
func (p *PurchaseHandler) UpdateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
if !globals.EnableStoreWrite {
return nil
}
return api.JdAPI.UpdateShopCategory(cat.JdID, cat.Name)
}
func (p *PurchaseHandler) DeleteCategory(cat *model.SkuCategory, userName string) error {
func (p *PurchaseHandler) DeleteCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
if !globals.EnableStoreWrite {
return nil
}
return api.JdAPI.DelShopCategory(cat.JdID)
}
func (p *PurchaseHandler) ReorderCategories(parentCat *model.SkuCategory, userName string) (err error) {
parentID := 0
func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, userName string) (err error) {
var parentJDID int64
if parentCat != nil {
parentID = parentCat.ID
parentJDID = parentCat.JdID
if parentCatID != 0 {
cat := &model.SkuCategory{}
cat.ID = parentCatID
if err = dao.GetEntity(db, cat); err != nil {
return err
}
parentJDID = cat.JdID
}
var cats []*model.SkuCategory
if err = dao.GetRows(nil, &cats, "SELECT * FROM sku_category WHERE parent_id = ? ORDER BY seq", parentID); err == nil {
if err = dao.GetRows(db, &cats, "SELECT * FROM sku_category WHERE parent_id = ? ORDER BY seq", parentCatID); err == nil {
jdCatIDs := make([]int64, len(cats))
for k, v := range cats {
jdCatIDs[k] = v.JdID
@@ -112,9 +102,8 @@ func (p *PurchaseHandler) ReorderCategories(parentCat *model.SkuCategory, userNa
return err
}
func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
var otherInfo skuInfoExt
db := dao.GetDB()
err = dao.GetRow(nil, &otherInfo, `
SELECT t2.*, t3.jd_id, t3.jd_category_id, t4.jd_id sku_cat_id
FROM sku t1
@@ -160,8 +149,8 @@ func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt,
return err
}
func (p *PurchaseHandler) CreateSku(sku *model.Sku, userName string) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (vendorSkuID string, err error) {
func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
return p.cuSku(db, sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (vendorSkuID string, err error) {
if globals.EnableStoreWrite {
vendorSkuID, err = api.JdAPI.AddSku(utils.Int2Str(sku.ID), skuExt.JdCategoryID, shopCategories, skuExt.BrandID, skuName, skuExt.Price, jxutils.IntWeight2Float(sku.Weight), []string{skuExt.Img}, 1, true, addParams)
}
@@ -235,8 +224,8 @@ func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuNameExt *model.SkuName
return skuNameExt, err
}
func (p *PurchaseHandler) UpdateSku(sku *model.Sku, userName string) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (vendorSkuID string, err error) {
func (p *PurchaseHandler) UpdateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
return p.cuSku(db, sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (vendorSkuID string, err error) {
params := utils.MergeMaps(addParams)
params["categoryId"] = skuExt.JdCategoryID
params["shopCategories"] = shopCategories
@@ -252,7 +241,7 @@ func (p *PurchaseHandler) UpdateSku(sku *model.Sku, userName string) (err error)
})
}
func (p *PurchaseHandler) DeleteSku(sku *model.Sku, userName string) (err error) {
func (p *PurchaseHandler) DeleteSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
params := map[string]interface{}{
"fixedStatus": 4,
}