send jd deli

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
 }