From e56541a548a2e915af655d42aea3f264990287a9 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:00:07 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E5=9C=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jxcallback/auto_delivery/auto_delivery.go | 4 +++- business/model/const.go | 5 +++++ business/model/order.go | 5 +++-- business/partner/purchase/tiktok_store/order.go | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index f53113b4b..c9030077e 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -130,7 +130,9 @@ func AutoSettingFakeDelivery() { if randTime >= int64(len(riderListInfo[riderKey])) { randTime = int64(len(riderListInfo[riderKey])) - 1 } - + if v.PhoneAscription == "" || strings.Split(v.PhoneAscription, "-")[0] != model.PhoneAscriptionAddressYes { + continue + } // 自动拣货 if v.Status < model.OrderStatusFinishedPickup { // 未拣货 handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID) diff --git a/business/model/const.go b/business/model/const.go index 6887061f2..27469a812 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -375,6 +375,11 @@ const ( BusinessTypeDingshida = 2 // 定时达 ) +const ( + PhoneAscriptionAddressYes = "YES" // 抖音订单收货地址和电话号码归属地是否一致 + PhoneAscriptionAddressNo = "No" // 抖音订单收货地址和电话号码归属地是否一致 +) + var ( ElmSkuPromotion = map[int]int{ 11: 1, diff --git a/business/model/order.go b/business/model/order.go index 212e2e3c4..9e19066de 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -158,8 +158,9 @@ type GoodsOrder struct { EarningType int `json:"earningType"` //订单结算方式，2为扣点，1为报价 OrderType int `json:"orderType"` //订单类型，0为普通订单，1为物料订单，2为进货订单 OrderPayPercentage int `json:"orderPayPercentage"` - CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城） - NotifyType int `json:"notifyType"` //0表示没有通知，1表示发的短信，2表示发的语音 + CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城） + NotifyType int `json:"notifyType"` //0表示没有通知，1表示发的短信，2表示发的语音 + PhoneAscription string `orm:"phone_ascription" json:"phoneAscription"` // 电话号码归属地 // 以下只是用于传递数据 OriginalData string `orm:"-" json:"-"` diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 70e2d73c6..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 ( @@ -237,6 +238,21 @@ 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) + 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 } From 5f5b05b0cfd7e144d68cd5859a08fbe2a725a43d 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:03:15 +0800 Subject: [PATCH 2/8] 1 --- .../partner/purchase/tiktok_store/order.go | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index f67501961..6891e4926 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -22,7 +22,6 @@ 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 ( @@ -240,18 +239,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 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 3/8] 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 From f3c5802a031ec1eb2d78243c469d5b1ec509ab88 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:49:35 +0800 Subject: [PATCH 4/8] 1' --- business/partner/purchase/tiktok_store/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index f67501961..d75b52e7b 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -8,6 +8,7 @@ import ( "time" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" + ascriptionPlace "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place" order_getSettleBillDetailV3_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_getSettleBillDetailV3/request" order_logisticsAdd_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_logisticsAdd/request" order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response" @@ -22,7 +23,6 @@ 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 ( @@ -240,7 +240,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s // 抖音订单手机号和收货地址是否同城 order.PhoneAscription = "" - ascription, err := phonedata.Find(order.ConsigneeMobile) + ascription, err := ascriptionPlace.Find(order.ConsigneeMobile) globals.SugarLogger.Debugf("=============ascription=:%s", utils.Format4Output(ascription, false)) globals.SugarLogger.Debugf("=============err=:%v", err) if err != nil { From b333ab9a13d9e2d6eacde44caaffd7c4e56365d0 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 19:34:10 +0800 Subject: [PATCH 5/8] 1 --- business/partner/purchase/tiktok_store/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index d75b52e7b..64b927bc7 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -3,12 +3,12 @@ package tiktok_store import ( "errors" "fmt" + "github.com/xluohome/phonedata" "regexp" "strings" "time" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" - ascriptionPlace "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place" order_getSettleBillDetailV3_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_getSettleBillDetailV3/request" order_logisticsAdd_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_logisticsAdd/request" order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response" @@ -240,7 +240,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s // 抖音订单手机号和收货地址是否同城 order.PhoneAscription = "" - ascription, err := ascriptionPlace.Find(order.ConsigneeMobile) + ascription, err := phonedata.Find(order.ConsigneeMobile) globals.SugarLogger.Debugf("=============ascription=:%s", utils.Format4Output(ascription, false)) globals.SugarLogger.Debugf("=============err=:%v", err) if err != nil { From 35bcefb69c1b6c733957c785ccde2e30c5eec03b 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 19:53:36 +0800 Subject: [PATCH 6/8] 1 --- business/partner/purchase/tiktok_store/order.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 64b927bc7..bc7a42ca6 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -3,7 +3,7 @@ package tiktok_store import ( "errors" "fmt" - "github.com/xluohome/phonedata" + "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place" "regexp" "strings" "time" @@ -240,7 +240,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s // 抖音订单手机号和收货地址是否同城 order.PhoneAscription = "" - ascription, err := phonedata.Find(order.ConsigneeMobile) + //ascription, err := phonedata.Find(order.ConsigneeMobile) + ascription, err := ascription_place.Find(order.ConsigneeMobile) globals.SugarLogger.Debugf("=============ascription=:%s", utils.Format4Output(ascription, false)) globals.SugarLogger.Debugf("=============err=:%v", err) if err != nil { From 08822f90934a85272baca61aae2cf41a3bed3e81 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 19:57:40 +0800 Subject: [PATCH 7/8] 1 --- business/model/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/model/order.go b/business/model/order.go index 9e19066de..a35834342 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -158,9 +158,9 @@ type GoodsOrder struct { EarningType int `json:"earningType"` //订单结算方式，2为扣点，1为报价 OrderType int `json:"orderType"` //订单类型，0为普通订单，1为物料订单，2为进货订单 OrderPayPercentage int `json:"orderPayPercentage"` - CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城） - NotifyType int `json:"notifyType"` //0表示没有通知，1表示发的短信，2表示发的语音 - PhoneAscription string `orm:"phone_ascription" json:"phoneAscription"` // 电话号码归属地 + CouponIDs string `orm:"column(coupon_ids)" json:"couponIDs"` //优惠券IDs（京西商城） + NotifyType int `json:"notifyType"` //0表示没有通知，1表示发的短信，2表示发的语音 + PhoneAscription string `orm:"column(phone_ascription)" json:"phoneAscription"` // 电话号码归属地 // 以下只是用于传递数据 OriginalData string `orm:"-" json:"-"` From fd242ce5e6afd96ed8f61fd4771000014afff511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 13 Mar 2023 10:53:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=96=E9=9F=B3?= =?UTF-8?q?=E5=88=B7=E5=8D=95=E5=8F=B7=E7=A0=81=E5=BD=92=E5=B1=9E=E5=9C=B0?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/tiktok_store/order.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index bc7a42ca6..de7b1f0f5 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -242,15 +242,13 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s order.PhoneAscription = "" //ascription, err := phonedata.Find(order.ConsigneeMobile) ascription, err := ascription_place.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 + "-电话号码异常解析" + order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City } }