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

- AgreeOrRefuseCancel

Browse Source
This commit is contained in:
gazebo
2019-04-23 15:24:44 +08:00
parent ac16fa741b
commit 0a3a0d3266
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -149,3 +149,10 @@ func (c *BaseScheduler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *model
}
return err
}
func (c *BaseScheduler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool, reason string) (err error) {
if c.IsReallyCallPlatformAPI {
err = partner.GetPurchasePlatformFromVendorID(order.VendorID).AgreeOrRefuseCancel(ctx, order, isAcceptIt, reason)
}
return err
}

30
controllers/jx_order.go
View File

@@ -360,7 +360,7 @@ func skuList2Map(skuList []*model.OrderSku) (skuMap map[int]*model.OrderSku) {
// @Description 调整订单
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID）"
// @Param vendorID formData int true "订单所属厂商ID"
// @Param removedSkuInfo formData string true "要去除的商品信息，只有skuID与Count字段有效"
// @Param reason formData string false "调整原因"
// @Success 200 {object} controllers.CallResult
@@ -403,7 +403,7 @@ func (c *OrderController) AdjustOrder() {
// @Description 取消订单
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID）"
// @Param vendorID formData int true "订单所属厂商ID"
// @Param reason formData string false "取消原因"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
@@ -422,7 +422,7 @@ func (c *OrderController) CancelOrder() {
// @Description 审核取货失败
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID）"
// @Param vendorID formData int true "订单所属厂商ID"
// @Param acceptIt formData bool true "是否批准"
// @Param reason formData string false "原因"
// @Success 200 {object} controllers.CallResult
@@ -442,7 +442,7 @@ func (c *OrderController) AcceptOrRefuseFailedGetOrder() {
// @Description 取货失败后再次招唤平台配送
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID）"
// @Param vendorID formData int true "订单所属厂商ID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /CallPMCourier [put]
@@ -460,7 +460,7 @@ func (c *OrderController) CallPMCourier() {
// @Description 投递失败后确认收到退货
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID）"
// @Param vendorID formData int true "订单所属厂商ID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /ConfirmReceiveGoods [put]
@@ -473,3 +473,23 @@ func (c *OrderController) ConfirmReceiveGoods() {
return retVal, "", err
})
}
// @Title 同意或拒绝用户取消订单申请
// @Description 同意或拒绝用户取消订单申请
// @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID"
// @Param acceptIt formData bool true "是否批准"
// @Param reason formData string false "原因"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /AgreeOrRefuseCancel [put]
func (c *OrderController) AgreeOrRefuseCancel() {
c.callAgreeOrRefuseCancel(func(params *tOrderAgreeOrRefuseCancelParams) (retVal interface{}, errCode string, err error) {
order, err := partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID)
if err == nil {
err = defsch.FixedScheduler.AgreeOrRefuseCancel(params.Ctx, order, params.AcceptIt, params.Reason)
}
return retVal, "", err
})
}