Merge remote-tracking branch 'origin/mark' into jdshop

business/partner/purchase/ebai/order.go

@@ -3,6 +3,7 @@ package ebai
 import (
 	"fmt"
 	"math"
+	"strings"
 	"time"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -700,6 +701,11 @@ func (c *PurchaseHandler) GetWaybillTip(ctx *jxcontext.Context, vendorOrgCode, v
 func (c *PurchaseHandler) UpdateWaybillTip(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID, vendorOrderID, vendorWaybillID, vendorWaybillID2, cityCode string, tipFee int64) (err error) {
 	if globals.EnableEbaiStoreWrite {
 		err = api.EbaiAPI.ModifyTip4OrderWaybill(vendorOrderID, "", jxutils.IntPrice2Standard(tipFee), 0)
+		if err != nil {
+			if strings.Contains(err.Error(), "HTTP code is not 200") {
+				return fmt.Errorf("饿百此订单暂不支持加小费！")
+			}
+		}
 	}
 	return err
 }