From 0ccaf81be8d4ac98f3a1775f37f74d1d24a92deb Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 28 Jun 2018 10:11:04 +0800
Subject: [PATCH] - jdapi.Err2CallbackResponse added.

---
 platformapi/jdapi/callback.go | 11 +++++++++++
 utils/utils.go                |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go
index 06497546..fc87d2d1 100644
--- a/platformapi/jdapi/callback.go
+++ b/platformapi/jdapi/callback.go
@@ -44,6 +44,17 @@ var (
 	FormatErrorResponse = &CallbackResponse{Code: "-1", Msg: "failed", Data: ""}
 )
 
+func Err2CallbackResponse(err error, data string) *CallbackResponse {
+	if err == nil {
+		return SuccessResponse
+	}
+	return &CallbackResponse{
+		Code: ResponseCodeAccessFailed,
+		Msg:  err.Error(),
+		Data: data,
+	}
+}
+
 func (a *API) unmarshalData(strData string, msg interface{}) (callbackResponse *CallbackResponse) {
 	err := utils.UnmarshalUseNumber([]byte(strData), msg)
 	if err != nil {
diff --git a/utils/utils.go b/utils/utils.go
index 1915ab9e..25a283ec 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -235,11 +235,12 @@ func MergeMaps(firstMap map[string]interface{}, otherMaps ...map[string]interfac
 	return retVal
 }
 
-func CallFuncLogError(funcToCall func() error, msg string) {
+func CallFuncLogError(funcToCall func() error, msg string) error {
 	err := funcToCall()
 	if err != nil {
 		baseapi.SugarLogger.Warnf("%s, error:%v", err.Error())
 	}
+	return err
 }
 
 func Params2Map(key1, value1 interface{}, kv ...interface{}) (retVal map[string]interface{}) {