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

合并请求

Browse Source
This commit is contained in:
qidongsheng
2020-06-29 09:27:12 +08:00
parent b297499b0d 61a0c5aad8
commit 1b5ea29ef0
16 changed files with 973 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/jx_order.go
View File

@@ -373,14 +373,15 @@ func (c *OrderController) GetAfsOrders() {
// @Description 得到售后单SKU信息（订单与售后单必填一项）
// @Param token header string true "认证token"
// @Param vendorID query int true "售后单所属的厂商ID"
// @Param vendorOrderID query string faslse "订单ID"
// @Param afsOrderID query string faslse "售后单ID"
// @Param vendorOrderID query string false "订单ID"
// @Param afsOrderID query string false "售后单ID"
// @Param isNotFaild query bool false "是否查非失败的"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetAfsOrderSkuInfo [get]
func (c *OrderController) GetAfsOrderSkuInfo() {
c.callGetAfsOrderSkuInfo(func(params *tOrderGetAfsOrderSkuInfoParams) (retVal interface{}, errCode string, err error) {
retVal, err = dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, params.AfsOrderID, params.VendorID)
retVal, err = dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, params.AfsOrderID, params.VendorID, params.IsNotFaild)
return retVal, "", err
})
}
@@ -856,7 +857,7 @@ func (c *OrderController) RefundOrder() {
if err != nil {
return nil, "", err
}
afsSkuList, err := dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, "", params.VendorID)
afsSkuList, err := dao.GetAfsOrderSkuInfo(dao.GetDB(), params.VendorOrderID, "", params.VendorID, false)
if err != nil {
return nil, "", err
}

20
controllers/jx_order2.go
View File

@@ -111,6 +111,26 @@ func (c *JxOrderController) GetMyOrders() {
})
}
// @Title 查询自己的售后单
// @Description 查询自己的售后单
// @Param token header string true "认证token"
// @Param vendorOrderID query string false "订单号，如果此项不为空，忽略其它所有查询条件"
// @Param afsOrderID query string false "售后单号"
// @Param userID query string false "用户ID"
// @Param fromTime query string false "开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
// @Param toTime query string false "结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
// @Param offset query int false "结果起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetMyAfsOrders [get]
func (c *JxOrderController) GetMyAfsOrders() {
c.callGetMyAfsOrders(func(params *tJxorderGetMyAfsOrdersParams) (retVal interface{}, errCode string, err error) {
retVal, err = localjx.GetMyAfsOrders(params.Ctx, params.VendorOrderID, params.AfsOrderID, params.UserID, params.FromTime, params.ToTime, params.Offset, params.PageSize)
return retVal, "", err
})
}
// @Title 查询自己的订单状态数量信息
// @Description 查询自己的订单状态数量信息
// @Param token header string true "认证token"