This commit is contained in:
邹宗楠
2023-07-03 11:42:53 +08:00
parent 70c727da82
commit cbb0368e1f
2 changed files with 14 additions and 13 deletions

View File

@@ -14,7 +14,6 @@ import (
domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain" domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain"
request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request" request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util"
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -186,18 +185,19 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
v.IsVendorAct = model.YES v.IsVendorAct = model.YES
} }
} }
// 抖音订单手机号和收货地址是否同城 // 抖音订单手机号和收货地址是否同城(虚拟号,无法获取到正确地址)
order.PhoneAscription = "" order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + "虚拟电话号码"
ascription, err := ascription_place.Find(order.ConsigneeMobile) //ascription, err := ascription_place.Find(order.ConsigneeMobile)
if err != nil { //if err != nil {
order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error() // order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
} else { // err = nil
if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) { //} else {
order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City // if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) {
} else { // order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City
order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City // } else {
} // order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City
} // }
//}
// 本地获取订单记录 // 本地获取订单记录
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDTaoVegetable, order.VendorStoreID) orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDTaoVegetable, order.VendorStoreID)

View File

@@ -227,6 +227,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
ascription, err := ascription_place.Find(order.ConsigneeMobile) ascription, err := ascription_place.Find(order.ConsigneeMobile)
if err != nil { if err != nil {
order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error() order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
err = nil
} else { } else {
if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) { if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) {
order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City