From 65a530b33b6af7d37ad24348af9f6dce9cc2c50a Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Mon, 15 Aug 2022 14:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E5=9C=B0=E5=9D=80=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/q_bida/q_bida_server.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index f85df5a03..0afa30338 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -12,6 +12,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
+	"strings"
 	"time"
 )
 
@@ -39,6 +40,15 @@ var LogisticsCompany = []int{
 	bida.JDLogisticsExpressInt,
 	bida.DBLogisticsExpressInt,
 }
+var Citys = []string{
+	"重庆市",
+	"北京市",
+	"上海市",
+	"天津市",
+	"香港",
+	"澳门",
+	"台湾",
+}
 
 const MarkupAmount = 50 // 每公斤加价五毛
 
@@ -47,7 +57,18 @@ func QueryExpressPrice(param *bida.GetExpressPriceReq) (map[string]*bida.GetExpr
 	if param.Weight <= 0 {
 		return nil, errors.New("物品重量必须大于0")
 	}
-
+	//判断地址是否为直辖市
+	for _, v := range Citys {
+		//寄件
+		if find := strings.Contains(param.SendAddress, v); find {
+			param.SendAddress = strings.Join([]string{v}, param.SendAddress)
+		}
+		//收件
+		if find2 := strings.Contains(param.ReceiveAddress, v); find2 {
+			param.ReceiveAddress = strings.Join([]string{v}, param.ReceiveAddress)
+		}
+	}
+	globals.SugarLogger.Debug("检测param是否加上前缀", param.SendAddress, param.ReceiveAddress)
 	// 给快递默认值
 	result := make(map[string]*bida.GetExpressPriceRes, 0)
 	if param.Type == 0 {