fix:管理端回收卡列表

controller/game_card.go

@@ -1052,6 +1052,8 @@ func GetFundRecordRemark(orderType uint32) string {
 
 func GetFundRecordFundType(orderType uint32) string {
 	switch orderType {
+	case 2:
+		return model.FundTypeExpressFeeRefund
 	case 5:
 		return model.FundTypeExpressFeeRefund
 	case 7:

controller/recycle_card.go

@@ -282,7 +282,7 @@ func RecycleCardOrderImageUpdate(c *gin.Context) {
 
 	err = model.NewRecycleCardOrderQuerySet(model.DB).IDEq(req.OrderId).GetUpdater().
 		SetImages(req.Images).SetState(2).SetCheckTime(time.Now()).
-		SetAssistantName(assistant.ShopAssistantName).Update()
+		SetAssistantName(assistant.ShopAssistantName).SetRetrieveState(1).Update()
 	if err != nil {
 		logger.Error("game cassette err", err)
 		RespJson(c, status.InternalServerError, nil)
@@ -360,7 +360,8 @@ func RecycleCardOrderCheck(c *gin.Context) {
 
 	if req.CheckType == 1 {
 		err := model.NewRecycleCardOrderQuerySet(model.DB).IDEq(req.OrderId).GetUpdater().
-			SetState(3).SetCheckTime(time.Now()).SetAssistantName(assistant.ShopAssistantName).Update()
+			SetState(3).SetCheckTime(time.Now()).SetAssistantName(assistant.ShopAssistantName).
+			Update()
 		if err != nil {
 			logger.Error("update recycle card order err:", err)
 			return

model/autogenerated_recycle_card.go

@@ -1085,6 +1085,12 @@ func (qs RecycleCardOrderQuerySet) OrderAscByRemark() RecycleCardOrderQuerySet {
 	return qs.w(qs.db.Order("remark ASC"))
 }
 
+// OrderAscByRetrieveState is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) OrderAscByRetrieveState() RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Order("retrieve_state ASC"))
+}
+
 // OrderAscBySerialNumber is an autogenerated method
 // nolint: dupl
 func (qs RecycleCardOrderQuerySet) OrderAscBySerialNumber() RecycleCardOrderQuerySet {
@@ -1223,6 +1229,12 @@ func (qs RecycleCardOrderQuerySet) OrderDescByRemark() RecycleCardOrderQuerySet
 	return qs.w(qs.db.Order("remark DESC"))
 }
 
+// OrderDescByRetrieveState is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) OrderDescByRetrieveState() RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Order("retrieve_state DESC"))
+}
+
 // OrderDescBySerialNumber is an autogenerated method
 // nolint: dupl
 func (qs RecycleCardOrderQuerySet) OrderDescBySerialNumber() RecycleCardOrderQuerySet {
@@ -1383,6 +1395,62 @@ func (qs RecycleCardOrderQuerySet) RemarkNotlike(remark string) RecycleCardOrder
 	return qs.w(qs.db.Where("remark NOT LIKE ?", remark))
 }
 
+// RetrieveStateEq is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateEq(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state = ?", retrieveState))
+}
+
+// RetrieveStateGt is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateGt(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state > ?", retrieveState))
+}
+
+// RetrieveStateGte is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateGte(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state >= ?", retrieveState))
+}
+
+// RetrieveStateIn is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateIn(retrieveState ...uint32) RecycleCardOrderQuerySet {
+	if len(retrieveState) == 0 {
+		qs.db.AddError(errors.New("must at least pass one retrieveState in RetrieveStateIn"))
+		return qs.w(qs.db)
+	}
+	return qs.w(qs.db.Where("retrieve_state IN (?)", retrieveState))
+}
+
+// RetrieveStateLt is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateLt(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state < ?", retrieveState))
+}
+
+// RetrieveStateLte is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateLte(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state <= ?", retrieveState))
+}
+
+// RetrieveStateNe is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateNe(retrieveState uint32) RecycleCardOrderQuerySet {
+	return qs.w(qs.db.Where("retrieve_state != ?", retrieveState))
+}
+
+// RetrieveStateNotIn is an autogenerated method
+// nolint: dupl
+func (qs RecycleCardOrderQuerySet) RetrieveStateNotIn(retrieveState ...uint32) RecycleCardOrderQuerySet {
+	if len(retrieveState) == 0 {
+		qs.db.AddError(errors.New("must at least pass one retrieveState in RetrieveStateNotIn"))
+		return qs.w(qs.db)
+	}
+	return qs.w(qs.db.Where("retrieve_state NOT IN (?)", retrieveState))
+}
+
 // SerialNumberEq is an autogenerated method
 // nolint: dupl
 func (qs RecycleCardOrderQuerySet) SerialNumberEq(serialNumber string) RecycleCardOrderQuerySet {
@@ -1842,6 +1910,13 @@ func (u RecycleCardOrderUpdater) SetRemark(remark string) RecycleCardOrderUpdate
 	return u
 }
 
+// SetRetrieveState is an autogenerated method
+// nolint: dupl
+func (u RecycleCardOrderUpdater) SetRetrieveState(retrieveState uint32) RecycleCardOrderUpdater {
+	u.fields[string(RecycleCardOrderDBSchema.RetrieveState)] = retrieveState
+	return u
+}
+
 // SetSerialNumber is an autogenerated method
 // nolint: dupl
 func (u RecycleCardOrderUpdater) SetSerialNumber(serialNumber string) RecycleCardOrderUpdater {
@@ -1935,6 +2010,7 @@ var RecycleCardOrderDBSchema = struct {
 	Describe       RecycleCardOrderDBSchemaField
 	Remark         RecycleCardOrderDBSchemaField
 	AssistantName  RecycleCardOrderDBSchemaField
+	RetrieveState  RecycleCardOrderDBSchemaField
 }{
 
 	ID:             RecycleCardOrderDBSchemaField("id"),
@@ -1960,6 +2036,7 @@ var RecycleCardOrderDBSchema = struct {
 	Describe:       RecycleCardOrderDBSchemaField("describe"),
 	Remark:         RecycleCardOrderDBSchemaField("remark"),
 	AssistantName:  RecycleCardOrderDBSchemaField("assistant_name"),
+	RetrieveState:  RecycleCardOrderDBSchemaField("retrieve_state"),
 }
 
 // Update updates RecycleCardOrder fields by primary key
@@ -1989,6 +2066,7 @@ func (o *RecycleCardOrder) Update(db *gorm.DB, fields ...RecycleCardOrderDBSchem
 		"describe":        o.Describe,
 		"remark":          o.Remark,
 		"assistant_name":  o.AssistantName,
+		"retrieve_state":  o.RetrieveState,
 	}
 	u := map[string]interface{}{}
 	for _, f := range fields {

model/recycle_card.go

@@ -35,6 +35,7 @@ type RecycleCardOrder struct {
 	Describe       string    `json:"describe"`       // 描述
 	Remark         string    `json:"remark"`         // 备注
 	AssistantName  string    `json:"assistant_name"` // 店员
+	RetrieveState  uint32    `json:"retrieve_state"` // 回收卡状态 1-未确认 2-已确认
 	// recycle_card_order
 }
 
@@ -72,6 +73,7 @@ func RecycleCardOrderCreate(uid uint32, req xianmai.GameEvaluationReq) (*Recycle
 		SerialNumber:   "",
 		Attribute:      "",
 		DepressionRate: 0,
+		RetrieveState:  0,
 	}
 	evaluation, err := req.Evaluation()
 	if err != nil {