liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- cms store management.

Browse Source
This commit is contained in:
gazebo
2018-09-03 18:28:37 +08:00
parent 426fe7c570
commit 70d5ae5dd1
17 changed files with 1522 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/partner/partner.go
View File

@@ -54,6 +54,9 @@ type IPurchasePlatformHandler interface {
// 完全自送的门店表示配送完成
SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error)
////////
ReadStore(vendorStoreID string) (store *model.Store, err error)
}
type IDeliveryPlatformHandler interface {

7
business/partner/purchase/elm/store.go Normal file
View File

@@ -0,0 +1,7 @@
package elm
import "git.rosy.net.cn/jx-callback/business/model"
func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error) {
return nil, nil
}

206
business/partner/purchase/jd/product.go
View File

@@ -1,206 +0,0 @@
package jd
// 这里函数取得的信息，除了与自身实体相关的ID（比如PARENT ID），都已经转换成了本地ID了
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/gormdb"
)
const (
DefBrandID = 35247
DefJdCategoryID = 20362
)
type skuInfoExt struct {
model.SkuName
Img string
JdID int64 // 商家类别
JdCategoryID int // 到家类别
SkuCatID int64 // 商家特殊类别
}
func (p *PurchaseHandler) CreateCategory(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(pCat, nil); err == nil {
jdPid = pCat.JdID
} else {
return err
}
}
result, err := api.JdAPI.AddShopCategory(jdPid, cat.Name, int(cat.Level), cat.Seq, userName)
if err == nil {
cat.JdID = utils.Str2Int64(result)
}
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 {
cats = make([]*model.SkuCategory, len(result))
for k, v := range result {
cats[k] = &model.SkuCategory{
ParentID: int(v.ParentId), // 这里是暂存，传递数据用，正确的值应该是本地的ID
Name: v.Name,
Level: int8(v.Level),
Seq: v.Sort,
JdID: v.Id,
}
}
return cats, nil
}
return nil, err
}
func (p *PurchaseHandler) UpdateCategory(cat *model.SkuCategory) error {
return api.JdAPI.UpdateShopCategory(cat.JdID, cat.Name)
}
func (p *PurchaseHandler) DeleteCategory(cat *model.SkuCategory) error {
return api.JdAPI.DelShopCategory(cat.JdID)
}
func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
var otherInfo skuInfoExt
db := gormdb.GetDB()
err = db.Raw(`
SELECT t2.*, t3.jd_id, t3.jd_category_id, t4.jd_id sku_cat_id
FROM sku t1
JOIN sku_name t2 ON t1.name_id = t2.id
JOIN sku_category t3 ON t2.category_id = t3.id
LEFT JOIN sku_category t4 ON t1.category_id = t4.id
WHERE t1.id = ?
`, sku.ID).Scan(&otherInfo).Error
if err == nil {
shopCategories := []int64{otherInfo.JdID}
if otherInfo.SkuCatID != 0 {
shopCategories = append(shopCategories, otherInfo.SkuCatID)
}
if otherInfo.JdCategoryID == 0 {
otherInfo.JdCategoryID = DefJdCategoryID
}
if otherInfo.BrandID == 0 {
otherInfo.BrandID = DefBrandID
}
addParams := map[string]interface{}{}
if otherInfo.IsGlobal == 0 { //如果不是全国可售，要查可售区域
sellPlaces, err2 := dao.GetSellCities(otherInfo.ID, model.VendorIDJD, db)
if err = err2; err == nil && len(sellPlaces) > 0 {
sellCites := make([]int, len(sellPlaces))
for k, v := range sellPlaces {
sellCites[k] = v.JdCode
}
addParams["sellCities"] = sellCites
}
}
if err == nil {
skuName := jxutils.ComposeSkuName(otherInfo.Prefix, otherInfo.Name, otherInfo.Comment, otherInfo.Unit, sku.SpecQuality, sku.SpecUnit, 0)
globals.SugarLogger.Debug(skuName)
result, err2 := handler(&otherInfo, skuName, shopCategories, addParams)
if err = err2; err == nil {
sku.JdID = utils.Str2Int64(result)
}
}
}
return err
}
func (p *PurchaseHandler) CreateSku(sku *model.Sku) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error) {
return 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)
})
}
func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuName *model.SkuName, sellPlaces []*model.Place, sku *model.Sku, err error) {
result, _, err := api.JdAPI.QuerySkuInfos("", int(utils.Str2Int64(vendorSkuID)), 0, 0, false)
if err == nil {
if len(result) == 1 {
mapData := result[0]
skuNameStr := utils.Interface2String(mapData["skuName"])
prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(skuNameStr)
if name == "" {
name = skuNameStr
unit = "份"
specUnit = "g"
}
skuName = &model.SkuName{
Prefix: prefix,
Name: name,
Comment: comment,
Unit: unit,
Price: int(utils.MustInterface2Int64(mapData["skuPrice"])),
}
sku = &model.Sku{
SpecQuality: specQuality,
SpecUnit: specUnit,
Weight: jxutils.FloatWeight2Int(float32(utils.MustInterface2Float64(mapData["weight"]))),
JdID: utils.MustInterface2Int64(mapData["skuId"]),
}
sku.ID = int(utils.Str2Int64(utils.Interface2String(mapData["outSkuId"])))
db := gormdb.GetDB()
shopCategories := utils.Interface2Int64List(mapData["shopCategories"])
if len(shopCategories) > 0 {
skuCat := &model.SkuCategory{}
if db.Where("jd_id = ?", shopCategories[0]).Find(skuCat).Error == nil {
skuName.CategoryID = skuCat.ID
}
}
sellCities := utils.Interface2Int64List(mapData["sellCities"])
if len(sellCities) == 0 {
skuName.IsGlobal = 1
} else {
sellPlaces = make([]*model.Place, 0)
err2 := db.Where("jd_code IN (?) AND level = 2", sellCities).Find(&sellPlaces).Error
globals.SugarLogger.Debug("err2:%v", err2)
}
return skuName, sellPlaces, sku, nil
}
}
return nil, nil, nil, err
}
func (p *PurchaseHandler) UpdateSku(sku *model.Sku) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error) {
params := utils.MergeMaps(addParams)
params["categoryId"] = skuExt.JdCategoryID
params["shopCategories"] = shopCategories
params["brandId"] = skuExt.BrandID
params["skuName"] = skuName
params["weight"] = jxutils.IntWeight2Float(sku.Weight)
params["images"] = []string{skuExt.Img}
return api.JdAPI.UpdateSku(utils.Int2Str(sku.ID), params)
})
}
func (p *PurchaseHandler) DeleteSku(sku *model.Sku) (err error) {
params := map[string]interface{}{
"fixedStatus": 4,
}
_, err = api.JdAPI.UpdateSku(utils.Int2Str(sku.ID), params)
return err
}

205
business/partner/purchase/jd/sku.go
View File

@@ -1,13 +1,206 @@
package jd
// 这里函数取得的信息，除了与自身实体相关的ID（比如PARENT ID），都已经转换成了本地ID了
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/gormdb"
)
func (p *PurchaseHandler) AddSku(sku *model.Sku) error {
// params := map[string]interface{}{
// "outSkuId": utils.Int2Str(int(sku.ID)),
// "categoryId": skuman.GetJdCategoryID(sku),
// }
return nil
const (
DefBrandID = 35247
DefJdCategoryID = 20362
)
type skuInfoExt struct {
model.SkuName
Img string
JdID int64 // 商家类别
JdCategoryID int // 到家类别
SkuCatID int64 // 商家特殊类别
}
func (p *PurchaseHandler) CreateCategory(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 {
jdPid = pCat.JdID
} else {
return err
}
}
result, err := api.JdAPI.AddShopCategory(jdPid, cat.Name, int(cat.Level), cat.Seq, userName)
if err == nil {
cat.JdID = utils.Str2Int64(result)
}
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 {
cats = make([]*model.SkuCategory, len(result))
for k, v := range result {
cats[k] = &model.SkuCategory{
ParentID: int(v.ParentId), // 这里是暂存，传递数据用，正确的值应该是本地的ID
Name: v.Name,
Level: int8(v.Level),
Seq: v.Sort,
JdID: v.Id,
}
}
return cats, nil
}
return nil, err
}
func (p *PurchaseHandler) UpdateCategory(cat *model.SkuCategory) error {
return api.JdAPI.UpdateShopCategory(cat.JdID, cat.Name)
}
func (p *PurchaseHandler) DeleteCategory(cat *model.SkuCategory) error {
return api.JdAPI.DelShopCategory(cat.JdID)
}
func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
var otherInfo skuInfoExt
db := gormdb.GetDB()
err = db.Raw(`
SELECT t2.*, t3.jd_id, t3.jd_category_id, t4.jd_id sku_cat_id
FROM sku t1
JOIN sku_name t2 ON t1.name_id = t2.id
JOIN sku_category t3 ON t2.category_id = t3.id
LEFT JOIN sku_category t4 ON t1.category_id = t4.id
WHERE t1.id = ?
`, sku.ID).Scan(&otherInfo).Error
if err == nil {
shopCategories := []int64{otherInfo.JdID}
if otherInfo.SkuCatID != 0 {
shopCategories = append(shopCategories, otherInfo.SkuCatID)
}
if otherInfo.JdCategoryID == 0 {
otherInfo.JdCategoryID = DefJdCategoryID
}
if otherInfo.BrandID == 0 {
otherInfo.BrandID = DefBrandID
}
addParams := map[string]interface{}{}
if otherInfo.IsGlobal == 0 { //如果不是全国可售，要查可售区域
sellPlaces, err2 := dao.GetSellCities(otherInfo.ID, model.VendorIDJD, db)
if err = err2; err == nil && len(sellPlaces) > 0 {
sellCites := make([]int, len(sellPlaces))
for k, v := range sellPlaces {
sellCites[k] = v.JdCode
}
addParams["sellCities"] = sellCites
}
}
if err == nil {
skuName := jxutils.ComposeSkuName(otherInfo.Prefix, otherInfo.Name, otherInfo.Comment, otherInfo.Unit, sku.SpecQuality, sku.SpecUnit, 0)
globals.SugarLogger.Debug(skuName)
result, err2 := handler(&otherInfo, skuName, shopCategories, addParams)
if err = err2; err == nil {
sku.JdID = utils.Str2Int64(result)
}
}
}
return err
}
func (p *PurchaseHandler) CreateSku(sku *model.Sku) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error) {
return 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)
})
}
func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuName *model.SkuName, sellPlaces []*model.Place, sku *model.Sku, err error) {
result, _, err := api.JdAPI.QuerySkuInfos("", int(utils.Str2Int64(vendorSkuID)), 0, 0, false)
if err == nil {
if len(result) == 1 {
mapData := result[0]
skuNameStr := utils.Interface2String(mapData["skuName"])
prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(skuNameStr)
if name == "" {
name = skuNameStr
unit = "份"
specUnit = "g"
}
skuName = &model.SkuName{
Prefix: prefix,
Name: name,
Comment: comment,
Unit: unit,
Price: int(utils.MustInterface2Int64(mapData["skuPrice"])),
}
sku = &model.Sku{
SpecQuality: specQuality,
SpecUnit: specUnit,
Weight: jxutils.FloatWeight2Int(float32(utils.MustInterface2Float64(mapData["weight"]))),
JdID: utils.MustInterface2Int64(mapData["skuId"]),
}
sku.ID = int(utils.Str2Int64(utils.Interface2String(mapData["outSkuId"])))
db := gormdb.GetDB()
shopCategories := utils.Interface2Int64List(mapData["shopCategories"])
if len(shopCategories) > 0 {
skuCat := &model.SkuCategory{}
if db.Where("jd_id = ?", shopCategories[0]).Find(skuCat).Error == nil {
skuName.CategoryID = skuCat.ID
}
}
sellCities := utils.Interface2Int64List(mapData["sellCities"])
if len(sellCities) == 0 {
skuName.IsGlobal = 1
} else {
sellPlaces = make([]*model.Place, 0)
err2 := db.Where("jd_code IN (?) AND level = 2", sellCities).Find(&sellPlaces).Error
globals.SugarLogger.Debug("err2:%v", err2)
}
return skuName, sellPlaces, sku, nil
}
}
return nil, nil, nil, err
}
func (p *PurchaseHandler) UpdateSku(sku *model.Sku) (err error) {
return p.cuSku(sku, func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error) {
params := utils.MergeMaps(addParams)
params["categoryId"] = skuExt.JdCategoryID
params["shopCategories"] = shopCategories
params["brandId"] = skuExt.BrandID
params["skuName"] = skuName
params["weight"] = jxutils.IntWeight2Float(sku.Weight)
params["images"] = []string{skuExt.Img}
return api.JdAPI.UpdateSku(utils.Int2Str(sku.ID), params)
})
}
func (p *PurchaseHandler) DeleteSku(sku *model.Sku) (err error) {
params := map[string]interface{}{
"fixedStatus": 4,
}
_, err = api.JdAPI.UpdateSku(utils.Int2Str(sku.ID), params)
return err
}

4
business/partner/purchase/jd/product_test.go → business/partner/purchase/jd/sku_test.go
View File

@@ -13,7 +13,7 @@ func TestCreateSku(t *testing.T) {
skuID := 21741
sku := &model.Sku{}
sku.ID = skuID
dao.GetEntity(sku, nil)
dao.GetEntity(nil, sku)
t.Log(sku)
// err := new(PurchaseHandler).CreateSku(sku)
// if err != nil {
@@ -26,7 +26,7 @@ func TestUpdateSku(t *testing.T) {
skuID := 21741
sku := &model.Sku{}
sku.ID = skuID
dao.GetEntity(sku, nil)
dao.GetEntity(nil, sku)
err := new(PurchaseHandler).UpdateSku(sku)
if err != nil {

20
business/partner/purchase/jd/store.go
View File

@@ -5,10 +5,12 @@ import (
"strings"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/gormdb"
)
func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error) {
@@ -22,7 +24,25 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
OpenTime2: JdOperationTime2JxOperationTime(result["serviceTimeStart2"]),
CloseTime2: JdOperationTime2JxOperationTime(result["serviceTimeEnd2"]),
Status: JdStoreStatus2JxStatus(result["yn"], result["closeStatus"]),
Tel1: utils.Interface2String(result["phone"]),
}
tel2 := utils.Interface2String(result["mobile"])
if tel2 != "" && tel2 != retVal.Tel1 {
retVal.Tel2 = tel2
}
cityCode := int(utils.MustInterface2Int64(result["city"]))
if cityCode != 0 {
db := gormdb.GetDB()
if city, err2 := dao.GetPlaceByJdCode(db, cityCode); err2 == nil {
retVal.CityCode = city.Code
districtName := utils.Interface2String(result["countyName"]) // 京东的市区号码与通用数据完全无法关联，只有通过名字来关联
if district, err2 := dao.GetPlaceByName(db, districtName, 3, city.Code); err2 == nil {
retVal.DistrictCode = district.Code
}
}
}
retVal.Lng = jxutils.StandardCoordinate2Int(utils.MustInterface2Float64(result["lng"]))
retVal.Lat = jxutils.StandardCoordinate2Int(utils.MustInterface2Float64(result["lat"]))
retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["outSystemId"]), 0))
result, err2 := api.JdAPI.GetDeliveryRangeByStationNo(vendorStoreID)

2
business/partner/purchase/jd/store_test.go
View File

@@ -37,7 +37,7 @@ func TestUpdateStore(t *testing.T) {
// result := &model.Store{}
// result.ID = 100164
// err := dao.GetEntity(result, nil)
// err := dao.GetEntity(nil, result)
if err != nil {
t.Fatal(err.Error())