1

business/jxcallback/orderman/orderman_ext.go

@@ -712,29 +712,22 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string,
 	return result, nil
 }
 
-// GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id
-func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) {
-	sql := `
-	SELECT *
+// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
+func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) {
+	sql := `SELECT *
 	FROM order_status t1
-	WHERE t1.ref_vendor_order_id = ? AND t1.vendor_order_id = ? AND t1.vendor_id = ? 
-	`
+	WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?`
 	sqlParams := []interface{}{
-		refVendorOrderID,
-		wayBillId,
-		vendorID,
+		LogisticsId,
+		orderId,
+		vendorId,
 	}
-	if orderType > 0 {
-		sql += " AND t1.order_type = ?"
-		sqlParams = append(sqlParams, orderType)
-	}
-	sql += " ORDER BY t1.status_time, t1.order_type DESC, t1.status"
-
-	db := dao.GetDB()
-	if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil {
+	sql += ` ORDER BY status_time ASC `
+	var result []*model.OrderStatus
+	if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil {
 		return nil, err
 	}
-	return statusList, nil
+	return result, nil
 }
 
 // GetOrderStatusCancelList 取消订单
@@ -1701,15 +1694,15 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst
 	return isFirst, err
 }
 
-// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
-func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) {
+// GetWaybillStatusList 查询订单的运单记录
+func (c *OrderManager) GetWaybillStatusList(orderId, waybillID string, waybillVendorId int) ([]*model.OrderStatus, error) {
 	sql := `SELECT *
 	FROM order_status t1
 	WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?`
 	sqlParams := []interface{}{
-		LogisticsId,
+		waybillID,
 		orderId,
-		vendorId,
+		waybillVendorId,
 	}
 	sql += ` ORDER BY status_time ASC `
 	var result []*model.OrderStatus

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
 	}