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

aa

Browse Source
This commit is contained in:
suyl
2021-08-06 10:04:20 +08:00
parent e5b00c0a79
commit 8a179a496a
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/jxstore/cms/store.go
View File

@@ -739,11 +739,12 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS
Store: store.Store, Store: store.Store,
} }
retVal.Name = store.Name retVal.Name = store.Name
if retVal.Status == model.StoreStatusDisabled { retVal.BussinessStatus = store.CourierStatus
retVal.BussinessStatus = -1 //if retVal.Status == model.StoreStatusDisabled {
} else { // retVal.BussinessStatus = -1
retVal.BussinessStatus = 1 //} else {
} // retVal.BussinessStatus = 1
//}
return retVal, err return retVal, err
} }
} }

17
business/partner/delivery/mtps/store.go
View File

@@ -10,6 +10,7 @@ import (
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"time"
) )
const ( const (
@@ -101,10 +102,18 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
// CourierStatus: model.StoreStatusOpened, // CourierStatus: model.StoreStatusOpened,
// AuditStatus: model.StoreAuditStatusOnline, // AuditStatus: model.StoreAuditStatusOnline,
} }
result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName) _, err = api.MtpsAPI.CheckOrder(shopInfo.ShopID, shopInfo.ShopAddress, int64(shopInfo.ShopLng), int64(shopInfo.ShopLat), time.Now().Unix())
if err == nil { //result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType) //if err == nil {
storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.DataList[0].OpenType) // storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType)
// storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.DataList[0].OpenType)
//}
if mtpsapi.IsOpen(err) {
storeDetail.AuditStatus = model.StoreAuditStatusOnline
storeDetail.CourierStatus = model.StoreStatusOpened
} else {
storeDetail.AuditStatus = model.StoreAuditStatusRejected
storeDetail.CourierStatus = model.StoreStatusClosed
} }
} }
return storeDetail, err return storeDetail, err