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

18
business/partner/purchase/mtwm/mtwm.go
View File

@@ -113,23 +113,21 @@ func rangeJX2Mtwm(coords string) string {
return ""
}
func openTimeMtwm2JX(vendorOpenTime string) [][2]int16 {
func openTimeMtwm2JX(vendorOpenTime string) (opTimeList []int16) {
timePairs := strings.Split(vendorOpenTime, ",")
jxOpenTimers := make([][2]int16, len(timePairs))
for k, v := range timePairs {
for _, v := range timePairs {
times := strings.Split(v, "-")
jxOpenTimers[k][0] = jxutils.StrTime2JxOperationTime(times[0], 700)
jxOpenTimers[k][1] = jxutils.StrTime2JxOperationTime(times[1], 2000)
opTimeList = append(opTimeList, jxutils.StrTime2JxOperationTime(times[0]+":00", 700), jxutils.StrTime2JxOperationTime(times[1]+":00", 2000))
}
return jxOpenTimers
return opTimeList
}
func openTimeJX2Mtwm(times []int16) string {
timesLen := len(times) / 2 * 2
func openTimeJX2Mtwm(opTimeList []int16) string {
timesLen := len(opTimeList) / 2 * 2
var strPairs []string
for i := 0; i < timesLen; i += 2 {
if times[i] != 0 {
strPairs = append(strPairs, jxutils.JxOperationTime2StrTime(times[i])+"-"+jxutils.JxOperationTime2StrTime(times[i+1]))
if opTimeList[i] != 0 {
strPairs = append(strPairs, jxutils.JxOperationTime2StrTime(opTimeList[i])+"-"+jxutils.JxOperationTime2StrTime(opTimeList[i+1]))
} else {
break
}

22
business/partner/purchase/mtwm/store.go
View File

@@ -33,26 +33,20 @@ type tEbaiStoreInfo struct {
DistrictID int `orm:"column(district_id)"`
}
func (p *PurchaseHandler) ReadStore(vendorStoreID string) (retVal *model.Store, err error) {
func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string) (retVal *dao.StoreDetail, err error) {
result, err := api.MtwmAPI.PoiGet(vendorStoreID)
if err == nil {
// globals.SugarLogger.Debug(utils.Format4Output(result, false))
retVal = &model.Store{
Address: result.Address,
Tel1: result.Phone,
retVal = &dao.StoreDetail{
Store: model.Store{
Address: result.Address,
Tel1: result.Phone,
},
}
retVal.OriginalName = result.Name
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
openTimes := openTimeMtwm2JX(result.ShippingTime)
if len(openTimes) > 0 {
retVal.OpenTime1 = openTimes[0][0]
retVal.CloseTime1 = openTimes[0][1]
if len(openTimes) > 1 {
retVal.OpenTime2 = openTimes[1][0]
retVal.CloseTime2 = openTimes[1][1]
}
}
retVal.SetOpTime(openTimeMtwm2JX(result.ShippingTime))
retVal.Status = bizStatusMtwm2JX(result.OpenLevel, result.IsOnline)
tel2 := result.StandbyTel
@@ -128,7 +122,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
// err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params)
// }
errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeID, storeDetail.VendorStoreID, jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)))
errList.AddErr(p.UpdateStoreOpTime(jxcontext.AdminCtx, storeID, storeDetail.VendorStoreID, []int16{storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2}))
errList.AddErr(p.UpdateStoreOpTime(jxcontext.AdminCtx, storeID, storeDetail.VendorStoreID, storeDetail.GetOpTimeList()))
return errList.GetErrListAsOne()
}

4
business/partner/purchase/mtwm/store_test.go
View File

@@ -3,12 +3,14 @@ package mtwm
import (
"testing"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/baseapi/utils"
// _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
)
func TestReadStore(t *testing.T) {
store, err := new(PurchaseHandler).ReadStore("4351018")
store, err := new(PurchaseHandler).ReadStore(jxcontext.AdminCtx, "4351018")
if err != nil {
t.Fatal(err)
}