1.归还订单时如果物流订单号不为空则记录；

2.解决新增门店报错问题；

Makefile

@@ -22,5 +22,8 @@ build:
 dev:
 	GOOS=linux GOARCH=amd64 go build -o dev_mh_goadmin_server main.go
 
+demo:
+	GOOS=linux GOARCH=amd64 go build -o demo_mh_goadmin_server main.go
+
 pro:
 	GOOS=linux GOARCH=amd64 go build -o mh_goadmin_server main.go

app/admin/models/order.go

@@ -1318,16 +1318,31 @@ 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).

app/admin/models/store.go

@@ -22,7 +22,7 @@ type Store struct {
 	IsOnline              uint32  `json:"is_online"`                            // 在线
 	CooperativeBusinessId uint32  `json:"cooperative_business_id" gorm:"index"` // 合作商id
 	CooperativeName       string  `json:"cooperative_name"`                     // 合作商名称
-	GameCardGoods
+	//GameCardGoods
 	CooperativeAssistantMemberDeduct *CooperativeAssistantMemberDeduct `json:"cooperative_assistant_member_deduct" gorm:"-"`
 }