From c971109cef9d2663273297af1262e83b1770143b Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Thu, 1 Feb 2024 15:45:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BD=92=E8=BF=98=E8=AE=A2=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=89=A9=E6=B5=81=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA=E5=88=99=E8=AE=B0=E5=BD=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/order.go | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

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