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

- only set status.Status = model.OrderStatusNew when status.Status > model.OrderStatusNew in OnOrderNew

Browse Source
This commit is contained in:
gazebo
2019-01-25 10:26:21 +08:00
parent 8100e2be88
commit 963d2e2622
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,9 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
order.Status = model.OrderStatusNew order.Status = model.OrderStatusNew
} }
status := model.Order2Status(order) status := model.Order2Status(order)
status.Status = model.OrderStatusNew if status.Status > model.OrderStatusNew {
status.Status = model.OrderStatusNew
}
status.VendorStatus = msgVendorStatus status.VendorStatus = msgVendorStatus
isDuplicated, err := addOrderOrWaybillStatus(status, db) isDuplicated, err := addOrderOrWaybillStatus(status, db)
if err == nil && !isDuplicated { if err == nil && !isDuplicated {

2
business/partner/purchase/weimob/wsc/order.go
View File

@@ -96,7 +96,7 @@ func (p *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int {
} }
func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error) { func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error) {
globals.SugarLogger.Debug(vendorOrderID) globals.SugarLogger.Debugf("wsc GetOrder orderID:%s", vendorOrderID)
result, err := api.WeimobAPI.QueryOrderDetail(utils.Str2Int64(vendorOrderID), false) result, err := api.WeimobAPI.QueryOrderDetail(utils.Str2Int64(vendorOrderID), false)
if err != nil { if err != nil {
return nil, err return nil, err