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

订单序号

Browse Source
This commit is contained in:
苏尹岚
2020-06-19 11:18:38 +08:00
parent c671db77f1
commit fd910b2da0
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1075,7 +1075,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) + "01", VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID) + "001",
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),
@@ -1091,6 +1091,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
Status: model.OrderStatusNew, Status: model.OrderStatusNew,
TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)), TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)),
DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled, DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled,
DeliveryType: model.OrderDeliveryTypeStoreSelf,
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
OrderSeq: 0, OrderSeq: 0,
} }
@@ -1160,10 +1161,17 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
return orders, err return orders, err
} }
func setJdsOrderSeq(orders *model.GoodsOrder) { func setJdsOrderSeq(order *model.GoodsOrder) (err error) {
// sql := ` var count int
// SELECT * FROM sql := `
// ` SELECT count(*) FROM goods_order WHERE store_id = ? AND order_create_at >= ? AND order_create_at <= ? AND vendor_id = ?
`
sqlParams := []interface{}{
order.StoreID, utils.Time2Date(time.Now()), utils.Time2Date(time.Now().AddDate(0, 0, 1)), order.VendorID,
}
err = dao.GetRow(dao.GetDB(), &count, sql, sqlParams)
order.OrderSeq = count + 1
return err
} }
func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) (vendorOrderIDJds string, err error) { func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) (vendorOrderIDJds string, err error) {
@@ -1222,7 +1230,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
if len(order.VendorOrderID) > 12 { if len(order.VendorOrderID) > 12 {
suffix := utils.Str2Int(order.VendorOrderID[12:len(order.VendorOrderID)]) suffix := utils.Str2Int(order.VendorOrderID[12:len(order.VendorOrderID)])
suffix++ suffix++
order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*10) + utils.Int2Str(suffix) order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100) + utils.Int2Str(suffix)
} }
for _, sku := range skus { for _, sku := range skus {
sku.VendorOrderID = order.VendorOrderID sku.VendorOrderID = order.VendorOrderID
@@ -1233,6 +1241,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
order.DeliveryFlag = model.NO order.DeliveryFlag = model.NO
} }
order.Status = model.OrderStatusNew order.Status = model.OrderStatusNew
setJdsOrderSeq(order)
err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)) err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
vendorOrderIDJds = order.VendorOrderID vendorOrderIDJds = order.VendorOrderID
return vendorOrderIDJds, err return vendorOrderIDJds, err

2
business/jxutils/jxutils.go
View File

@@ -161,6 +161,8 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
vendorID = model.VendorIDWSC vendorID = model.VendorIDWSC
} else if orderIDLen == len("1000004390") { } else if orderIDLen == len("1000004390") {
vendorID = model.VendorIDJX vendorID = model.VendorIDJX
} else if orderIDLen == len("124557362562002") {
vendorID = model.VendorIDJDShop
} }
} }
return vendorID return vendorID