From 7f9a6a6484f0c3af700f302869d873fc4cbaa03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 16 Mar 2020 15:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E5=8C=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index de9f70e99..48b483724 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -194,7 +194,7 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
 }
 
 func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int) (outJxOrder *JxOrderInfo, err error) {
-	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID)
+	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "")
 	if err != nil {
 		return nil, err
 	}
@@ -400,7 +400,7 @@ func isTimeInOpTime(openTime1, closeTime1, openTime2, closeTime2 int16, time2Che
 	return false
 }
 
-func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, fromStoreID int) (outJxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, err error) {
+func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, fromStoreID int, userID string) (outJxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, err error) {
 	db := dao.GetDB()
 	if jxOrder.StoreID == 0 {
 		return nil, nil, fmt.Errorf("没有指定门店信息")
@@ -410,7 +410,12 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	if err != nil {
 		return nil, nil, err
 	}
-	addressList, _, err := dao.QueryUserDeliveryAddress(db, addressID, []string{ctx.GetUserID()}, 0, 0)
+	var addressList []*dao.UserDeliveryAddressEx
+	if userID == "" {
+		addressList, _, err = dao.QueryUserDeliveryAddress(db, addressID, []string{ctx.GetUserID()}, 0, 0)
+	} else {
+		addressList, _, err = dao.QueryUserDeliveryAddress(db, addressID, []string{userID}, 0, 0)
+	}
 	if err != nil {
 		return nil, nil, err
 	}
@@ -843,7 +848,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 			outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
 			for k, v := range outOrders {
 				globals.SugarLogger.Debugf("tryToSplitMatterOrder6,[%v]", utils.Format4Output(v, false))
-				outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID)
+				outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
 				if err != nil {
 					globals.SugarLogger.Debugf("tryToSplitMatterOrder10,[%v]", err)
 					return err