diff --git a/business/jxstore/skuman/skuman.go b/business/jxstore/skuman/skuman.go new file mode 100644 index 000000000..8dd693da4 --- /dev/null +++ b/business/jxstore/skuman/skuman.go @@ -0,0 +1,33 @@ +package skuman + +import ( + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" +) + +const ( + defJdCategoryID = 20462 +) + +type Sku struct { + *model.Sku +} + +func New(sku *model.Sku) *Sku { + return &Sku{ + Sku: sku, + } +} + +func GetJdCategoryID(sku *model.Sku) int { + cat, _ := dao.GetCategory(sku.CategoryID, nil) + jdCategoryID := defJdCategoryID + if cat != nil && cat.JdCategoryID != 0 { + jdCategoryID = cat.JdCategoryID + } + return jdCategoryID +} + +func GetCategories(sku *model.Sku) []int { + return nil +} diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go new file mode 100644 index 000000000..9a2615c1c --- /dev/null +++ b/business/model/dao/sku.go @@ -0,0 +1,20 @@ +package dao + +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/gormdb" + "github.com/jinzhu/gorm" +) + +func GetCategory(ID int, db *gorm.DB) (*model.SkuCategory, error) { + if db == nil { + db = gormdb.GetDB() + } + item := &model.SkuCategory{} + item.ID = ID + err := utils.CallFuncLogError(func() error { + return db.First(item).Error + }, "GetCategory") + return item, err +} diff --git a/business/model/dao/store.go b/business/model/dao/store.go new file mode 100644 index 000000000..9c8650b61 --- /dev/null +++ b/business/model/dao/store.go @@ -0,0 +1,20 @@ +package dao + +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/gormdb" + "github.com/jinzhu/gorm" +) + +func GetStore(ID int, db *gorm.DB) (*model.Store, error) { + if db == nil { + db = gormdb.GetDB() + } + item := &model.Store{} + item.ID = ID + err := utils.CallFuncLogError(func() error { + return db.First(item).Error + }, "GetStore") + return item, err +} diff --git a/business/model/product.go b/business/model/product.go index 83b710f5f..c5479d562 100644 --- a/business/model/product.go +++ b/business/model/product.go @@ -52,7 +52,7 @@ type SkuJdCategory struct { ModelIDCUO Name string `gorm:"type:varchar(255);index"` Level int - ParentID int64 + ParentID int } type SkuCategory struct { @@ -63,8 +63,8 @@ type SkuCategory struct { Type int8 // 类别类型 Seq int - JdID int64 `gorm:"index"` // 这个是指商家自己的商品类别在京东平台上的ID - JdCategoryID int64 // 这个是指对应的京东商品类别 + JdID int `gorm:"index"` // 这个是指商家自己的商品类别在京东平台上的ID + JdCategoryID int // 这个是指对应的京东商品类别 ElmID string `gorm:"type:varchar(48);index"` MtID string `gorm:"type:varchar(48);index"` DidiID string `gorm:"type:varchar(48);index"` diff --git a/business/partner/partner.go b/business/partner/partner.go index b7448ae1e..29226f021 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -16,6 +16,7 @@ var ( CancelWaybillReasonStrNotAcceptIntime = "没有及时抢单" CancelWaybillReasonStrSwitch2SelfFailed = "转自送失败" CancelWaybillReasonStrOrderAlreadyFinished = "订单已经结束" + CancelWaybillReasonStrActive = "操作由人员主动发起" ) var ( diff --git a/business/partner/purchase/jd/sku.go b/business/partner/purchase/jd/sku.go index bcaaa7726..aad9a4ccc 100644 --- a/business/partner/purchase/jd/sku.go +++ b/business/partner/purchase/jd/sku.go @@ -6,8 +6,8 @@ import ( func (p *PurchaseHandler) AddSku(sku *model.Sku) error { // params := map[string]interface{}{ - // "outSkuId": utils.Int2Str(int(sku.ID)), - // "categoryId": + // "outSkuId": utils.Int2Str(int(sku.ID)), + // "categoryId": skuman.GetJdCategoryID(sku), // } return nil }