From ee5e7ffe1825b3bc28aba6f99c2b2c879c4782e1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 5 Nov 2018 22:04:28 +0800
Subject: [PATCH] - TryStr2Time

---
 business/jxcallback/orderman/orderman_ext.go | 33 ++++++++++++++++----
 business/jxstore/promotion/jd_promotion.go   | 12 +++++--
 controllers/promotion.go                     | 12 +++++--
 gen_param_parser.sh                          |  4 ++-
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index f6865fcff..b5cefcad0 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -224,11 +224,18 @@ func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID
 func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string) (excelContent []byte, err error) {
 	globals.SugarLogger.Debugf("ExportMTWaybills from:%s to:%s", fromDateStr, toDateStr)
 
-	fromDate := utils.Str2Time(fromDateStr)
+	fromDate, err := utils.TryStr2Time(fromDateStr)
+	if err != nil {
+		return nil, err
+	}
 	if toDateStr == "" {
 		toDateStr = fromDateStr
 	}
-	toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
+	toDate, err := utils.TryStr2Time(toDateStr)
+	if err != nil {
+		return nil, err
+	}
+	toDate = toDate.Add(24 * time.Hour)
 	var waybills []*tWaybillExt
 	sql := `
 	SELECT t1.*, t2.store_name, IF(t2.store_id <> 0, t2.store_id, t2.jx_store_id) store_id
@@ -265,11 +272,18 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
 func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr)
 
-	fromDate := utils.Str2Time(fromDateStr)
+	fromDate, err := utils.TryStr2Time(fromDateStr)
+	if err != nil {
+		return nil, err
+	}
 	if toDateStr == "" {
 		toDateStr = fromDateStr
 	}
-	toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
+	toDate, err := utils.TryStr2Time(toDateStr)
+	if err != nil {
+		return nil, err
+	}
+	toDate = toDate.Add(24 * time.Hour)
 	pageSize = jxutils.FormalizePageSize(pageSize)
 	if offset < 0 {
 		offset = 0
@@ -388,11 +402,18 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
 func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	globals.SugarLogger.Debugf("GetWaybills from:%s to:%s", fromDateStr, toDateStr)
 
-	fromDate := utils.Str2Time(fromDateStr)
+	fromDate, err := utils.TryStr2Time(fromDateStr)
+	if err != nil {
+		return nil, err
+	}
 	if toDateStr == "" {
 		toDateStr = fromDateStr
 	}
-	toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
+	toDate, err := utils.TryStr2Time(toDateStr)
+	if err != nil {
+		return nil, err
+	}
+	toDate = toDate.Add(24 * time.Hour)
 	pageSize = jxutils.FormalizePageSize(pageSize)
 	if offset < 0 {
 		offset = 0
diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go
index dee38d51d..9afd8ffff 100644
--- a/business/jxstore/promotion/jd_promotion.go
+++ b/business/jxstore/promotion/jd_promotion.go
@@ -469,11 +469,19 @@ func GetJdPromotions(ctx *jxcontext.Context, keyword string, params map[string]i
 	}
 	if params["beginAt"] != nil {
 		sql += " AND t1.begin_at <= ?"
-		sqlParams = append(sqlParams, utils.Str2Time(params["beginAt"].(string)))
+		beginAt, err2 := utils.TryStr2Time(params["beginAt"].(string))
+		if err = err2; err != nil {
+			return nil, err
+		}
+		sqlParams = append(sqlParams, beginAt)
 	}
 	if params["endAt"] != nil {
 		sql += " AND t1.end_at >= ?"
-		sqlParams = append(sqlParams, utils.Str2Time(params["endAt"].(string)))
+		endAt, err2 := utils.TryStr2Time(params["endAt"].(string))
+		if err = err2; err != nil {
+			return nil, err
+		}
+		sqlParams = append(sqlParams, endAt)
 	}
 	days := defSearchDays
 	if params["days"] != nil {
diff --git a/controllers/promotion.go b/controllers/promotion.go
index f5ab20c32..3c1c952cc 100644
--- a/controllers/promotion.go
+++ b/controllers/promotion.go
@@ -34,10 +34,18 @@ func (c *PromotionController) CreatePromotion() {
 		if params.VendorID != model.VendorIDJD {
 			return nil, "", errors.New("当前只支持创建京东促销")
 		}
+		beginAt, err := utils.TryStr2Time(params.BeginAt)
+		if err != nil {
+			return retVal, "", err
+		}
+		endAt, err := utils.TryStr2Time(params.EndAt)
+		if err != nil {
+			return retVal, "", err
+		}
 		promotionParams := &promotion.PromotionParams{
 			Name:        params.Name,
-			BeginAt:     utils.Str2Time(params.BeginAt),
-			EndAt:       utils.Str2Time(params.EndAt),
+			BeginAt:     beginAt,
+			EndAt:       endAt,
 			Type:        params.Type,
 			Advertising: params.Advertising,
 		}
diff --git a/gen_param_parser.sh b/gen_param_parser.sh
index 1a1f33b26..5b7cfd300 100755
--- a/gen_param_parser.sh
+++ b/gen_param_parser.sh
@@ -1,3 +1,5 @@
-rm controllers/param_parser.go
+if [ -f "controllers/param_parser.go" ]; then
+    rm controllers/param_parser.go
+fi
 bee generate docs
 cp swagger/param_parser.go.txt controllers/param_parser.go