From 558ff326358e4c0639598b6be254ff145912cfec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 10 Mar 2023 18:07:11 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tiktok_store/order.go | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 6891e4926..f67501961 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -22,6 +22,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" + "github.com/xluohome/phonedata" ) const ( @@ -239,18 +240,18 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s // 抖音订单手机号和收货地址是否同城 order.PhoneAscription = "" - //ascription, err := phonedata.Find(order.ConsigneeMobile) - //globals.SugarLogger.Debugf("=============ascription=:%s", utils.Format4Output(ascription, false)) - //globals.SugarLogger.Debugf("=============err=:%v", err) - //if err != nil { - // order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error() - //} else { - // if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) { - // order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City - // } else { - // order.PhoneAscription = model.PhoneAscriptionAddressNo + "-电话号码异常解析" - // } - //} + ascription, err := phonedata.Find(order.ConsigneeMobile) + globals.SugarLogger.Debugf("=============ascription=:%s", utils.Format4Output(ascription, false)) + globals.SugarLogger.Debugf("=============err=:%v", err) + if err != nil { + order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error() + } else { + if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) { + order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City + } else { + order.PhoneAscription = model.PhoneAscriptionAddressNo + "-电话号码异常解析" + } + } jxutils.RefreshOrderSkuRelated(order) return order, orderMap, nil