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

a

Browse Source
This commit is contained in:
苏尹岚
2020-12-08 11:53:59 +08:00
parent e6e3afcca7
commit 7dd5223dea
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,8 +128,8 @@ func Cash(ctx *jxcontext.Context, orderID string, payType int, vendorPayType str
return errCode, err return errCode, err
} }
func GetOrders(ctx *jxcontext.Context, orderID string, orderType int, cityCodes []int, fromTime, toTime, keyword string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) { func GetOrders(ctx *jxcontext.Context, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime, keyword string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
return dao.GetOrders(dao.GetDB(), orderID, orderType, cityCodes, utils.Str2Time(fromTime), utils.Str2Time(toTime), keyword, offset, pageSize) return dao.GetOrders(dao.GetDB(), orderID, userID, orderType, cityCodes, utils.Str2Time(fromTime), utils.Str2Time(toTime), keyword, offset, pageSize)
} }
func FinishedCashOrders(ctx *jxcontext.Context, orderIDs []string) (err error) { func FinishedCashOrders(ctx *jxcontext.Context, orderIDs []string) (err error) {

6
business/model/dao/dao_order.go
View File

@@ -94,7 +94,7 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
return pagedInfo, err return pagedInfo, err
} }
func GetOrders(db *DaoDB, orderID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { func GetOrders(db *DaoDB, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
var orders []*model.Order var orders []*model.Order
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS a.* SELECT SQL_CALC_FOUND_ROWS a.*
@@ -110,6 +110,10 @@ func GetOrders(db *DaoDB, orderID string, orderType int, cityCodes []int, fromTi
sql += ` AND a.order_id = ?` sql += ` AND a.order_id = ?`
sqlParams = append(sqlParams, orderID) sqlParams = append(sqlParams, orderID)
} }
if userID != "" {
sql += ` AND a.user_id = ?`
sqlParams = append(sqlParams, userID)
}
if orderType != 0 { if orderType != 0 {
sql += ` AND a.type = ?` sql += ` AND a.type = ?`
sqlParams = append(sqlParams, orderType) sqlParams = append(sqlParams, orderType)

3
controllers/order_controller.go
View File

@@ -64,6 +64,7 @@ func (c *OrderController) CreateOrder() {
// @Description 查询订单提现申请 // @Description 查询订单提现申请
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param orderID query string false "订单号" // @Param orderID query string false "订单号"
// @Param userID query string false "用户ID"
// @Param orderType query int false "订单类型，1为支付，2为提现" // @Param orderType query int false "订单类型，1为支付，2为提现"
// @Param cityCodes query string false "城市code列表" // @Param cityCodes query string false "城市code列表"
// @Param fromTime query string false "开始时间" // @Param fromTime query string false "开始时间"
@@ -78,7 +79,7 @@ func (c *OrderController) GetOrders() {
c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) { c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
var cityCodes []int var cityCodes []int
if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes); err == nil { if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes); err == nil {
retVal, err = cms.GetOrders(params.Ctx, params.OrderID, params.OrderType, cityCodes, params.FromTime, params.ToTime, params.Keyword, params.Offset, params.PageSize) retVal, err = cms.GetOrders(params.Ctx, params.OrderID, params.UserID, params.OrderType, cityCodes, params.FromTime, params.ToTime, params.Keyword, params.Offset, params.PageSize)
} }
return retVal, "", err return retVal, "", err
}) })