From e74e1d15480381c45fdc485c4b476c090125a3d1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 6 Mar 2019 09:51:10 +0800
Subject: [PATCH] - fix err bug in jd.GetOrder

---
 business/partner/purchase/jd/jd.go    | 12 ++++++++++--
 business/partner/purchase/jd/order.go |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go
index 1497e8767..6e162e4be 100644
--- a/business/partner/purchase/jd/jd.go
+++ b/business/partner/purchase/jd/jd.go
@@ -1,6 +1,8 @@
 package jd
 
 import (
+	"errors"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -25,11 +27,17 @@ func (c *PurchaseHandler) GetVendorID() int {
 }
 
 func OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
-	return curPurchaseHandler.OnOrderMsg(msg)
+	if retVal = curPurchaseHandler.OnOrderMsg(msg); retVal == nil {
+		retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "")
+	}
+	return retVal
 }
 
 func OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
-	return curPurchaseHandler.OnWaybillMsg(msg)
+	if retVal = curPurchaseHandler.OnWaybillMsg(msg); retVal == nil {
+		retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "")
+	}
+	return retVal
 }
 
 func JdOperationTime2JxOperationTime(value1 interface{}) int16 {
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 1b1741ed4..0410e3465 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -69,7 +69,7 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 		result2 string
 		err2    error
 	)
-	task := tasksch.NewParallelTask("jd GetOrder", nil, "admin", func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	task := tasksch.NewParallelTask("jd GetOrder", nil, "admin", func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, errInner error) {
 		taskIndex := batchItemList[0].(int)
 		switch taskIndex {
 		case 0: