From 0de91127d96f1c2f00462f976daea6057123f366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 17 Mar 2023 10:04:13 +0800
Subject: [PATCH 1/2] 1

---
 business/partner/purchase/jd/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index bfac7e806..52546659b 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -453,7 +453,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 	if err == nil {
 		orderSettlement, _ := getAPI(order.VendorOrgCode).OrderShoudSettlementService2(order.VendorOrderID)
 		UpdateOrderBySettleMent(order, orderSettlement)
-		err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"})
+		err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice", "TotalShopMoney"})
 	}
 	return err
 }

From d6ec56791a545d59e0f69baeefac4fc05aa30377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Sat, 18 Mar 2023 11:05:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/bidding/bidding.go           | 28 +++++++++++++++++++++++++++
 controllers/bidding.go                | 13 +++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++++
 3 files changed, 50 insertions(+)

diff --git a/business/bidding/bidding.go b/business/bidding/bidding.go
index d315c4f40..1d92812f8 100644
--- a/business/bidding/bidding.go
+++ b/business/bidding/bidding.go
@@ -2,6 +2,7 @@ package bidding
 
 import (
 	"fmt"
+	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -101,3 +102,30 @@ func QueryNeedDeleteSku() string {
 	fmt.Println("dd2  ", len(dd))
 	return strings.Join(dd, ",")
 }
+
+func UpdateTiktokOrderPhoneAddress() error {
+	var goodsOrder []*model.GoodsOrder
+	var db = dao.GetDB()
+	sql := `SELECT * FROM goods_order WHERE  order_created_at >= "2023-02-01 00:00:00" AND vendor_id = "14" ORDER BY order_created_at DESC`
+	if err := dao.GetRows(db, &goodsOrder, sql, nil); err != nil {
+		return err
+	}
+
+	for _, v := range goodsOrder {
+		if v.PhoneAscription != "" {
+			continue
+		}
+		ascription, err := ascription_place.Find(v.ConsigneeMobile)
+		if err != nil {
+			v.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
+		} else {
+			if strings.Contains(v.ConsigneeAddress, ascription.Province) && strings.Contains(v.ConsigneeAddress, ascription.City) {
+				v.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City
+			} else {
+				v.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City
+			}
+		}
+		dao.UpdateEntity(db, v, "PhoneAscription")
+	}
+	return nil
+}
diff --git a/controllers/bidding.go b/controllers/bidding.go
index 0ab611689..6a710c901 100644
--- a/controllers/bidding.go
+++ b/controllers/bidding.go
@@ -95,3 +95,16 @@ func (c *BiddingController) NeedDeleteGetStoreBindStatus() {
 		return dd, "", nil
 	})
 }
+
+// UpdateTiktokOrderPhoneAddress 更新抖音电话归属地
+// @Title 更新抖音电话归属地
+// @Description 更新抖音电话归属地
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateTiktokOrderPhoneAddress [get]
+func (c *BiddingController) UpdateTiktokOrderPhoneAddress() {
+	c.callUpdateTiktokOrderPhoneAddress(func(params *tBindUpdateTiktokOrderPhoneAddressParams) (interface{}, string, error) {
+		err := bidding.UpdateTiktokOrderPhoneAddress()
+		return nil, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 9e0dae3e7..241261a5a 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -4215,6 +4215,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"],
+		web.ControllerComments{
+			Method:           "UpdateTiktokOrderPhoneAddress",
+			Router:           `/UpdateTiktokOrderPhoneAddress`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	// 版本设置
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"],
 		web.ControllerComments{