From c530e4db5d81904499118353ecdecc7a9534b5df Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 31 Jan 2023 15:33:51 +0800 Subject: [PATCH] 1 --- business/model/api_config.go | 20 +++++++++---------- business/model/const.go | 5 +++-- business/model/store.go | 4 ++-- .../partner/purchase/tiktok_store/waybill.go | 2 +- globals/beegodb/beegodb.go | 13 ++++++------ globals/globals.go | 4 ++-- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/business/model/api_config.go b/business/model/api_config.go index 6d4936e6c..6415d38af 100644 --- a/business/model/api_config.go +++ b/business/model/api_config.go @@ -30,12 +30,12 @@ const ( VendorIDDada = 101 // 达达配送 VendorIDMTPS = 102 // 美团配送 VendorIDFengNiao = 103 // 蜂鸟配送 - VendorIDDYPS = 104 // 抖音配送 - VendorIDUUPT = 105 //uu跑腿 - VendorJXFakeWL = 300 // 京西假物流 - VendorIDJDWL = 401 // 京东物流 - VendorIDTotalWl = 402 // (综合物流[京东,圆通,申通....]) - VendorIDDeliveryEnd = 500 + //VendorIDDYPS = 104 // 抖音配送 + VendorIDUUPT = 105 //uu跑腿 + VendorJXFakeWL = 300 // 京西假物流 + VendorIDJDWL = 401 // 京东物流 + VendorIDTotalWl = 402 // (综合物流[京东,圆通,申通....]) + VendorIDDeliveryEnd = 500 VendorIDPrinterBegin = 201 VendorIDFeiE = 201 // 飞鹅打印机 @@ -102,8 +102,8 @@ var ( VendorIDDada: "Dada", VendorIDMTPS: "Mtps", VendorIDFengNiao: "Fn", - VendorIDDYPS: "DYPS", - VendorIDUUPT: "UUPT", + //VendorIDDYPS: "DYPS", + VendorIDUUPT: "UUPT", VendorIDFeiE: "Feie", VendorIDXiaoWM: "XiaoWM", @@ -136,8 +136,8 @@ var ( VendorIDMTPS: "美团配送", VendorIDJDWL: "京东物流", VendorIDFengNiao: "蜂鸟配送", - VendorIDDYPS: "抖音配送", - VendorIDUUPT: "UU跑腿", + //VendorIDDYPS: "抖音配送", + VendorIDUUPT: "UU跑腿", VendorIDFeiE: "飞鹅", VendorIDXiaoWM: "外卖管家", diff --git a/business/model/const.go b/business/model/const.go index 95d21c2e4..815a46e8f 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -525,9 +525,10 @@ func WaybillVendorID2Mask(vendorID int) (mask int8) { mask = OrderDeliveryFlagMaskDada } else if vendorID == VendorIDMTPS { mask = OrderDeliveryFlagMaskMtps - } else if vendorID == VendorIDDYPS { - mask = OrderDeliveryFlagMaskDYPS } + //else if vendorID == VendorIDDYPS { + // mask = OrderDeliveryFlagMaskDYPS + //} return mask } diff --git a/business/model/store.go b/business/model/store.go index 494e1825f..763dcdb04 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -299,8 +299,8 @@ var ( VendorIDMTPS: BrandOpenMTPS, VendorIDDada: BrandOpenDaDa, VendorIDFengNiao: BrandOpenFN, - VendorIDDYPS: BrandOpenDYPS, - VendorIDUUPT: BrandOpenUUPT, + //VendorIDDYPS: BrandOpenDYPS, + VendorIDUUPT: BrandOpenUUPT, } ) diff --git a/business/partner/purchase/tiktok_store/waybill.go b/business/partner/purchase/tiktok_store/waybill.go index 862f99783..8ab4863d6 100644 --- a/business/partner/purchase/tiktok_store/waybill.go +++ b/business/partner/purchase/tiktok_store/waybill.go @@ -57,7 +57,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac VendorOrderID: utils.Int64ToStr(req.ShopOrderID), OrderVendorID: model.VendorIDDD, VendorWaybillID: req.TrackNo, - WaybillVendorID: model.VendorIDDYPS, + WaybillVendorID: model.VendorIDDD, CourierName: req.RiderName, CourierMobile: req.RiderPhone, VendorStatus: utils.Int64ToStr(req.ShipmentStatus), diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index d2590df44..b2b3d56a8 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -6,24 +6,25 @@ import ( "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/client/orm" + "github.com/astaxie/beego/server/web" ) func Init() { // set default database // orm.RegisterDataBase(aliasName, driverName, dataSource, params) //正式服务器 - //orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) - //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) + orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 本地测试服调试 // orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") //本地服务器测试用 -ysq - orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 开启sql打印 //orm.Debug = true diff --git a/globals/globals.go b/globals/globals.go index a01194dff..d8bdf7dc0 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -101,8 +101,8 @@ func Init() { } SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) - //ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") - ReallyCallPlatformAPI = true //本地测试用-ysq + ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") + //ReallyCallPlatformAPI = true //本地测试用-ysq ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() AliKey = web.AppConfig.DefaultString("aliKey", "")