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

时间缺省值修改

Browse Source
This commit is contained in:
苏尹岚
2019-11-12 18:30:06 +08:00
parent 6eabd6b488
commit c39acd3d4f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/order.go
View File

@@ -626,7 +626,7 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
if fromDate != "" && toDate != "" { if fromDate != "" && toDate != "" {
fromDateParam = utils.Str2Time(fromDate) fromDateParam = utils.Str2Time(fromDate)
toDateParam = utils.Str2Time(toDate) toDateParam = utils.Str2Time(toDate)
actList, _ := dao.QueryActs(db, actID, 0, math.MaxInt32, 0, "", -1, nil, nil, nil, 0, 0, 0, time.Time{}, time.Time{}, time.Time{}, time.Time{}) actList, _ := dao.QueryActs(db, actID, 0, math.MaxInt32, 0, "", -1, nil, nil, nil, 0, 0, 0, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue)
if len(actList.Data) > 0 { if len(actList.Data) > 0 {
actBeginAt := actList.Data[0].BeginAt actBeginAt := actList.Data[0].BeginAt
actEndAt := actList.Data[0].EndAt actEndAt := actList.Data[0].EndAt
@@ -656,7 +656,7 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
return "", errors.New(fmt.Sprintf("未查询到相关结算活动，活动ID：[%d]", actID)) return "", errors.New(fmt.Sprintf("未查询到相关结算活动，活动ID：[%d]", actID))
} }
} else if fromDate == "" && toDate == "" { } else if fromDate == "" && toDate == "" {
actList, _ := dao.QueryActs(db, actID, 0, math.MaxInt32, 0, "", -1, nil, nil, nil, 0, 0, 0, time.Time{}, time.Time{}, time.Time{}, time.Time{}) actList, _ := dao.QueryActs(db, actID, 0, math.MaxInt32, 0, "", -1, nil, nil, nil, 0, 0, 0, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue)
if len(actList.Data) > 0 { if len(actList.Data) > 0 {
orderList, _ = dao.QueryOrders(db, vendorOrderID, actID, vendorIDs, storeID, actList.Data[0].BeginAt, actList.Data[0].EndAt) orderList, _ = dao.QueryOrders(db, vendorOrderID, actID, vendorIDs, storeID, actList.Data[0].BeginAt, actList.Data[0].EndAt)
} else { } else {

2
controllers/yonghui.go
View File

@@ -20,7 +20,7 @@ type YongHuiController struct {
func (c *YongHuiController) LoadExcelByYongHui() { func (c *YongHuiController) LoadExcelByYongHui() {
c.callLoadExcelByYongHui(func(params *tYonghuiLoadExcelByYongHuiParams) (retVal interface{}, errCode string, err error) { c.callLoadExcelByYongHui(func(params *tYonghuiLoadExcelByYongHuiParams) (retVal interface{}, errCode string, err error) {
r := c.Ctx.Request r := c.Ctx.Request
files := r.MultipartForm.File["file"] files := r.MultipartForm.File["userfiles"]
retVal, err = yonghui.LoadExcelByYongHui(params.Ctx, files, params.IsAsync) retVal, err = yonghui.LoadExcelByYongHui(params.Ctx, files, params.IsAsync)
return retVal, "", err return retVal, "", err
}) })