From af7d0d2379d76d3aa2e701d3e7a4e7cac20bc66a Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 27 May 2019 14:03:58 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=9C=A8SelfDeliveredAndUpdateStatus?= =?UTF-8?q?=E4=B8=AD=E8=AE=BE=E7=BD=AEOrderFlagMaskSetDelivered=E6=A0=87?= =?UTF-8?q?=E5=BF=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 2 +- business/jxcallback/scheduler/basesch/basesch_ext.go | 7 ++++--- business/model/const.go | 3 ++- business/model/dao/dao_order.go | 6 +++--- business/model/order.go | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index ead51ca1d..a0d4f7a71 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -375,7 +375,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da if order.LockStatus != model.OrderStatusUnknown { globals.SugarLogger.Warnf("addOrderStatus refOrderID:%s, orderID:%s, order.LockStatus:%d, status.LockStatus:%d", orderStatus.RefVendorOrderID, orderStatus.VendorOrderID, order.LockStatus, orderStatus.Status) } - order.Flag &= ^int8(model.OrderFlagMaskUserApplyCancel) + order.Flag &= ^model.OrderFlagMaskUserApplyCancel order.LockStatus = orderStatus.Status order.LockStatusTime = orderStatus.StatusTime updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag") diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 0cf773863..7d87197cc 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/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 } diff --git a/business/model/const.go b/business/model/const.go index ce77ac9dc..a48b1b0fc 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -321,7 +321,8 @@ const ( OrderFlagRefuseFailedGetGoods = 24 OrderFlagMaskFailedDeliver = 32 - OrderFlagMaskCallPMCourier = 64 // 取货失败后召唤平台配送 + OrderFlagMaskCallPMCourier = 64 // 取货失败后召唤平台配送 + OrderFlagMaskSetDelivered = 128 // 设置送达 ) const ( diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 729eb5435..9a3474d04 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -29,12 +29,12 @@ func SetOrderPrintFlag(db *DaoDB, userName string, vendorOrderID string, vendorI if isPrinted { err = SetOrderFlag(db, userName, vendorOrderID, vendorID, model.OrderFlagMaskPrinted) } else { - err = SetOrderFlag(db, userName, vendorOrderID, vendorID, ^int8(model.OrderFlagMaskPrinted)) + err = SetOrderFlag(db, userName, vendorOrderID, vendorID, ^model.OrderFlagMaskPrinted) } return err } -func SetOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int8) (err error) { +func SetOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int) (err error) { _, err = ExecuteSQL(db, ` UPDATE goods_order SET flag = flag | ? @@ -43,7 +43,7 @@ func SetOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int return err } -func ClearOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int8) (err error) { +func ClearOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int) (err error) { _, err = ExecuteSQL(db, ` UPDATE goods_order SET flag = flag & ? diff --git a/business/model/order.go b/business/model/order.go index d953ec6e5..9c53fff3b 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -49,7 +49,7 @@ type GoodsOrder struct { ModelTimeInfo `json:"-"` OriginalData string `orm:"-" json:"-"` // 只是用于传递数据 Skus []*OrderSku `orm:"-" json:"-"` - Flag int8 `json:"flag"` //非运单调整相关的其它状态 + Flag int `json:"flag"` //非运单调整相关的其它状态 } func (o *GoodsOrder) TableUnique() [][]string {