This commit is contained in:
苏尹岚
2020-12-31 17:29:18 +08:00
parent 3de4615719
commit a561368cf4
5 changed files with 55 additions and 20 deletions

View File

@@ -46,6 +46,7 @@ func (c *OrderController) Cash() {
// @Description 创建订单
// @Param token header string true "认证token"
// @Param type formData int true "支付类型/账单类型"
// @Param orderType formData int true "订单类型1为发任务2为冲会员3为发快递"
// @Param way formData string true "认证方式"
// @Param price formData int true "支付金额"
// @Param lng formData float64 true "经纬度"
@@ -55,7 +56,7 @@ func (c *OrderController) Cash() {
// @router /CreateOrder [post]
func (c *OrderController) CreateOrder() {
c.callCreateOrder(func(params *tOrderCreateOrderParams) (retVal interface{}, errCode string, err error) {
retVal, errCode, err = cms.CreateOrder(params.Ctx, params.Type, params.Way, params.Price, params.Lng, params.Lat)
retVal, errCode, err = cms.CreateOrder(params.Ctx, params.Type, params.OrderType, params.Way, params.Price, params.Lng, params.Lat)
return retVal, errCode, err
})
}
@@ -111,15 +112,15 @@ func (c *OrderController) FinishedCashOrders() {
// @Param mobile query string false "用户手机,必须全匹配"
// @Param fromTime query string false "消费开始时间"
// @Param toTime query string false "消费结束时间"
// @Param consumeTypes query string false "1为发任务2为冲会员3为发快递"
// @Param orderTypes query string false "1为发任务2为冲会员3为发快递,4为一件代发支付"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetPayStatistics [get]
func (c *OrderController) GetPayStatistics() {
c.callGetPayStatistics(func(params *tOrderGetPayStatisticsParams) (retVal interface{}, errCode string, err error) {
var cityCodes, consumeTypes []int
if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes, params.ConsumeTypes, &consumeTypes); err == nil {
retVal, err = cms.GetPayStatistics(params.Ctx, params.UserID, params.Pop, cityCodes, params.Mobile, params.FromTime, params.ToTime, consumeTypes)
var cityCodes, orderTypes []int
if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes, params.OrderTypes, &orderTypes); err == nil {
retVal, err = cms.GetPayStatistics(params.Ctx, params.UserID, params.Pop, cityCodes, params.Mobile, params.FromTime, params.ToTime, orderTypes)
}
return retVal, "", err
})