diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 4330ead2b..d77e02159 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -107,13 +107,13 @@ func (s *StoreManager) OnCourierStoreStatusChanged(ctx *jxcontext.Context, vendo db := dao.GetDB() _, err2 := dao.GetStoreDetail2(db, 0, vendorStoreID, vendorID) if err = err2; err == nil { - // status := model.StoreStatusOpened - // if auditStatus != model.StoreAuditStatusOnline { - // status = model.StoreStatusDisabled - // } + status := model.StoreStatusOpened + if auditStatus != model.StoreAuditStatusOnline { + status = model.StoreStatusDisabled + } _, err = dao.UpdateEntityLogically(db, &model.StoreCourierMap{}, map[string]interface{}{ - // model.FieldStatus: status, - "AuditStatus": auditStatus, + model.FieldStatus: status, + "AuditStatus": auditStatus, }, ctx.GetUserName(), map[string]interface{}{ model.FieldVendorStoreID: vendorStoreID, model.FieldVendorID: vendorID, diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index bd1a84651..ff4acd128 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -93,14 +93,36 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt }, VendorID: model.VendorIDMTPS, VendorStoreID: shopInfo.ShopID, - CourierStatus: model.StoreStatusOpened, + // CourierStatus: model.StoreStatusOpened, // AuditStatus: model.StoreAuditStatusOnline, } - // result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName) + result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName) + if err == nil { + storeDetail.AuditStatus = mtpsOpenTypeToJx(result.OpenType) + storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.OpenType) + } } return storeDetail, err } +func mtpsOpenTypeToJx(openType int) (status int) { + if openType == 0 { + status = model.StoreAuditStatusRejected + } else { + status = model.StoreAuditStatusOnline + } + return status +} + +func mtpsOpenTypeToJx2(openType int) (status int) { + if openType == 0 { + status = model.StoreStatusClosed + } else { + status = model.StoreStatusOpened + } + return status +} + func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool { return mtpsapi.IsErrShopNotExist(err) }