From aa3dc4e6f10fab51514900aacdbd22efc9266cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 5 Nov 2020 14:41:03 +0800
Subject: [PATCH] send

---
 controllers/job_controller.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index 36e5add1e..13d69d047 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -228,6 +228,8 @@ func (c *JobController) RechargeMtMembers() {
 // @Description 发送京东快递
 // @Param	token			header		string	true	"认证token"
 // @Param	payload			formData	string	true	"delivery order 类型"
+// @Param	pickUpStartTime	formData	string	false	"预约取件开始时间"
+// @Param	pickUpEndTime	formData	string	false	"预约取件结束时间"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /SendJdDelivery [post]
@@ -235,6 +237,10 @@ func (c *JobController) SendJdDelivery() {
 	c.callSendJdDelivery(func(params *tJobSendJdDeliveryParams) (retVal interface{}, errCode string, err error) {
 		var dOrder *model.DeliveryOrder
 		if err = jxutils.Strings2Objs(params.Payload, &dOrder); err == nil {
+			if params.PickUpStartTime != "" && params.PickUpEndTime != "" {
+				dOrder.PickUpStartTime = utils.Str2Time(params.PickUpStartTime)
+				dOrder.PickUpEndTime = utils.Str2Time(params.PickUpEndTime)
+			}
 			errCode, err = cms.SendJdDelivery(params.Ctx, dOrder)
 		}
 		return retVal, errCode, err