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

- don't check weixin exist after login in.

Browse Source
This commit is contained in:
gazebo
2018-09-21 15:35:02 +08:00
parent edd5bfed26
commit 4192e9c635
8 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ const (
DefJdCategoryID = 20362
)
type skuInfoExt struct {
type tSkuInfoExt struct {
model.SkuName
Img string
JdID int64 `orm:"column(jd_id)"` // 商家类别
@@ -102,9 +102,9 @@ func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, user
return err
}
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
err = dao.GetRow(nil, &otherInfo, `
func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuExt *tSkuInfoExt, price int, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
var skuInfoExt tSkuInfoExt
err = dao.GetRow(nil, &skuInfoExt, `
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
@@ -113,20 +113,20 @@ func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuE
WHERE t1.id = ?
`, sku.ID)
if err == nil {
shopCategories := []int64{otherInfo.JdID}
if otherInfo.SkuCatID != 0 {
shopCategories = append(shopCategories, otherInfo.SkuCatID)
shopCategories := []int64{skuInfoExt.JdID}
if skuInfoExt.SkuCatID != 0 {
shopCategories = append(shopCategories, skuInfoExt.SkuCatID)
}
if otherInfo.JdCategoryID == 0 {
otherInfo.JdCategoryID = DefJdCategoryID
if skuInfoExt.JdCategoryID == 0 {
skuInfoExt.JdCategoryID = DefJdCategoryID
}
if otherInfo.BrandID == 0 {
otherInfo.BrandID = DefBrandID
if skuInfoExt.BrandID == 0 {
skuInfoExt.BrandID = DefBrandID
}
addParams := map[string]interface{}{}
if otherInfo.IsGlobal == 0 { //如果不是全国可售，要查可售区域
sellPlaces, err2 := dao.GetSellCities(db, otherInfo.ID, model.VendorIDJD)
if skuInfoExt.IsGlobal == 0 { //如果不是全国可售，要查可售区域
sellPlaces, err2 := dao.GetSellCities(db, skuInfoExt.ID, model.VendorIDJD)
if err = err2; err == nil && len(sellPlaces) > 0 {
sellCites := make([]int, len(sellPlaces))
for k, v := range sellPlaces {
@@ -136,9 +136,10 @@ func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuE
}
}
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)
skuName := jxutils.ComposeSkuName(skuInfoExt.Prefix, skuInfoExt.Name, skuInfoExt.Comment, skuInfoExt.Unit, sku.SpecQuality, sku.SpecUnit, 0)
globals.SugarLogger.Debug(utils.Format4Output(skuInfoExt, false), utils.Format4Output(sku, false))
skuPrice := jxutils.CaculateSkuPrice(skuInfoExt.Price, sku.SpecQuality, sku.SpecUnit)
result, err2 := handler(&skuInfoExt, skuPrice, skuName, shopCategories, addParams)
if err = err2; err == nil {
if jdID := utils.Str2Int64WithDefault(result, 0); jdID != 0 {
sku.JdID = jdID
@@ -150,9 +151,9 @@ func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuE
}
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) {
return p.cuSku(db, sku, func(skuExt *tSkuInfoExt, price int, 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)
vendorSkuID, err = api.JdAPI.AddSku(utils.Int2Str(sku.ID), skuExt.JdCategoryID, shopCategories, skuExt.BrandID, skuName, price, jxutils.IntWeight2Float(sku.Weight), []string{skuExt.Img}, 1, true, addParams)
}
return vendorSkuID, err
})
@@ -225,7 +226,7 @@ func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuNameExt *model.SkuName
}
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) {
return p.cuSku(db, sku, func(skuExt *tSkuInfoExt, price int, skuName string, shopCategories []int64, addParams map[string]interface{}) (vendorSkuID string, err error) {
params := utils.MergeMaps(addParams)
params["categoryId"] = skuExt.JdCategoryID
params["shopCategories"] = shopCategories

5
business/partner/purchase/jd/sku_test.go
View File

@@ -23,12 +23,13 @@ func TestCreateSku(t *testing.T) {
func TestUpdateSku(t *testing.T) {
// t.Log(beego.BConfig.RunMode)
db := dao.GetDB()
skuID := 21741
sku := &model.Sku{}
sku.ID = skuID
dao.GetEntity(nil, sku)
dao.GetEntity(db, sku)
err := new(PurchaseHandler).UpdateSku(sku, "autotest")
err := new(PurchaseHandler).UpdateSku(db, sku, "autotest")
if err != nil {
t.Fatal(err.Error())
}

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

@@ -5,6 +5,7 @@ import (
"testing"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model/dao"
)
const (
@@ -27,13 +28,13 @@ func TestUpdateStore(t *testing.T) {
// result := &model.Store{}
// result.ID = 100164
// err := dao.GetEntity(nil, result)
db := dao.GetDB()
if err != nil {
t.Fatal(err.Error())
}
result.Name += "h"
newName := result.Name
err = handler.UpdateStore(TestStoreNo, "autotest")
err = handler.UpdateStore(db, TestStoreNo, "autotest")
if err != nil {
t.Fatal(err.Error())
}
@@ -46,7 +47,7 @@ func TestUpdateStore(t *testing.T) {
// restore
result.Name = strings.Trim(result.Name, "h")
err = handler.UpdateStore(TestStoreNo, "autotest")
err = handler.UpdateStore(db, TestStoreNo, "autotest")
if err != nil {
t.Fatal(err.Error())
}