diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 2c21ec5..3f64fc6 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -592,7 +592,7 @@ func (m *ErpOrderListReq) List(c *gin.Context) (*ErpOrderListResp, error) { return resp, err } var orders []ErpOrder - err = qs.Debug().Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&orders).Error + err = qs.Debug().Order("maker_time DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&orders).Error if err != nil && err != RecordNotFound { logger.Error("erp commodity list err:", logger.Field("err", err)) return resp, err @@ -4563,7 +4563,7 @@ func queryRetailDetailCommon(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp if req.IsExport == 1 { // 导出excel var orders []ErpOrder - err = qs.Order("id DESC").Find(&orders).Error + err = qs.Order("audit_time DESC").Find(&orders).Error if err != nil && err != RecordNotFound { logger.Error("erp commodity list err:", logger.Field("err", err)) return resp, err @@ -4587,7 +4587,7 @@ func queryRetailDetailCommon(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp } var orders []ErpOrder - err = qs.Order("id DESC").Offset(page * req.PageSize).Limit(req.PageSize).Find(&orders).Error + err = qs.Order("audit_time DESC").Offset(page * req.PageSize).Limit(req.PageSize).Find(&orders).Error if err != nil && err != RecordNotFound { logger.Error("erp commodity list err:", logger.Field("err", err)) return resp, err @@ -5080,7 +5080,7 @@ func EditErpOrder(req *ErpOrderCreateReq, c *gin.Context) error { begin := orm.Eloquent.Begin() // 1-更新零售订单 //err = begin.Model(&ErpOrder{}).Where("id = ?", orderInfo.ID).Updates(erpOrder).Error - err = begin.Model(&ErpOrder{}).Where("id = ?", orderInfo.ID).Save(&erpOrder).Error + err = begin.Model(&ErpOrder{}).Where("id = ?", orderInfo.ID).Omit("created_at").Save(&erpOrder).Error if err != nil { begin.Rollback() logger.Error("update erp_order err:", logger.Field("err", err))