diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 05f634ac3..e112dab98 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1279,7 +1279,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 		}
 		order.StoreID = storeList[0].ID
 		order.StoreName = storeList[0].Name
-		storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+		storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 		if len(storeMaps) > 0 {
 			order.VendorStoreID = storeMaps[0].VendorStoreID
 		}
@@ -1410,7 +1410,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
 		}
 	}
 	//重新构建order的数据
-	storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if err != nil || len(storeMaps) == 0 {
 		return "", fmt.Errorf("该门店未绑定京狗平台，请先绑定后再转移！门店：[%v]", storeID)
 	}
@@ -1538,7 +1538,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 		}
 	}
 	//重新构建order的数据
-	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", order.VendorOrgCode)
 	if err != nil || len(storeMaps) == 0 {
 		return "", fmt.Errorf("该门店未绑定平台，请先绑定后再转移！门店：[%v]", storeID)
 	}
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 881e8dfe8..566a41efe 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1505,7 +1505,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder)
 func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 	if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
 		utils.CallFuncAsync(func() {
-			order = setFakeActualPayPrice(order)
+			// order = setFakeActualPayPrice(order)
 			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
 			//目前暂且认为AdjustCount > 0 就是调整单
 			if order.AdjustCount > 0 {
@@ -1523,7 +1523,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 
 func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) {
 	utils.CallFuncAsync(func() {
-		order = setFakeActualPayPrice(order)
+		// order = setFakeActualPayPrice(order)
 		weixinmsg.NotifyUserApplyCancel(order, cancelReason)
 	})
 }
@@ -1531,7 +1531,7 @@ func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReas
 func (s *DefScheduler) notifyOrderCanceled(order *model.GoodsOrder) {
 	if order.Flag&model.OrderFlagMaskFake == 0 {
 		utils.CallFuncAsync(func() {
-			order = setFakeActualPayPrice(order)
+			// order = setFakeActualPayPrice(order)
 			weixinmsg.NotifyOrderCanceled(order)
 			smsmsg.NotifyOrderCanceled(order)
 			push.NotifyOrderCanceled(order)
diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index da514bc19..be29e945d 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -419,7 +419,7 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 	db := dao.GetDB()
 	switch configType {
 	case model.ConfigTypePricePack:
-		storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key, "")
+		storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key, "", "")
 		if err = err2; err == nil {
 			var storeInfo []string
 			for _, v := range storeMapList {
@@ -430,7 +430,7 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 			}
 		}
 	case model.ConfigTypeFreightPack:
-		storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+		storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 		if err = err2; err == nil {
 			var storeInfo []string
 			for _, v := range storeMapList {
@@ -510,7 +510,7 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 	}
 	switch configType {
 	case model.ConfigTypePricePack:
-		storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key, "")
+		storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key, "", "")
 		if err != nil {
 			dao.Rollback(db)
 			return "", err
@@ -529,7 +529,7 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 		}
 	case model.ConfigTypeFreightPack:
 		dao.Commit(db)
-		storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+		storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 		if err != nil {
 			return "", err
 		}
diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 881e2bf74..7b16e4543 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1267,7 +1267,7 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
 	if len(storeSkus) > 0 {
 		storeIDs := make(map[int]int)
-		storeMaps, err2 := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+		storeMaps, err2 := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 		err = err2
 		for _, v := range storeMaps {
 			storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, []int{v.StoreID}, nameID)
diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 2873289c0..c98e02339 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -414,7 +414,7 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
 }
 
 func setStoreMapInfo(ctx *jxcontext.Context, db *dao.DaoDB, storesInfo *StoresInfo, storeIDs []int, briefLevel int) (err error) {
-	storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if err != nil {
 		return err
 	}
@@ -1200,7 +1200,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 			}
 		}
 	}
-	storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", true)
+	storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "", true)
 	if len(storeMapList) > 0 {
 		_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 	} else {
@@ -1850,7 +1850,7 @@ type EbaiStoreHealthy struct {
 func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	db := dao.GetDB()
 	vendorID := model.VendorIDEBAI
-	storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 	if err != nil {
 		return "", err
 	}
@@ -1968,7 +1968,7 @@ func GetCorporationInfo(ctx *jxcontext.Context, licenceCode string) (corporation
 
 func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs, storeIDs []int) (vendorStoreSnapshotList []*model.VendorStoreSnapshot, err error) {
 	db := dao.GetDB()
-	storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if err != nil {
 		return nil, err
 	}
@@ -2015,7 +2015,7 @@ func getCurrentSnapshotAt(now time.Time) (snapshotAt time.Time) {
 }
 
 func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.VendorStoreSnapshot) (err error) {
-	storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if err != nil {
 		return err
 	}
@@ -2535,7 +2535,7 @@ func JdStoreInfoCoordinateRecover(ctx *jxcontext.Context, vendorOrgCode string,
 	defer file1.Close()
 
 	db := dao.GetDB()
-	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 	if err == nil {
 		var validStoreList []*dao.StoreDetail
 		for _, v := range storeList {
@@ -2801,7 +2801,7 @@ func CreateStorePriceScore(ctx *jxcontext.Context) (err error) {
 
 func RefreshJdLevel(ctx *jxcontext.Context) (err error) {
 	db := dao.GetDB()
-	storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusOpened, -1, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusOpened, -1, "", "", "")
 	if len(storeMapList) > 0 {
 		dao.Begin(db)
 		defer func() {
@@ -2988,7 +2988,7 @@ func checkYbParams(db *dao.DaoDB, storeMap *model.StoreMap, storeID int) (err er
 			}
 		}
 	}
-	storeMaps, err := dao.GetStoresMapList2(db, []int{model.VendorIDYB}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", false)
+	storeMaps, err := dao.GetStoresMapList2(db, []int{model.VendorIDYB}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "", false)
 	if len(storeMaps) > 0 {
 		for _, v := range storeMaps {
 			if v.YbAppID == appID {
@@ -3349,7 +3349,7 @@ func DisabledStoreWithoutVendor(ctx *jxcontext.Context, isContinueWhenError, isA
 	task := tasksch.NewParallelTask("DisabledStoreWithoutVendor", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			store := batchItemList[0].(*model.Store)
-			storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDYB, model.VendorIDJD, model.VendorIDJX, model.VendorIDEBAI, model.VendorIDMTWM}, []int{store.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+			storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDYB, model.VendorIDJD, model.VendorIDJX, model.VendorIDEBAI, model.VendorIDMTWM}, []int{store.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 			if len(storeMaps) == 0 {
 				store.Status = model.StoreStatusDisabled
 				dao.UpdateEntity(db, store, "Status")
@@ -3451,7 +3451,7 @@ func UpdateStorePricePack(ctx *jxcontext.Context, storeID, vendorID int, pricePa
 			dao.Rollback(db)
 			return err
 		}
-		storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+		storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 		if err != nil {
 			dao.Rollback(db)
 			return err
@@ -3462,7 +3462,7 @@ func UpdateStorePricePack(ctx *jxcontext.Context, storeID, vendorID int, pricePa
 		}
 	}
 	dao.Commit(db)
-	storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, pricePack, "")
+	storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, pricePack, "", "")
 	if err != nil {
 		dao.Rollback(db)
 		return err
@@ -3500,7 +3500,7 @@ func GetJdDeliveryArea(ctx *jxcontext.Context, storeIDs []int) (err error) {
 		specialtyStoreSkus    []*SpecialtyStoreSkus
 		downloadURL, fileName string
 	)
-	storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJD}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJD}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	for _, v := range storeMaps {
 		time.Sleep(time.Second / 3)
 		station, err := jd.GetAPI("320406").GetDeliveryRangeByStationNo2(v.VendorStoreID)
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 39fc2ecc9..6f9b2b721 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -756,7 +756,7 @@ func updateSaleInfo4StoreSkuName(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 }
 
 func getValidStoreVendorMap(db *dao.DaoDB, storeIDs []int) (realVendorMap map[int]int, err error) {
-	storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 	if err != nil {
 		return nil, err
 	}
@@ -2278,7 +2278,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
 		return "", fmt.Errorf("此功能当前只支持京东到家平台")
 	}
 	db := dao.GetDB()
-	storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if err != nil {
 		return "", err
 	}
@@ -3706,7 +3706,7 @@ func SendSeckillSkusCountMsg(ctx *jxcontext.Context, vendorIDs []int, isAsync, i
 		ddMsgresult []interface{}
 	)
 	db := dao.GetDB()
-	storeList, err := dao.GetStoresMapList(db, vendorIDs, nil, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, model.StoreStatusOpened, model.StoreIsSyncAll, "", "")
+	storeList, err := dao.GetStoresMapList(db, vendorIDs, nil, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, model.StoreStatusOpened, model.StoreIsSyncAll, "", "", "")
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0:
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 4db4e465e..8982bbaa8 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -650,7 +650,7 @@ func (v *VendorSync) AmendAndPruneStoreStuff(ctx *jxcontext.Context, vendorIDs [
 
 func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) {
 	var storeMapList []*model.StoreMap
-	if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", mustDirty); err != nil {
+	if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil {
 		return nil, "", err
 	}
 	if len(storeMapList) == 0 {
diff --git a/business/jxstore/cms/sync_store.go b/business/jxstore/cms/sync_store.go
index c38aefc85..d102c400e 100644
--- a/business/jxstore/cms/sync_store.go
+++ b/business/jxstore/cms/sync_store.go
@@ -16,7 +16,7 @@ func OpenRemoteStoreByJxStatus(ctx *jxcontext.Context, vendorIDs, storeIDs []int
 	if !isForce {
 		status = model.StoreStatusClosed
 	}
-	storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, status, model.StoreIsSyncYes, "", "")
+	storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, status, model.StoreIsSyncYes, "", "", "")
 	if err != nil {
 		return "", err
 	}
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index b693f4330..8fbd29d5c 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1234,7 +1234,7 @@ func FixMtwmCategory(ctx *jxcontext.Context, mtwmStoreIDs []int, isAsync, isCont
 func JdStoreInfo1125() (hint string, err error) {
 	fileName := "老格恢复拓店进度.xlsx"
 	db := dao.GetDB()
-	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 	if err == nil {
 		var validStoreList []*dao.StoreDetail
 		for _, v := range storeList {
@@ -1842,7 +1842,7 @@ func RefreshJXPriceChange(ctx *jxcontext.Context, storeID int) (hint string, err
 			store := batchItemList[0].(*model.Store)
 			var skuBindInfos []*cms.StoreSkuBindInfo
 			for _, v := range vendorIDs {
-				storeMaps, _ := dao.GetStoresMapList(db, []int{v}, []int{store.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+				storeMaps, _ := dao.GetStoresMapList(db, []int{v}, []int{store.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 				if len(storeMaps) > 0 {
 					storeMap := storeMaps[0]
 					switch v {
diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index c9408cb6d..be2ec0eeb 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -87,7 +87,7 @@ func isPushSMS(order *model.GoodsOrder) bool {
 	} else {
 		storeID = order.StoreID
 	}
-	stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 	if len(stores) > 0 {
 		if stores[0].IsOrder == model.NO {
 			if storeID == model.MatterStoreID || storeID == model.JdShopMainStoreID || storeID == model.JdShopMainStoreID2 {
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 5f646d311..63cc3e978 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -243,7 +243,7 @@ func GetStoreCourierList(db *DaoDB, storeIDs, vendorIDs []int, status, auditStat
 	return nil, err
 }
 
-func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name string, mustDirty bool) (storeMapList []*model.StoreMap, err error) {
+func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name, vendorOrgCode string, mustDirty bool) (storeMapList []*model.StoreMap, err error) {
 	sql := `
 	SELECT t1.*
 	FROM store_map t1
@@ -282,6 +282,10 @@ func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, statu
 		sql += " AND t2.name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
 	}
+	if vendorOrgCode != "" {
+		sql += " AND t1.vendor_org_code = ?"
+		sqlParams = append(sqlParams, vendorOrgCode)
+	}
 	if mustDirty {
 		sql += " AND t1.sync_status <> 0"
 	}
@@ -316,8 +320,8 @@ func SetStoresMapSyncStatus(db *DaoDB, vendorIDs, storeIDs []int, syncStatus int
 	return err
 }
 
-func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name string) (storeMapList []*model.StoreMap, err error) {
-	return GetStoresMapList2(db, vendorIDs, storeIDs, storeStatuss, status, isSync, pricePack, name, false)
+func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name, vendorOrgCode string) (storeMapList []*model.StoreMap, err error) {
+	return GetStoresMapList2(db, vendorIDs, storeIDs, storeStatuss, status, isSync, pricePack, name, vendorOrgCode, false)
 }
 
 func StoreMapList2Map(storeMapList []*model.StoreMap) (storeMapMap map[int][]*model.StoreMap) {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 4c491add2..86df9df60 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -1340,7 +1340,7 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
 			vendorIDs = []int{actVendorID}
 		}
 	} else {
-		storeMapList, err := GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+		storeMapList, err := GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
 		if err != nil {
 			return err
 		}
diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 971f1d7a7..cd11138a5 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -225,7 +225,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	} else {
 		buildOrderTo102919(order)
 	}
-	storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", msg.VendorOrgCode)
 	if len(storeMaps) > 0 {
 		order.VendorStoreID = storeMaps[0].VendorStoreID
 	}
diff --git a/business/partner/purchase/mtwm/order_comment.go b/business/partner/purchase/mtwm/order_comment.go
index 702682933..7620cbad5 100644
--- a/business/partner/purchase/mtwm/order_comment.go
+++ b/business/partner/purchase/mtwm/order_comment.go
@@ -44,7 +44,7 @@ func formalizeTagList(mtwmTagList string) (outTagList string) {
 }
 
 func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) {
-	storeMapList, err2 := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDMTWM}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
+	storeMapList, err2 := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDMTWM}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "")
 	if err = err2; err != nil {
 		return err
 	}