- first version of order schedule.

This commit is contained in:
gazebo
2018-07-18 22:52:30 +08:00
parent 15439779b2
commit cc9e1dc5d2
15 changed files with 455 additions and 128 deletions

View File

@@ -3,39 +3,24 @@ package controller
import (
"fmt"
"math"
"strings"
"sync"
"time"
"git.rosy.net.cn/baseapi/platformapi/autonavi"
"github.com/astaxie/beego/orm"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/routinepool"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
_ "git.rosy.net.cn/jx-callback/business/scheduler/defsch" // 导入缺省订单调度器
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
const (
DefaultOrderCacheTimeout = 24 * time.Hour
"github.com/astaxie/beego/orm"
)
var (
OrderManager *OrderController
WaybillManager *WaybillController
routinePool *routinepool.Pool
routinePool *routinepool.Pool
)
type SyncMapWithTimeout struct {
sync.Map
}
func init() {
routinePool = routinepool.New(1000, 1000)
OrderManager = NewOrderManager()
@@ -43,44 +28,6 @@ func init() {
scheduler.CurrentScheduler.RegisterOrderManager(OrderManager)
}
func (m *SyncMapWithTimeout) StoreWithTimeout(key, value interface{}, timeout time.Duration) {
m.Map.Store(key, value)
time.AfterFunc(timeout, func() {
m.Delete(key)
})
}
func (m *SyncMapWithTimeout) Store(key, value interface{}) {
m.StoreWithTimeout(key, value, DefaultOrderCacheTimeout)
}
func SplitUniversalOrderID(universalOrderID string) (orderID string, vendorID int) {
index := strings.Index(universalOrderID, "|")
if index != -1 {
orderID = universalOrderID[:index]
vendorID = int(utils.Str2Int64(universalOrderID[index:]))
} else {
// 800402581000221 jd order
// 3022716176275221584 elm order
orderIDLen := len(universalOrderID)
if orderIDLen == len("800402581000221") {
vendorID = model.VendorIDJD
} else if orderIDLen == len("3022716176275221584") {
vendorID = model.VendorIDELM
} else {
globals.SugarLogger.Errorf("unkown order type:%v", universalOrderID)
vendorID = model.VendorIDUnknown
}
orderID = universalOrderID
}
return orderID, vendorID
}
func ComposeUniversalOrderID(orderID string, vendorID int) string {
// return fmt.Sprintf("%s|%d", orderID, vendorID)
return orderID // 当前用长度就能区分先不加上vendorID
}
func StandardCoordinate2Int(value float64) int {
return int(math.Round(value * 1000000))
}
@@ -172,10 +119,3 @@ func GetDataCityCodeFromOrder(order *model.GoodsOrder) (retVal string, err error
}
return retVal, err
}
func GetJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
if order.JxStoreID != 0 {
return order.JxStoreID
}
return order.StoreID
}

View File

@@ -4,8 +4,10 @@ import (
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
@@ -53,15 +55,18 @@ func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVa
VendorStatus: utils.Int2Str(msg.OrderStatus),
WaybillCreatedAt: utils.Timestamp2Time(int64(msg.UpdateTime)),
}
retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
return retVal
}
// DeliveryPlatformHandler
func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("CreateWaybill order:%v", order)
return nil
billParams := &dadaapi.OperateOrderRequiredParams{
ShopNo: utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的
OriginID: controller.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
OriginID: jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
CargoPrice: controller.IntPrice2Standard(order.SalePrice),
IsPrepay: 0,
ReceiverName: order.ConsigneeName,
@@ -81,6 +86,9 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
}
func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
globals.SugarLogger.Infof("CancelWaybill bill:%v", bill)
return nil
reasonID := dadaapi.ReasonIDOther
reasonMsg := "other reason"
if bill.Status < model.WaybillStatusAccepted {

View File

@@ -4,6 +4,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/elmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
)
@@ -47,7 +48,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
innerMsg.MsgType = msg.Type
controller.CallMsgHandler(func() {
retVal = new(OrderController).onOrderUserUrgeOrder(&innerMsg)
}, controller.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
}, jxutils.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
}
} else if msg.Type >= elmapi.MsgTypeWaybillWait4DeliveryVendor && msg.Type <= elmapi.MsgTypeRejectedSystemError {
var innerMsg elmapi.CallbackWaybillStatusMsg

View File

@@ -4,6 +4,7 @@ import (
"fmt"
"math"
"strings"
"time"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
@@ -11,11 +12,18 @@ import (
"git.rosy.net.cn/baseapi/platformapi/elmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
)
const (
acceptOrderDelay = 5 * time.Minute
fakePickedUp = "fakefinishedpickup"
)
type OrderController struct {
scheduler.BasePurchasePlatform
}
func init() {
@@ -25,21 +33,21 @@ func init() {
func (c *OrderController) OnOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onOrderStatusMsg(msg)
}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
return retVal
}
func (c *OrderController) OnOrderNewMsg(msg map[string]interface{}) (retVal *elmapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onOrderNew(msg)
}, controller.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
}, jxutils.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
return retVal
}
func (c *OrderController) OnOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onOrderCancelRefundMsg(msg)
}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
return retVal
}
@@ -83,6 +91,13 @@ func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (
return elmapi.SuccessResponse
}
err := controller.OrderManager.OnOrderStatusChanged(status)
// 直接跳到拣货完成
if msg.MsgType == elmapi.MsgTypeOrderAccepted {
status.Status = model.OrderStatusFinishedPickup
status.VendorStatus = fakePickedUp
err = controller.OrderManager.OnOrderStatusChanged(status)
}
// if globals.HandleLegacyJxOrder && err == nil {
// c.legacyElmOrderStatusChanged(status)
// }
@@ -210,6 +225,9 @@ func (c *OrderController) spliltCompositeState(compositeState string) (state str
// PurchasePlatformHandler
func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
globals.SugarLogger.Infof("CancelWaybill order:%v", order)
return nil
if isAcceptIt {
err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
} else {
@@ -221,22 +239,35 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// 饿了么没有拣货这个状态,直接返回成功
// 真实流程中也不会调用这个方法,因为接收订单后状态会直接转移到已拣货
func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("CancelWaybill order:%v", order)
return nil
return nil
}
func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
return api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
}
// 饿了么没有这个操作,直接返回成功
func (c *OrderController) SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error) {
func (c *OrderController) Swtich2SelfDeliver(vendorOrderID string) (err error) {
globals.SugarLogger.Infof("Swtich2SelfDeliver order:%v", vendorOrderID)
return nil
return api.ElmAPI.DeliveryBySelfLite(vendorOrderID)
}
func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievering order:%v", order)
return nil
return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
}
func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievered order:%v", order)
return nil
return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
}
func (c *OrderController) GetStatusActionConfig(status int) *scheduler.StatusActionConfig {
return &scheduler.StatusActionConfig{
Timeout: acceptOrderDelay, // 饿了么没有拣货状态,接单后就为拣货完成,所以要延迟接单,否则门店来不及备货
}
}

View File

@@ -6,6 +6,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/elmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
)
@@ -15,7 +16,7 @@ type WaybillController struct {
func (c *WaybillController) OnWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onWaybillStatusMsg(msg)
}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
return retVal
}
@@ -53,12 +54,12 @@ func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatu
WaybillVendorID: model.VendorIDELM,
CourierName: msg.Name,
CourierMobile: msg.Phone,
VendorStatus: c.composeState(msg.State, msg.SubState, elmapi.MsgTypeWaybillWait4DeliveryVendor),
VendorStatus: c.composeState(msg.State, msg.SubState, msg.MsgType),
WaybillCreatedAt: utils.Timestamp2Time(msg.UpdateAt / 1000),
}
return retVal
}
func (c *WaybillController) composeState(state, subState string, msgType int) string {
return fmt.Sprintf("%s-%s-%d", state, subState, msgType)
return fmt.Sprintf("%s-%d", state, msgType)
}

View File

@@ -7,12 +7,15 @@ import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
type OrderController struct {
scheduler.BasePurchasePlatform
}
func init() {
@@ -22,7 +25,7 @@ func init() {
func (c *OrderController) OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onOrderMsg(msg)
}, controller.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
return retVal
}
@@ -164,31 +167,41 @@ func (c *OrderController) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
// PurchasePlatformHandler
func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
globals.SugarLogger.Infof("AcceptOrRefuseOrder order:%v", order)
return nil
_, err = api.JdAPI.OrderAcceptOperate(order.VendorOrderID, isAcceptIt)
return err
}
func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("PickedUpGoods order:%v", order)
return nil
_, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID)
return c.translateOrderRelatedErr(err)
}
func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
func (c *OrderController) Swtich2SelfDeliver(vendorOrderID string) (err error) {
globals.SugarLogger.Infof("Swtich2SelfDeliver order:%v", vendorOrderID)
return nil
_, err = api.JdAPI.ModifySellerDelivery(vendorOrderID)
return c.translateOrderRelatedErr(err)
}
func (c *OrderController) SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error) {
func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievering order:%v", order)
return nil
_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
return c.translateOrderRelatedErr(err)
}
// 京东无此操作,直接返回成功
func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
return nil
}
func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievered order:%v", order)
return nil
_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
return err
}

View File

@@ -4,6 +4,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
)
@@ -13,7 +14,7 @@ type WaybillController struct {
func (c *WaybillController) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
controller.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJD))
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJD))
return retVal
}

View File

@@ -4,6 +4,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/legacyorder"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
@@ -38,7 +39,7 @@ func (c *WaybillController) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionM
VendorStatus: utils.Int2Str(msg.ExceptionCode),
WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
}
order.VendorOrderID, order.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
retVal = mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept")
}, msg.OrderID)
return retVal
@@ -74,17 +75,20 @@ func (c *WaybillController) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (
VendorStatus: utils.Int2Str(msg.Status),
WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
}
retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
return retVal
}
// DeliveryPlatformHandler
func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("CreateWaybill bill:%v", order)
return nil
db := orm.NewOrm()
// 忽略坐标转换错误,即使是转换出错,也只能当成转换成功来处理,底层会有错误日志输出
lngFloat, latFloat, _ := controller.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
billParams := &mtpsapi.CreateOrderByShopParam{
OrderID: controller.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
OrderID: jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid,
ReceiverName: order.ConsigneeName,
ReceiverAddress: order.ConsigneeAddress,
@@ -119,6 +123,9 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
}
func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
globals.SugarLogger.Infof("CancelWaybill bill:%v", bill)
return nil
reasonID := mtpsapi.CancelReasonMerchantOther
reasonMsg := "other reason"
if bill.Status < model.WaybillStatusAccepted {
@@ -148,7 +155,7 @@ func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer)
func (c *WaybillController) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
sql := "SELECT zs_store_id FROM jx_to_zs_store_map WHERE jx_store_id = ?"
var lists []orm.ParamsList
JxStoreID := controller.GetJxStoreIDFromOrder(order)
JxStoreID := jxutils.GetJxStoreIDFromOrder(order)
num, err := db.Raw(sql, JxStoreID).ValuesList(&lists)
if err != nil && num == 1 {
retVal = lists[0][0].(string)

View File

@@ -22,6 +22,7 @@ func NewOrderManager() *OrderController {
func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
db := orm.NewOrm()
order.StatusTime = order.OrderCreatedAt
isDuplicated, err := addOrderOrWaybillStatus(c.order2Status(order), db)
if err == nil && !isDuplicated {
if err = c.saveOrder(order, false, db); err == nil {
@@ -33,6 +34,7 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder) (err error) {
db := orm.NewOrm()
order.StatusTime = order.OrderCreatedAt
status := c.order2Status(order)
isDuplicated, err := addOrderOrWaybillStatus(status, db)
if err == nil && !isDuplicated {
@@ -212,11 +214,21 @@ func (c *OrderController) order2Status(order *model.GoodsOrder) (retVal *model.O
RefVendorID: order.VendorID,
Status: order.Status,
VendorStatus: order.VendorStatus,
StatusTime: order.OrderCreatedAt,
StatusTime: order.StatusTime,
}
return retVal
}
func (c *OrderController) LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) {
db := orm.NewOrm()
order = &model.GoodsOrder{
VendorOrderID: vendorOrderID,
VendorID: vendorID,
}
err = db.Read(order, "VendorOrderID", "VendorID")
return order, err
}
//Waybill
func (c *OrderController) UpdateWaybillVendorID(bill *model.Waybill) (err error) {
db := orm.NewOrm()

View File

@@ -5,6 +5,7 @@ import (
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/legacyorder"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
@@ -138,7 +139,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
jxorder := &legacyorder.Jxorder2{
VenderId: int8(order.VendorID),
OrderId: utils.Str2Int64(order.VendorOrderID),
JxStoreId: utils.Int2Str(GetJxStoreIDFromOrder(order)),
JxStoreId: utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order)),
JxStoreName: order.StoreName,
OrderNum: order.OrderSeq,
OrderStatus: legacyMapOrderStatus(order.Status),
@@ -172,7 +173,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
params := []interface{}{}
for _, sku := range order.Skus {
sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
params = append(params, sku.VendorID, sku.VendorOrderID, sku.JxSkuID, sku.SkuName, GetJxStoreIDFromOrder(order), sku.SalePrice, sku.Count, sku.SkuType, sku.PromotionType, 0, 0, "")
params = append(params, sku.VendorID, sku.VendorOrderID, sku.JxSkuID, sku.SkuName, jxutils.GetJxStoreIDFromOrder(order), sku.SalePrice, sku.Count, sku.SkuType, sku.PromotionType, 0, 0, "")
}
sql = sql[:len(sql)-1] + ";"
if _, err = db.Raw(sql, params...).Exec(); err != nil {