diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 68e23d0c7..b96897901 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -557,7 +557,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
 func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInfo, bill *model.Waybill, retryCount int, duration time.Duration) {
 	order := savedOrderInfo.order
 	globals.SugarLogger.Debugf("swtich2SelfDeliverWithRetry orderID:%s", order.VendorOrderID)
-	if (order.DeliveryFlag & model.OrderDeliveryFlagMaskPurcahseDisabled) == 0 {
+	if true { //这里应该不需要判断这样状态//(order.DeliveryFlag & model.OrderDeliveryFlagMaskPurcahseDisabled) == 0 {
 		if order.WaybillVendorID != order.VendorID {
 			if err := s.Swtich2SelfDeliver(order, ""); err != nil && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation {
 				globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry failed, bill:%v, err:%v", bill, err)
diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 4d17c612b..d03a98d8b 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -467,7 +467,12 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
 			storeDetail := storeDetailList[0]
 			if _, err = api.DadaAPI.ShopAdd(utils.Int2Str(storeID), storeDetail.Name, dadaapi.BusinessTypeConvStore, storeDetail.CityName,
 				storeDetail.DistrictName, storeDetail.Address, jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat),
-				storeDetail.Tel1, storeDetail.Tel1, nil); err == nil {
+				storeDetail.Tel1, storeDetail.Tel1, nil); err != nil {
+				if codeErr, ok := err.(*utils.ErrorWithCode); ok && codeErr.IntCode() == dadaapi.ResponseCodeShopAlreadyExist {
+					err = nil
+				}
+			}
+			if err == nil {
 				_, err = AddStoreCourierMap(ctx, db, storeDetail.ID, model.VendorIDDada, &model.StoreCourierMap{
 					VendorStoreID: utils.Int2Str(storeDetail.ID),
 					Status:        model.StoreStatusOpened,