- handle mtps create waybill error.

- log accept or decline order error with info level.

business/controller/mtps/waybill.go

@@ -25,6 +25,8 @@ const (
 var (
 	ErrCanNotFindMTPSStore = errors.New("不能找到美团配送站点配置")
 	ErrAddFeeExceeded      = errors.New("美团配送超过基准价太多")
+	ErrStoreNoPriceInfo    = errors.New("找不到门店的美团配送价格信息")
+	ErrStoreNoCoordinate   = errors.New("找不到门店的坐标信息")
 )
 
 type WaybillController struct {
@@ -94,7 +96,7 @@ func (c *WaybillController) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (
 	return retVal
 }
 
-func (c *WaybillController) calculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db orm.Ormer) (delieveryFee, addFee int64) {
+func (c *WaybillController) calculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db orm.Ormer) (deliveryFee, addFee int64, err error) {
 	var lists []orm.ParamsList
 	if db == nil {
 		db = orm.NewOrm()
@@ -108,14 +110,18 @@ func (c *WaybillController) calculateOrderDeliveryFee(order *model.GoodsOrder, b
 	`, JxStoreID).ValuesList(&lists)
 
 	if err == nil && num == 1 {
-		delieveryFee = utils.Str2Int64(lists[0][0].(string))
+		deliveryFee = utils.Str2Int64(lists[0][0].(string))
 	} else {
 		globals.SugarLogger.Warnf("calculateDeliveryFee can not calculate delivery fee for orderID:%s, num:%d, error:%v", order.VendorOrderID, num, err)
-		return 0, 0
+		return 0, 0, ErrStoreNoPriceInfo
 	}
 
 	lng := utils.Str2Float64(lists[0][1].(string))
 	lat := utils.Str2Float64(lists[0][2].(string))
+	if lng == 0 || lat == 0 {
+		globals.SugarLogger.Warnf("calculateDeliveryFee can not calculate delivery fee for orderID:%s, because no coordinate info", order.VendorOrderID)
+		return 0, 0, ErrStoreNoCoordinate
+	}
 	lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
 
 	distance := jxutils.EarthDistance(lat, lng, lat2, lng2) * 1.4
@@ -142,21 +148,23 @@ func (c *WaybillController) calculateOrderDeliveryFee(order *model.GoodsOrder, b
 	} else if totalSeconds >= 21*3600 || totalSeconds <= 6*3600 { // 21:00 -- 06:00
 		addFee += jxutils.StandardPrice2Int(3)
 	}
-	return delieveryFee + addFee, addFee
+	return deliveryFee + addFee, addFee, nil
 }
 
-func (c *WaybillController) calculateBillDeliveryFee(bill *model.Waybill) (delieveryFee, addFee int64) {
+func (c *WaybillController) calculateBillDeliveryFee(bill *model.Waybill) (deliveryFee, addFee int64) {
 	order, err := controller.OrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID)
 	if err != nil {
 		return 0, 0
 	}
-	return c.calculateOrderDeliveryFee(order, bill.StatusTime, nil)
+	deliveryFee, addFee, _ = c.calculateOrderDeliveryFee(order, bill.StatusTime, nil)
+	return deliveryFee, addFee
 }
 
 // DeliveryPlatformHandler
 func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
 	db := orm.NewOrm()
-	_, addFee := c.calculateOrderDeliveryFee(order, time.Now(), db)
+	_, addFee, err := c.calculateOrderDeliveryFee(order, time.Now(), db)
+	if err == nil {
 		if addFee <= maxAddFee {
 			// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
 			lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
@@ -206,6 +214,7 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
 			err = ErrAddFeeExceeded
 			globals.SugarLogger.Infof("CreateWaybill addFee exceeded too much, it's %d", addFee)
 		}
+	}
 	return err
 }
 

business/scheduler/scheduler.go

@@ -135,7 +135,7 @@ func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt
 	globals.SugarLogger.Infof("AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
 	if order.Status == model.OrderStatusNew {
 		if c.IsReallyCallPlatformAPI {
-			err = utils.CallFuncLogError(func() error {
+			err = utils.CallFuncLogErrorWithInfo(func() error {
 				return c.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt)
 			}, "AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
 		}