Merge pull request '1.归还订单时如果物流订单号不为空则记录；' (#1) from feature_express_revert into master

Reviewed-on: #1

app/admin/models/order.go

@@ -1318,6 +1318,20 @@ func (m *Order) Revert() error {
 		return nil
 	})
 	eg.Go(func() error {
+		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,
@@ -1329,6 +1343,8 @@ func (m *Order) Revert() error {
 				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