liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运单验重

Browse Source
This commit is contained in:
苏尹岚
2020-10-28 15:56:03 +08:00
parent 278574a897
commit 3e44f00a25
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/job.go
View File

@@ -677,6 +677,10 @@ func GetJdDelivery(ctx *jxcontext.Context, status int, fromTime, toTime string,
return dao.GetDeliveryOrders(dao.GetDB(), []string{ctx.GetUserID()}, []int{status}, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset) return dao.GetDeliveryOrders(dao.GetDB(), []string{ctx.GetUserID()}, []int{status}, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
} }
func GetJdDeliveryDetail(ctx *jxcontext.Context, vendorWaybillID string) (queryDynamicTraceInfo []*jdeclpapi.QueryDynamicTraceInfoResult, err error) {
return api.JdEclpAPI.QueryDynamicTraceInfo(vendorWaybillID)
}
func ResetJobTimers() { func ResetJobTimers() {
var ( var (
db = dao.GetDB() db = dao.GetDB()

4
business/model/order.go
View File

@@ -88,7 +88,7 @@ type DeliveryOrder struct {
VendorWaybillID string `orm:"column(vendor_waybill_id)" json:"vendorWaybillID"` //运单号 VendorWaybillID string `orm:"column(vendor_waybill_id)" json:"vendorWaybillID"` //运单号
UserID string `orm:"column(user_id);size(48)" json:"userID"` //用户ID UserID string `orm:"column(user_id);size(48)" json:"userID"` //用户ID
DeliverySendID int `orm:"column(delivery_send_id)" json:"deliverySendID"` //寄件人地址ID DeliverySendID int `orm:"column(delivery_send_id)" json:"deliverySendID"` //寄件人地址ID
DeliveryReceiveID int `orm:"cloumn(delivery_receive_id)" json:"deliveryReceiveID"` //取件人地址ID（收货人） DeliveryReceiveID int `orm:"column(delivery_receive_id)" json:"deliveryReceiveID"` //取件人地址ID（收货人）
Status int `json:"status"` //运单状态 Status int `json:"status"` //运单状态
PayPrice int `json:"payPrice"` //支付金额 PayPrice int `json:"payPrice"` //支付金额
OrderFinishedAt time.Time `json:"orderFinishedAt"` //订单完成时间 OrderFinishedAt time.Time `json:"orderFinishedAt"` //订单完成时间
@@ -98,6 +98,8 @@ type DeliveryOrder struct {
PickUpStartTime time.Time `json:"pickUpStartTime"` //预约取件开始时间 PickUpStartTime time.Time `json:"pickUpStartTime"` //预约取件开始时间
PickUpEndTime time.Time `json:"pickUpEndTime"` //预约取件结束时间 PickUpEndTime time.Time `json:"pickUpEndTime"` //预约取件结束时间
PackageCount int `json:"packageCount"` //包裹数 PackageCount int `json:"packageCount"` //包裹数
ActualWeight float64 `json:"actualWeight"` //实际重量
IsWeight int `json:"isWeight"` //0代表未验重，1代表验重通过，2代表不通过
Comment string `orm:"size(255)" json:"comment"` //备注 Comment string `orm:"size(255)" json:"comment"` //备注
} }

5
controllers/job_controller.go
View File

@@ -268,8 +268,8 @@ func (c *JobController) GetJdDelivery() {
}) })
} }
// @Title 查询京东快递 // @Title 查询京东快递物流信息
// @Description 查询京东快递 // @Description 查询京东快递物流信息
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param vendorWaybillID query string false "运单号" // @Param vendorWaybillID query string false "运单号"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
@@ -277,6 +277,7 @@ func (c *JobController) GetJdDelivery() {
// @router /GetJdDeliveryDetail [get] // @router /GetJdDeliveryDetail [get]
func (c *JobController) GetJdDeliveryDetail() { func (c *JobController) GetJdDeliveryDetail() {
c.callGetJdDeliveryDetail(func(params *tJobGetJdDeliveryDetailParams) (retVal interface{}, errCode string, err error) { c.callGetJdDeliveryDetail(func(params *tJobGetJdDeliveryDetailParams) (retVal interface{}, errCode string, err error) {
return retVal, "", err return retVal, "", err
}) })
} }