From d16d67dfc6af82c648ba651bf77e03ec235424ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 23 Oct 2020 16:01:48 +0800
Subject: [PATCH] send jd deli

---
 business/jxstore/cms/job.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index f45ee6f09..22d8feaf6 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -523,8 +523,25 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (err er
 	var (
 		db = dao.GetDB()
 	)
-
+	sendDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliverySendID), nil, 0, 0)
+	receiveDeliveryList, _, err := dao.QueryUserDeliveryAddress(db, int64(dOrder.DeliveryReceiveID), nil, 0, 0)
+	if err != nil {
+		return err
+	}
+	if len(sendDeliveryList) == 0 {
+		return fmt.Errorf("未找到寄件人地址！")
+	}
+	if len(receiveDeliveryList) == 0 {
+		return fmt.Errorf("未找到取件人地址！")
+	}
 	dao.WrapAddIDCULEntity(dOrder, ctx.GetUserName())
-	api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{})
+	if vendorWaybillID, err := api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{}); err == nil {
+		dOrder.VendorWaybillID = vendorWaybillID
+	} else {
+		return err
+	}
+	dOrder.Status = model.OrderStatusNew
+	dOrder.UserID = ctx.GetUserID()
+	dao.CreateEntity(db, dOrder)
 	return err
 }