- make GoodsOrder.LockStatusTime visible

business/jxcallback/orderman/order.go

@@ -369,21 +369,21 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
 					updateFields = append(updateFields, "Status", "StatusTime")
 					if order.LockStatus != model.OrderStatusUnknown {
 						order.LockStatus = model.OrderStatusUnknown
-						order.LockStatusTime = orderStatus.StatusTime
-						updateFields = append(updateFields, "LockStatus", "LockStatusTime")
+						updateFields = append(updateFields, "LockStatus")
 					}
 				} else {
 					if model.IsOrderUnlockStatus(orderStatus.Status) {
 						order.LockStatus = model.OrderStatusUnknown
+						updateFields = append(updateFields, "LockStatus")
 					} else {
 						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.LockStatus = orderStatus.Status
-					}
 						order.LockStatusTime = orderStatus.StatusTime
 						updateFields = append(updateFields, "LockStatus", "LockStatusTime")
 					}
+				}
 				if model.IsOrderFinalStatus(orderStatus.Status) {
 					order.OrderFinishedAt = orderStatus.StatusTime
 					updateFields = append(updateFields, "OrderFinishedAt")

business/model/order.go

@@ -32,7 +32,7 @@ type GoodsOrder struct {
 	Status                int       `json:"status"`     // 参见OrderStatus*相关的常量定义
 	VendorStatus          string    `orm:"size(255)" json:"-"`
 	LockStatus            int       `json:"lockStatus"`
-	LockStatusTime        time.Time `orm:"type(datetime);null" json:"-"` // last lock status time
+	LockStatusTime        time.Time `orm:"type(datetime);null" json:"lockStatusTime"` // last lock status time
 	OrderSeq              int       `json:"orderSeq"`                                 // 门店订单序号
 	BuyerComment          string    `orm:"size(255)" json:"buyerComment"`
 	BusinessType          int       `json:"businessType"`
@@ -44,7 +44,7 @@ type GoodsOrder struct {
 	DuplicatedCount       int       `json:"-"`                                               // 重复新订单消息数，这个一般不是由于消息重发造成的（消息重发由OrderStatus过滤），一般是业务逻辑造成的
 	OrderCreatedAt        time.Time `orm:"type(datetime);index" json:"orderCreatedAt"`       // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间）
 	OrderFinishedAt       time.Time `orm:"type(datetime)" json:"orderFinishedAt"`
-	StatusTime            time.Time `orm:"type(datetime)" json:"-"` // last status time
+	StatusTime            time.Time `orm:"type(datetime)" json:"statusTime"` // last status time
 	PickDeadline          time.Time `orm:"type(datetime)" json:"pickDeadline"`
 	ModelTimeInfo         `json:"-"`
 	OriginalData          string      `orm:"-" json:"-"` // 只是用于传递数据