liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
richboo111
2023-01-11 10:56:31 +08:00
parent 4dcf485953
commit da46891379
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/purchase/tiktok_store/waybill.go
View File

@@ -39,6 +39,7 @@ func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *t
map[string]interface{}{ map[string]interface{}{
"vendorOrderID": waybill.VendorOrderID, "vendorOrderID": waybill.VendorOrderID,
}, 0, 0); err == nil { }, 0, 0); err == nil {
err := partner.CurOrderManager.OnWaybillStatusChanged(waybill) err := partner.CurOrderManager.OnWaybillStatusChanged(waybill)
if err == nil && waybill.Status == model.WaybillStatusDelivering { if err == nil && waybill.Status == model.WaybillStatusDelivering {
c.postFakeMsg(waybill.VendorOrderID, FakeMsgType, utils.Int2Str(tiktok_api.ShipmentStatusDelivering), localOrder[0].VendorStoreID) c.postFakeMsg(waybill.VendorOrderID, FakeMsgType, utils.Int2Str(tiktok_api.ShipmentStatusDelivering), localOrder[0].VendorStoreID)
@@ -50,7 +51,6 @@ func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *t
func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interface{}) (retVal *model.Waybill) { func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interface{}) (retVal *model.Waybill) {
req := data.(tiktok_api.ShipmentInfoData) req := data.(tiktok_api.ShipmentInfoData)
vendorOrgCode, _ := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDDD, utils.Int64ToStr(req.ShopID), "")
return &model.Waybill{ return &model.Waybill{
VendorOrderID: utils.Int64ToStr(req.ShopOrderID), VendorOrderID: utils.Int64ToStr(req.ShopOrderID),
OrderVendorID: model.VendorIDDD, OrderVendorID: model.VendorIDDD,
@@ -63,7 +63,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac
StatusTime: utils.Str2Time(req.OccurredTime), StatusTime: utils.Str2Time(req.OccurredTime),
//StatusTime: getTimeFromTimestamp(utils.Str2Int64(req.OccurredTime)), //StatusTime: getTimeFromTimestamp(utils.Str2Int64(req.OccurredTime)),
Remark: "", Remark: "",
VendorOrgCode: vendorOrgCode.VendorOrgCode, VendorOrgCode: utils.Int64ToStr(req.ShopID), //为抖音账号ID
} }
} }

2
globals/globals.go
View File

@@ -102,7 +102,7 @@ func Init() {
SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode)
ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test")
//ReallyCallPlatformAPI = true //本地测试用 //ReallyCallPlatformAPI = true //本地测试用-ysq
ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv()
AliKey = web.AppConfig.DefaultString("aliKey", "") AliKey = web.AppConfig.DefaultString("aliKey", "")