- 在SelfDeliveredAndUpdateStatus中设置OrderFlagMaskSetDelivered标志位

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -71,7 +71,8 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
 					err = c.Swtich2SelfDelivered(order, userName)
 				}
 				if err == nil {
-					order.Status = model.OrderStatusFinished
+					// order.Status = model.OrderStatusFinished // todo 是否需要强制设置完成状态？
+					order.Flag |= model.OrderFlagMaskSetDelivered
 					if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil {
 						globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName)
 						return err
@@ -147,7 +148,7 @@ func (c *BaseScheduler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, ord
 		err = partner.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseFailedGetOrder(ctx, order, isAcceptIt)
 	}
 	if err == nil {
-		flag := int8(model.OrderFlagAgreeFailedGetGoods)
+		flag := model.OrderFlagAgreeFailedGetGoods
 		if !isAcceptIt {
 			flag = model.OrderFlagRefuseFailedGetGoods
 		}
@@ -181,7 +182,7 @@ func (c *BaseScheduler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model
 		err = partner.GetPurchasePlatformFromVendorID(order.VendorID).AgreeOrRefuseCancel(ctx, order, isAcceptIt, reason)
 	}
 	if err == nil {
-		flag := int8(model.OrderFlagAgreeUserApplyCancel)
+		flag := model.OrderFlagAgreeUserApplyCancel
 		if !isAcceptIt {
 			flag = model.OrderFlagRefuseUserApplyCancel
 		}