diff --git a/app/admin/models/order.go b/app/admin/models/order.go index cbae4df..55a6b6a 100644 --- a/app/admin/models/order.go +++ b/app/admin/models/order.go @@ -1318,17 +1318,33 @@ func (m *Order) Revert() error { return nil }) eg.Go(func() error { - err := begin.Table("order_card").Where("id=?", orderCard.ID).Updates(&map[string]interface{}{ - //"store_id": m.StoreId, - "card_status": OrderCardStatusCompleted, - "revert_store_id": m.RevertStoreId, - "revert_time": time.Now(), - "revert_shopper_code": m.RevertShopperCode, - }).Error - if err != nil { - logger.Errorf("err:", logger.Field("err", err)) - return err + if m.RevertExpressNo != "" { // 物流单号不为空则记录到数据库;2024/2/1 产品新需求,解决用户物流归还但小程序不提交归还信息,店员要输入手机号的问题 + err := begin.Table("order_card").Where("id=?", orderCard.ID).Updates(&map[string]interface{}{ + //"store_id": m.StoreId, + "card_status": OrderCardStatusCompleted, + "revert_store_id": m.RevertStoreId, + "revert_time": time.Now(), + "revert_shopper_code": m.RevertShopperCode, + "revert_express_no": m.RevertExpressNo, + }).Error + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return err + } + } else { + err := begin.Table("order_card").Where("id=?", orderCard.ID).Updates(&map[string]interface{}{ + //"store_id": m.StoreId, + "card_status": OrderCardStatusCompleted, + "revert_store_id": m.RevertStoreId, + "revert_time": time.Now(), + "revert_shopper_code": m.RevertShopperCode, + }).Error + if err != nil { + logger.Errorf("err:", logger.Field("err", err)) + return err + } } + var count int64 err = orm.Eloquent.Table("order_card").Where("order_id=?", orderCard.OrderId). Where("card_status in (?)", []uint32{1, 2, 3}).Count(&count).Error