订单第二次取货失败尝试清除orderflag

2020-04-02 13:32:40 +08:00
parent ef7ab4cca2
commit a5c3a1c985
3 changed files with 15 additions and 5 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -417,7 +417,11 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 					} else if status.Status == model.OrderFlagMaskFailedDeliver {
 						clearFlag = model.OrderFlagMaskFailedDeliver
 					}
-					dao.ClearOrderFlag(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag)
+					if order.Flag > clearFlag {
+						dao.ClearOrderFlag2(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag|model.OrderFlagMaskPrinted)
+					} else {
+						dao.ClearOrderFlag(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag)
+					}
 				}
 			}
 		}