- fix bug in order.addOrderStatus.

This commit is contained in:
gazebo
2018-08-13 18:26:41 +08:00
parent bd3a51b0a9
commit da889ff944

View File

@@ -279,7 +279,9 @@ func (c *OrderController) addOrderStatus(orderStatus *model.OrderStatus, db orm.
db = orm.NewOrm() db = orm.NewOrm()
} }
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if err == nil && !isDuplicated && orderStatus.Status > model.OrderStatusUnknown { if err == nil && !isDuplicated &&
(orderStatus.Status > model.OrderStatusUnknown ||
(orderStatus.Status == model.OrderStatusUnlocked || orderStatus.Status == model.OrderStatusLocked || orderStatus.Status == model.OrderStatusApplyCancel)) {
order := &model.GoodsOrder{ order := &model.GoodsOrder{
VendorOrderID: orderStatus.VendorOrderID, VendorOrderID: orderStatus.VendorOrderID,
VendorID: orderStatus.VendorID, VendorID: orderStatus.VendorID,