Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

This commit is contained in:
邹宗楠
2022-12-28 10:59:09 +08:00

View File

@@ -154,14 +154,12 @@ func NewWatchOrderInfo(order *model.GoodsOrder) (retVal *WatchOrderInfo) {
func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsOrder) {
retVal = s.order
globals.SugarLogger.Debugf("SetOrder order==========%s", utils.Format4Output(order, false))
if s.order != order {
if order != nil {
s.updateOrderStoreFeature(order)
}
s.order = order
}
globals.SugarLogger.Debugf("SetOrder s.order======%s ,retval====%s", utils.Format4Output(s.order, false), utils.Format4Output(retVal, false))
return retVal
}