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

- 整理partner.ReadStore

Browse Source
This commit is contained in:
gazebo
2019-07-22 15:04:07 +08:00
parent 71f6d0809a
commit a4470e5fb5
13 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
business/partner/purchase/ebai/store.go
View File

@@ -71,33 +71,22 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
return "", err
}
func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error) {
func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string) (*dao.StoreDetail, error) {
baiduShopID := utils.Str2Int64(vendorStoreID)
result, err := api.EbaiAPI.ShopGet("", baiduShopID)
if err == nil {
// globals.SugarLogger.Debug(utils.Format4Output(result, false))
retVal := &model.Store{
Address: utils.Interface2String(result["address"]),
Tel1: utils.Interface2String(result["phone"]),
globals.SugarLogger.Debug(utils.Format4Output(result, false))
retVal := &dao.StoreDetail{
Store: model.Store{
Address: utils.Interface2String(result["address"]),
Tel1: utils.Interface2String(result["phone"]),
},
}
retVal.OriginalName = utils.Interface2String(result["name"])
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"]))
if result["business_time"] != nil {
businessTime := result["business_time"].([]interface{})
if len(businessTime) > 0 {
btime := businessTime[0].(map[string]interface{})
retVal.OpenTime1 = jxutils.StrTime2JxOperationTime(utils.Interface2String(btime["start"].(string)), 700)
retVal.CloseTime1 = jxutils.StrTime2JxOperationTime(utils.Interface2String(btime["end"].(string)), 2000)
if len(businessTime) > 1 {
btime = businessTime[1].(map[string]interface{})
retVal.OpenTime2 = jxutils.StrTime2JxOperationTime(utils.Interface2String(btime["start"].(string)), 700)
retVal.CloseTime2 = jxutils.StrTime2JxOperationTime(utils.Interface2String(btime["end"].(string)), 2000)
}
}
}
retVal.SetOpTime(ebaiOpTime2Jx(result["business_time"]))
if ebaiStatus, err2 := api.EbaiAPI.ShopBusStatusGet("", baiduShopID, ebaiapi.PlatformFlagElm); err2 == nil {
retVal.Status = EbaiBusStatus2JxStatus(ebaiStatus)
}
@@ -165,7 +154,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
shopID = store.ID
}
store2, err2 := p.ReadStore(store.VendorStoreID)
store2, err2 := p.ReadStore(jxcontext.AdminCtx, store.VendorStoreID)
// globals.SugarLogger.Debugf("ebai UpdateStore2 store2:%s, err2:%v", utils.Format4Output(store2, true), err2)
if err = err2; err == nil {
if store2.ID == store.ID {
@@ -359,8 +348,18 @@ func fillOpTimeParams(params map[string]interface{}, opTimeList []int16) map[str
return params
}
func ebaiOpTime2Jx(businessTime interface{}) (opTimeList []int16) {
businessTimeList, _ := businessTime.([]interface{})
for _, v := range businessTimeList {
vMap := v.(map[string]interface{})
opTimeList = append(opTimeList, jxutils.StrTime2JxOperationTime(utils.Interface2String(vMap["start"])+":00", 700),
jxutils.StrTime2JxOperationTime(utils.Interface2String(vMap["end"])+":00", 2000))
}
return opTimeList
}
func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
params := fillOpTimeParams(nil, []int16{store.OpenTime1, store.CloseTime1, store.OpenTime2, store.CloseTime2})
params := fillOpTimeParams(nil, store.GetOpTimeList())
// if store.Tel2 != "" {
// params["ivr_phone"] = store.Tel2
// }
@@ -431,7 +430,7 @@ func (c *PurchaseHandler) GetShopHealthInfo(vendorShopID string) (shopHealthInfo
}
func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, status int) (err error) {
store, err := c.ReadStore(vendorStoreID)
store, err := c.ReadStore(ctx, vendorStoreID)
if err != nil {
return err
}

8
business/partner/purchase/ebai/store_test.go
View File

@@ -3,12 +3,14 @@ package ebai
import (
"testing"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model/dao"
)
func TestReadStore(t *testing.T) {
result, err := new(PurchaseHandler).ReadStore(testShopBaiduID)
result, err := CurPurchaseHandler.ReadStore(jxcontext.AdminCtx, testShopBaiduID)
if err != nil {
t.Fatal(err.Error())
}
@@ -17,7 +19,7 @@ func TestReadStore(t *testing.T) {
func TestUpdateStore(t *testing.T) {
db := dao.GetDB()
err := new(PurchaseHandler).UpdateStore(db, testShopID, "autotest")
err := CurPurchaseHandler.UpdateStore(db, testShopID, "autotest")
if err != nil {
t.Fatal(err.Error())
}
@@ -25,7 +27,7 @@ func TestUpdateStore(t *testing.T) {
func TestCreateStore(t *testing.T) {
db := dao.GetDB()
_, err := new(PurchaseHandler).CreateStore(db, 1, "autotest")
_, err := CurPurchaseHandler.CreateStore(db, 1, "autotest")
if err != nil {
t.Fatal(err.Error())
}