From 380554ac2b16b0f6ce934c7d278e290fc8a36108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 10 Nov 2020 09:14:35 +0800
Subject: [PATCH] kuaidi xianzhi

---
 business/jxstore/cms/job.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 57d1e9bcb..114a27542 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -644,11 +644,11 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
 	}
 	//内蒙古海南统一35
 	//新疆西藏统一45
-	if receiveDeliveryList[0].ParentCode == 150000 || receiveDeliveryList[0].ParentCode == 460000 {
-		dOrder.PayPrice = 3500
-	}
-	if receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 {
-		dOrder.PayPrice = 4500
+	if receiveDeliveryList[0].ParentCode == 150000 || receiveDeliveryList[0].ParentCode == 460000 ||
+		receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 ||
+		sendDeliveryList[0].ParentCode == 150000 || sendDeliveryList[0].ParentCode == 460000 ||
+		sendDeliveryList[0].ParentCode == 650000 || sendDeliveryList[0].ParentCode == 540000 {
+		return errCode, fmt.Errorf("暂不支持该地区的快递业务！")
 	}
 	sendProvinceName := ""
 	receiveProvinceName := ""
@@ -754,6 +754,7 @@ func CancelJdDelivery(ctx *jxcontext.Context, vendorWaybillID, reason string) (e
 	}()
 	if _, err = dao.UpdateEntity(db, dOrder, "Status", "OrderFinishedAt", "Comment"); err != nil {
 		dao.Rollback(db)
+		return
 	}
 	if err = financial.AddIncomeUpdateAccount(db, userBill, model.BillTypeSpJob, dOrder.PayPrice); err != nil {
 		dao.Rollback(db)