Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

This commit is contained in:
richboo111
2023-03-13 14:41:52 +08:00
4 changed files with 26 additions and 3 deletions

View File

@@ -3,6 +3,7 @@ package tiktok_store
import (
"errors"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place"
"regexp"
"strings"
"time"
@@ -237,6 +238,20 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID)
order.OrderSeq = orderSeq + 1
// 抖音订单手机号和收货地址是否同城
order.PhoneAscription = ""
//ascription, err := phonedata.Find(order.ConsigneeMobile)
ascription, err := ascription_place.Find(order.ConsigneeMobile)
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.Province + ascription.City
}
}
jxutils.RefreshOrderSkuRelated(order)
return order, orderMap, nil
}