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

修改获取方式

Browse Source
This commit is contained in:
邹宗楠
2022-04-01 13:58:52 +08:00
parent 9e565c28db
commit 29d28691cd
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/dao_order.go
View File

@@ -853,7 +853,9 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
` `
if isIncludeSku { if isIncludeSku {
sql += ` sql += `
JOIN order_sku t3 ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id` JOIN order_sku t3 ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id
JOIN sku_name tsn ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id
`
} }
sqlWhere := " WHERE 1 = 1" sqlWhere := " WHERE 1 = 1"
var ( var (

26
business/partner/delivery/fn/waybill.go
View File

@@ -188,17 +188,23 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
// 订单状态 // 订单状态
func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) { func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
order := &model.Waybill{
VendorWaybillID: msg.Param.PartnerOrderCode, cc := &fnpsapi.OrderCallbackParam{}
VendorWaybillID2: utils.Int64ToStr(msg.Param.OrderId), if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
WaybillVendorID: model.VendorIDFengNiao, fmt.Println("==========err:=", err)
CourierName: msg.Param.CarrierDriverName,
CourierMobile: msg.Param.CarrierDriverPhone,
VendorStatus: utils.Int2Str(msg.Param.OrderStatus),
StatusTime: utils.Timestamp2Time(msg.Param.PushTime),
Remark: msg.Param.Description,
} }
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.Param.PartnerOrderCode)
order := &model.Waybill{
VendorWaybillID: cc.PartnerOrderCode,
VendorWaybillID2: utils.Int64ToStr(cc.OrderId),
WaybillVendorID: model.VendorIDFengNiao,
CourierName: cc.CarrierDriverName,
CourierMobile: cc.CarrierDriverPhone,
VendorStatus: utils.Int2Str(cc.OrderStatus),
StatusTime: utils.Timestamp2Time(cc.PushTime),
Remark: cc.Description,
}
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode)
orderStatus, err := strconv.Atoi(order.VendorStatus) orderStatus, err := strconv.Atoi(order.VendorStatus)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err) globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err)