组合名字函数修改

This commit is contained in:
苏尹岚
2019-12-20 15:59:42 +08:00
parent 7766c9428d
commit 480132cafe
5 changed files with 10 additions and 9 deletions

View File

@@ -994,7 +994,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
if goodsOrder == nil {
missingOrderList = append(missingOrderList, pair)
} else {
if model.IsOrderFinalStatus(goodsOrder.Status) {
if !model.IsOrderFinalStatus(goodsOrder.Status) {
if goodsOrder.BusinessType == model.BusinessTypeImmediate {
if time.Now().Sub(goodsOrder.CreatedAt).Hours() >= orderSubTimeImmediatelyArrive {
updateOrderStatusList = append(updateOrderStatusList, goodsOrder)
@@ -1031,7 +1031,8 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil {
status, err2 := handler.GetOrderStatus(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID)
if err = err2; err == nil {
if status == model.OrderStatusCanceled || status == model.OrderStatusFinished {
if model.IsOrderFinalStatus(status) {
goodsOrder.Status = status
_, err = dao.UpdateEntity(db, goodsOrder, "Status")
}
}