diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index aa8a587c1..fa606668c 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -695,7 +695,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		return nil, nil, fmt.Errorf("地址ID不正确")
 	}
 	deliveryAddress = addressList[0]
-	if distance := jxutils.Point2StoreDistance(deliveryAddress.Lng, deliveryAddress.Lat, storeDetail.Lng, storeDetail.Lat, storeDetail.DeliveryRangeType, storeDetail.DeliveryRange); distance == 0 {
+	distance := jxutils.Point2StoreDistance(deliveryAddress.Lng, deliveryAddress.Lat, storeDetail.Lng, storeDetail.Lat, storeDetail.DeliveryRangeType, storeDetail.DeliveryRange)
+	if distance == 0 && !IsDeliverySelf {
 		return nil, nil, fmt.Errorf("当前送货地址不在门店%s的配送范围", storeDetail.Name)
 	}
 	//结算类型
@@ -835,7 +836,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
 							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
-						} else {              //以下else为物料订单袋子金额和数量处理
+						} else { //以下else为物料订单袋子金额和数量处理
 							if !result.Flag { //只要flag是false就按原价申请，是true再按订单量
 								outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 								outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 2f2b8cb2e..1933ac07d 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -18,7 +18,7 @@ type JxOrderController struct {
 // @Description 创建京西商城订单
 // @Param	token			header		string	true	"认证token"
 // @Param	jxOrder			formData	string	true	"订单信息"
-// @Param	addressID		formData	int64	fasle	"配送地址ID"
+// @Param	addressID		formData	int64	true	"配送地址ID"
 // @Param	fromStoreID		formData	int		fasle	"物料配送门店"
 // @Param	couponIDs		formData	string	fasle	"优惠券IDs"
 // @Param	createType		formData	int		false	"创建类型, 0:预创建, 1:创建"