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

还原

Browse Source
This commit is contained in:
邹宗楠
2021-12-01 18:42:48 +08:00
parent 89b782bbf4
commit c665b73167
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/order.go
View File

@@ -1508,7 +1508,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
if len(order.VendorOrderID2) > 18 { if len(order.VendorOrderID2) > 18 {
order.VendorOrderID2 = order.VendorOrderID2[0:12] order.VendorOrderID2 = order.VendorOrderID2[0:12]
} }
order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100) + utils.Int2Str(time.Now().Second()) order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10000000) + utils.Int2Str(time.Now().Second())
if len(order.VendorOrderID) < 18 { if len(order.VendorOrderID) < 18 {
order.VendorOrderID = order.VendorOrderID + "0" order.VendorOrderID = order.VendorOrderID + "0"
} }
@@ -1987,7 +1987,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
continue continue
} }
//有可能是库里已经有这个订单了 //有可能是库里已经有这个订单了
orderE, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(jdsOrder.OrderID)+"001", model.VendorIDJDShop) orderE, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(jdsOrder.OrderID)+"00000001", model.VendorIDJDShop)
if orderE != nil { if orderE != nil {
continue continue
} }
@@ -1999,7 +1999,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
} }
order := &model.GoodsOrder{ order := &model.GoodsOrder{
VendorOrderID2: utils.Int64ToStr(jdsOrder.OrderID), VendorOrderID2: utils.Int64ToStr(jdsOrder.OrderID),
VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID) + "001", VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID) + "00000001",
VendorID: model.VendorIDJDShop, VendorID: model.VendorIDJDShop,
BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight), BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
VendorStatus: utils.Int2Str(jdsOrder.OrderStatus), VendorStatus: utils.Int2Str(jdsOrder.OrderStatus),

4
business/partner/purchase/jdshop/callback.go
View File

@@ -98,13 +98,13 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
db = dao.GetDB() db = dao.GetDB()
) )
//有可能是库里已经有这个订单了 //有可能是库里已经有这个订单了
orderE, err := partner.CurOrderManager.LoadOrder(msg.OrderID+"001", model.VendorIDJDShop) orderE, err := partner.CurOrderManager.LoadOrder(msg.OrderID+"00000001", model.VendorIDJDShop)
if orderE != nil { if orderE != nil {
return order, fmt.Errorf("已经存在此订单！") return order, fmt.Errorf("已经存在此订单！")
} }
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID2: msg.OrderID, VendorOrderID2: msg.OrderID,
VendorOrderID: msg.OrderID + "001", VendorOrderID: msg.OrderID + "00000001",
VendorID: model.VendorIDJDShop, VendorID: model.VendorIDJDShop,
BaseFreightMoney: jxutils.StandardPrice2Int(utils.Str2Float64(msg.FreightPrice)), BaseFreightMoney: jxutils.StandardPrice2Int(utils.Str2Float64(msg.FreightPrice)),
VendorStatus: msg.OrderState, VendorStatus: msg.OrderState,