diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 06048d51d..f45ee6f09 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -5,6 +5,8 @@ import ( "strings" "time" + "git.rosy.net.cn/baseapi/platformapi/jdeclpapi" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/business/jxstore/financial" @@ -516,3 +518,13 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (err error) { } return err } + +func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (err error) { + var ( + db = dao.GetDB() + ) + + dao.WrapAddIDCULEntity(dOrder, ctx.GetUserName()) + api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{}) + return err +} diff --git a/business/model/order.go b/business/model/order.go index 7f96be763..ddf4a8979 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -98,6 +98,7 @@ type DeliveryOrder struct { PickUpStartTime time.Time `json:"pickUpStartTime"` //预约取件开始时间 PickUpEndTime time.Time `json:"pickUpEndTime"` //预约取件结束时间 PackageCount int `json:"packageCount"` //包裹数 + Comment string `orm:"size(255)" json:"comment"` //备注 } func (v *DeliveryOrder) TableUnique() [][]string { diff --git a/controllers/job_controller.go b/controllers/job_controller.go index e7823fce0..d4c0437f2 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -217,3 +217,20 @@ func (c *JobController) RechargeMtMembers() { return retVal, "", err }) } + +// @Title 发送京东快递 +// @Description 发送京东快递 +// @Param token header string true "认证token" +// @Param payload formData string true "delivery order 类型" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /SendJdDelivery [post] +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 { + err = cms.SendJdDelivery(params.Ctx, dOrder) + } + return retVal, "", err + }) +}