diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go
index 8c2655916..2dc729016 100644
--- a/business/jxstore/cms/storeman.go
+++ b/business/jxstore/cms/storeman.go
@@ -49,8 +49,11 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int,
 		if err == nil && (storeKV != nil || storeMapKV != nil) {
 			dao.Begin(db)
 			defer func() {
-				if err != nil {
+				if r := recover(); r != nil || err != nil {
 					dao.Rollback(db)
+					if r != nil {
+						panic(r)
+					}
 				}
 			}()
 			if storeKV != nil {
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 97f10b1db..5dcafd6db 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -197,8 +197,11 @@ func FormalizeStoreStatus(db *DaoDB, storeID, storeStatus int) (err error) {
 			if statusList[0] != model.StoreStatusOpened {
 				Begin(db)
 				defer func() {
-					if err != nil {
+					if r := recover(); r != nil || err != nil {
 						Rollback(db)
+						if r != nil {
+							panic(r)
+						}
 					}
 				}()
 				if storeStatus != statusList[0] {
diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go
index e48b0b50a..685c1425b 100644
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -131,44 +131,48 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 				"cargo_num":    order.GoodsCount,
 			}
 
-			// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
-			var lists []orm.ParamsList
-			num, err2 := db.Raw(`
+			if globals.EnableStoreWrite {
+				// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
+				var lists []orm.ParamsList
+				num, err2 := db.Raw(`
 		SELECT vendor_waybill_id
 		FROM waybill
 		WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
 		AND vendor_order_id = ?
 		AND waybill_vendor_id = ?
 		`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists)
-			var result *dadaapi.CreateOrderResponse
-			if err = err2; err == nil && num > 0 {
-				globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
-				result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
-			} else {
-				if err != nil {
-					globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
-				}
-				if false {
-					result, err = api.DadaAPI.AddOrder(billParams, addParams)
+				var result *dadaapi.CreateOrderResponse
+				if err = err2; err == nil && num > 0 {
+					globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
+					result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
 				} else {
-					if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
-						return nil, err
+					if err != nil {
+						globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
 					}
-					dadaFee := jxutils.StandardPrice2Int(result.Fee)
-					if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
-						return nil, err
+					if false {
+						result, err = api.DadaAPI.AddOrder(billParams, addParams)
+					} else {
+						if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
+							return nil, err
+						}
+						dadaFee := jxutils.StandardPrice2Int(result.Fee)
+						if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
+							return nil, err
+						}
+						err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
 					}
-					err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
 				}
-			}
-			if err == nil && result != nil {
-				bill = &model.Waybill{
-					VendorOrderID:   order.VendorOrderID,
-					OrderVendorID:   order.VendorID,
-					WaybillVendorID: model.VendorIDDada,
-					DesiredFee:      deliveryFee,
-					ActualFee:       jxutils.StandardPrice2Int(result.Fee),
+				if err == nil && result != nil {
+					bill = &model.Waybill{
+						VendorOrderID:   order.VendorOrderID,
+						OrderVendorID:   order.VendorID,
+						WaybillVendorID: model.VendorIDDada,
+						DesiredFee:      deliveryFee,
+						ActualFee:       jxutils.StandardPrice2Int(result.Fee),
+					}
 				}
+			} else {
+				err = fmt.Errorf("测试环境不能真正创建运单")
 			}
 		}
 	}
diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 3869f80fe..afd92c1dc 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -164,17 +164,21 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 					"goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq),
 					"poi_seq":           fmt.Sprintf("#%d", order.OrderSeq),
 				}
-				result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
-				if err = err2; err == nil {
-					globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
-					bill = &model.Waybill{
-						VendorOrderID:    order.VendorOrderID,
-						OrderVendorID:    order.VendorID,
-						VendorWaybillID:  result.MtPeisongID,
-						VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
-						WaybillVendorID:  model.VendorIDMTPS,
-						DesiredFee:       deliveryFee,
+				if globals.EnableStoreWrite {
+					result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
+					if err = err2; err == nil {
+						globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
+						bill = &model.Waybill{
+							VendorOrderID:    order.VendorOrderID,
+							OrderVendorID:    order.VendorID,
+							VendorWaybillID:  result.MtPeisongID,
+							VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
+							WaybillVendorID:  model.VendorIDMTPS,
+							DesiredFee:       deliveryFee,
+						}
 					}
+				} else {
+					err = fmt.Errorf("测试环境不能真正创建运单")
 				}
 			}
 		}