- fix err bug in jd.GetOrder

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 {

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: