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

sfps

Browse Source
This commit is contained in:
richboo111
2023-05-29 10:24:43 +08:00
parent 14c8c32e47
commit d0ff027799
6 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/api_config.go
View File

@@ -107,6 +107,7 @@ var (
VendorIDDada: "Dada", VendorIDDada: "Dada",
VendorIDMTPS: "Mtps", VendorIDMTPS: "Mtps",
VendorIDFengNiao: "Fn", VendorIDFengNiao: "Fn",
VendorIDSFPS: "Sfps",
//VendorIDDYPS: "DYPS", //VendorIDDYPS: "DYPS",
VendorIDUUPT: "UUPT", VendorIDUUPT: "UUPT",
@@ -143,6 +144,7 @@ var (
VendorIDMTPS: "美团配送", VendorIDMTPS: "美团配送",
VendorIDJDWL: "京东物流", VendorIDJDWL: "京东物流",
VendorIDFengNiao: "蜂鸟配送", VendorIDFengNiao: "蜂鸟配送",
VendorIDSFPS: "顺丰派送",
//VendorIDDYPS: "抖音配送", //VendorIDDYPS: "抖音配送",
VendorIDUUPT: "UU跑腿", VendorIDUUPT: "UU跑腿",

3
business/model/store.go
View File

@@ -35,7 +35,7 @@ const (
BrandOpenMTPS = 1 //品牌开关标志, 美团配送 BrandOpenMTPS = 1 //品牌开关标志, 美团配送
BrandOpenDaDa = 2 //达达 BrandOpenDaDa = 2 //达达
BrandOpenFN = 4 //蜂鸟 BrandOpenFN = 4 //蜂鸟
BrandOpenDYPS = 5 //抖音配送 BrandOpenSFPS = 5 //顺丰派送
BrandOpenUUPT = 6 //uu跑腿 BrandOpenUUPT = 6 //uu跑腿
BrandOpenSMS = 8 //短信 BrandOpenSMS = 8 //短信
BrandOpenVoice = 16 //语音 BrandOpenVoice = 16 //语音
@@ -301,6 +301,7 @@ var (
VendorIDMTPS: BrandOpenMTPS, VendorIDMTPS: BrandOpenMTPS,
VendorIDDada: BrandOpenDaDa, VendorIDDada: BrandOpenDaDa,
VendorIDFengNiao: BrandOpenFN, VendorIDFengNiao: BrandOpenFN,
VendorIDSFPS: BrandOpenSFPS,
//VendorIDDYPS: BrandOpenDYPS, //VendorIDDYPS: BrandOpenDYPS,
VendorIDUUPT: BrandOpenUUPT, VendorIDUUPT: BrandOpenUUPT,
} }

30
business/partner/delivery/sfps/waybill.go
View File

@@ -132,18 +132,22 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
} }
param.OrderDetail.ProductDetail = productDetail param.OrderDetail.ProductDetail = productDetail
sfOrderID, sfBillID, sfTotalPrice, err := api.SfPsAPI.CreateOrder(param) sfOrderID, sfBillID, sfTotalPrice, sfReallyPrice, err := api.SfPsAPI.CreateOrder(param)
if err != nil { if err != nil {
return nil, err return nil, err
} }
//+0.2
desiredFee := utils.Float64TwoInt(sfTotalPrice) + utils.WayBillDeliveryMarkUp
bill = &model.Waybill{ bill = &model.Waybill{
VendorOrderID: order.VendorOrderID, VendorOrderID: order.VendorOrderID,
OrderVendorID: order.VendorID, OrderVendorID: order.VendorID,
VendorWaybillID: sfOrderID, VendorWaybillID: sfOrderID,
VendorWaybillID2: sfBillID, VendorWaybillID2: sfBillID,
WaybillVendorID: model.VendorIDFengNiao, WaybillVendorID: model.VendorIDFengNiao,
DesiredFee: int64(sfTotalPrice), DesiredFee: int64(desiredFee),
ActualFee: utils.Float64TwoInt64(sfReallyPrice),
} }
delivery.OnWaybillCreated(bill) delivery.OnWaybillCreated(bill)
return bill, err return bill, err
@@ -190,7 +194,10 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
} }
deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo = &partner.WaybillFeeInfo{}
price, err := api.SfPsAPI.PreCreateOrder(param) price, err := api.SfPsAPI.PreCreateOrder(param)
deliveryFeeInfo.DeliveryFee = jxutils.StandardPrice2Int(price) //+0.2
deliveryFee := utils.Float64TwoInt(price) + utils.WayBillDeliveryMarkUp
deliveryFeeInfo.DeliveryFee = int64(deliveryFee)
return deliveryFeeInfo, err return deliveryFeeInfo, err
} }
@@ -208,7 +215,7 @@ func (d DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId s
if deductionFee == 0 || err != nil { if deductionFee == 0 || err != nil {
return 0, err return 0, err
} }
money = jxutils.StandardPrice2Int(deductionFee) money = utils.Float64TwoInt64(deductionFee)
return money, nil return money, nil
} }
@@ -283,6 +290,10 @@ func OnWaybillMsg(msg *sfps2.RiderStatus) (resp *sfps2.CallbackResponse) {
if err != nil { if err != nil {
return sfps2.Err2CallbackResponse(err) return sfps2.Err2CallbackResponse(err)
} }
//+0.2
sfTotalPrice := utils.Float64TwoInt(sfOrder.TotalPrice) + utils.WayBillDeliveryMarkUp
sfActualPrice := utils.Float64TwoInt64(sfOrder.RealPayMoney)
var good *model.GoodsOrder var good *model.GoodsOrder
sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
sqlParams := []interface{}{msg.ShopOrderID} sqlParams := []interface{}{msg.ShopOrderID}
@@ -292,20 +303,21 @@ func OnWaybillMsg(msg *sfps2.RiderStatus) (resp *sfps2.CallbackResponse) {
orderStatus := utils.Str2Int64(order.VendorStatus) orderStatus := utils.Str2Int64(order.VendorStatus)
switch orderStatus { switch orderStatus {
case sfps2.OrderStatusNewOrder: //1：订单创建 case sfps2.OrderStatusNewOrder: //1：订单创建
order.DesiredFee = jxutils.StandardPrice2Int(sfOrder.TotalPrice) order.DesiredFee = int64(sfTotalPrice)
order.ActualFee = sfActualPrice
order.Status = model.WaybillStatusNew //5 带调度 order.Status = model.WaybillStatusNew //5 带调度
case sfps2.OrderStatusTakeOrder: //10：配送员接单 case sfps2.OrderStatusTakeOrder: //10：配送员接单
order.DesiredFee = jxutils.StandardPrice2Int(sfOrder.TotalPrice) order.DesiredFee = int64(sfTotalPrice)
order.Status = model.WaybillStatusCourierAssigned //12 order.Status = model.WaybillStatusCourierAssigned //12
order.Remark = order.CourierName + "，" + order.CourierMobile order.Remark = order.CourierName + "，" + order.CourierMobile
case sfps2.OrderStatusArrivedStore: case sfps2.OrderStatusArrivedStore:
order.DesiredFee = jxutils.StandardPrice2Int(sfOrder.TotalPrice) order.DesiredFee = int64(sfTotalPrice)
order.Status = model.WaybillStatusCourierArrived order.Status = model.WaybillStatusCourierArrived
case sfps2.OrderStatusRiderArriving: case sfps2.OrderStatusRiderArriving:
order.DesiredFee = jxutils.StandardPrice2Int(sfOrder.TotalPrice) order.DesiredFee = int64(sfTotalPrice)
order.Status = model.WaybillStatusDelivering order.Status = model.WaybillStatusDelivering
case sfps2.OrderStatusFinished: case sfps2.OrderStatusFinished:
order.DesiredFee = jxutils.StandardPrice2Int(sfOrder.TotalPrice) order.DesiredFee = int64(sfTotalPrice)
order.Status = model.WaybillStatusDelivered order.Status = model.WaybillStatusDelivered
case sfps2.OrderStatusOrderCancel: case sfps2.OrderStatusOrderCancel:
order.Status = model.WaybillStatusCanceled order.Status = model.WaybillStatusCanceled

26
conf/app.conf
View File

@@ -208,6 +208,13 @@ fnCode = "uDEyAmTbrfS2qjYbgi20Jm"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.jxc4.com/fn/msg" fnCallbackURL = "http://callback.jxc4.com/fn/msg"
#顺丰派送
sfpsAppID = 1663705444
sfpsAppKey = "600e22db5deb6402e527e58f0d6636a0"
sfpsTestAppID = 1663705378
sfpsTestAppKey = "0838426b310fd2530c57dd6e770ddff1"
# 快手授权地址 # 快手授权地址
kuaiShouAppId = "ks680887971696897880" kuaiShouAppId = "ks680887971696897880"
kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA" kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA"
@@ -356,6 +363,12 @@ fnCode = "uDEyAmTbrfS2qjYbgi20Jm"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.jxc4.com/fn/msg" fnCallbackURL = "http://callback.jxc4.com/fn/msg"
#顺丰派送
sfpsAppID = 1663705444
sfpsAppKey = "600e22db5deb6402e527e58f0d6636a0"
sfpsTestAppID = 1663705378
sfpsTestAppKey = "0838426b310fd2530c57dd6e770ddff1"
# 快手授权地址 # 快手授权地址
kuaiShouAppId = "ks680887971696897880" kuaiShouAppId = "ks680887971696897880"
kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA" kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA"
@@ -479,6 +492,13 @@ fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg" fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg"
#顺丰派送
sfpsAppID = 1663705444
sfpsAppKey = "600e22db5deb6402e527e58f0d6636a0"
sfpsTestAppID = 1663705378
sfpsTestAppKey = "0838426b310fd2530c57dd6e770ddff1"
# 快手授权地址 # 快手授权地址
kuaiShouAppId = "ks680887971696897880" kuaiShouAppId = "ks680887971696897880"
kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA" kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA"
@@ -683,6 +703,12 @@ fnCode = "uDEyAmTbrfS2qjYbgi20Jm"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.test.jxc4.com/fn/msg" fnCallbackURL = "http://callback.test.jxc4.com/fn/msg"
#顺丰派送
sfpsAppID = 1663705444
sfpsAppKey = "600e22db5deb6402e527e58f0d6636a0"
sfpsTestAppID = 1663705378
sfpsTestAppKey = "0838426b310fd2530c57dd6e770ddff1"
# 快手授权地址 # 快手授权地址
kuaiShouAppId = "ks680887971696897880" kuaiShouAppId = "ks680887971696897880"
kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA" kuaiShouAppSecret = "1wShCPqUzhg8W1vcb8OdvA"

3
globals/api/api.go
View File

@@ -311,6 +311,9 @@ func Init() {
} }
FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", ""))
//测试
SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", ""))
//SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", ""))
UuAPI = uuptapi.New(beego.AppConfig.DefaultString("uuAppID", ""), beego.AppConfig.DefaultString("uuAppKey", ""), beego.AppConfig.DefaultString("uuOpenID", "")) UuAPI = uuptapi.New(beego.AppConfig.DefaultString("uuAppID", ""), beego.AppConfig.DefaultString("uuAppKey", ""), beego.AppConfig.DefaultString("uuOpenID", ""))
FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", ""))
XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", ""))

13
globals/beegodb/beegodb.go
View File

@@ -6,24 +6,25 @@ import (
"git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/client/orm" "github.com/astaxie/beego/client/orm"
"github.com/astaxie/beego/server/web"
) )
func Init() { func Init() {
// set default database // set default database
// orm.RegisterDataBase(aliasName, driverName, dataSource, params) // orm.RegisterDataBase(aliasName, driverName, dataSource, params)
//正式服务器 //正式服务器
//orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) 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("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("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("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("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") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
//本地服务器测试用 -ysq //本地服务器测试用 -ysq
orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?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("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("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
// 开启sql打印 // 开启sql打印
//orm.Debug = true //orm.Debug = true