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

- add SaveOrder to IOrderManager

Browse Source 
- add Map2Order to IPurchasePlatformHandler
This commit is contained in:
gazebo
2019-02-12 14:30:16 +08:00
parent 74cc139742
commit ced25499c4
7 changed files with 322 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
status.VendorStatus = msgVendorStatus
isDuplicated, err := addOrderOrWaybillStatus(status, db)
if err == nil && !isDuplicated {
if isDuplicated, err = c.saveOrder(order, false, db); err == nil && !isDuplicated {
if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated {
err = scheduler.CurrentScheduler.OnOrderNew(order, false)
}
}
@@ -108,7 +108,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus st
if err != nil {
return err
}
if isDuplicated, err = c.saveOrder(order, true, db); err == nil && !isDuplicated {
if isDuplicated, err = c.SaveOrder(order, true, db); err == nil && !isDuplicated {
// 因为订单调度器需要的是真实状态，所以用order的状态
err = scheduler.CurrentScheduler.OnOrderNew(order, false)
err = scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), false)
@@ -125,8 +125,7 @@ func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err
return err
}
// private
func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) {
func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) {
// 忽略查找JX信息错误
c.updateOrderOtherInfo(order, db)
order.ID = 0