1

business/partner/delivery/dada/waybill.go

@@ -43,6 +43,17 @@ var (
 		"虞山街道":   "虞山镇",
 		"常福街道":   "虞山镇",
 	}
+	complaintReasonsMap = map[int]string{
+		1:  "骑手态度恶劣",
+		2:  "骑手接单后未取货",
+		3:  "骑手取货太慢",
+		4:  "骑手送货太慢",
+		5:  "货品未送达",
+		6:  "货品有损坏",
+		7:  "骑手违规收取顾客其他费用",
+		69: "骑手恶意取消订单",
+		71: "骑手提前点击取货/送达",
+	}
 )
 
 type DeliveryHandler struct {

business/partner/purchase/jdshop/callback.go

@@ -5,14 +5,13 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math"
 	"strings"
 	"time"
 
 	"git.rosy.net.cn/jx-callback/business/authz/autils"
-	"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
-
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	beego "github.com/astaxie/beego/server/web"
 
@@ -476,7 +475,7 @@ func getDataCityCodeFromOrder(order *model.GoodsOrder, db *dao.DaoDB) (retVal st
 	}{}
 	if err = dao.GetRow(db, codeInfo, sql, jxStoreID); err != nil {
 		if err == nil {
-			err = dada.ErrCanNotFindDadaCityCode
+			err = errors.New("不能找到美团配送站点配置")
 		}
 		return "", err
 	}