- 修改Rollback调用时机

- 创建三方运单判断EnableStoreWrite

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("测试环境不能真正创建运单")
 				}
 			}
 		}