From e9970a082527231eb96a8bc5ea17ecda4cdcd065 Mon Sep 17 00:00:00 2001
From: li <brett>
Date: Tue, 19 Apr 2022 12:36:34 +0800
Subject: [PATCH] fix:

---
 controller/user_share_card.go | 29 +++++++++--------------------
 router/router_app.go          |  2 +-
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/controller/user_share_card.go b/controller/user_share_card.go
index d6bc31f..4be023d 100644
--- a/controller/user_share_card.go
+++ b/controller/user_share_card.go
@@ -691,6 +691,7 @@ func CardIssueCreate(c *gin.Context) {
 			ObtainType:      req.ObtainType,
 			Problem:         req.Problem,
 			Remark:          req.Remark,
+			State:           model.CardIssueStateFollowing,
 		}
 	} else {
 		logger.Error("obtain type err:")
@@ -842,14 +843,19 @@ func CardIssueInfo(c *gin.Context) {
 func CardIssueDeliver(c *gin.Context) {
 	req := struct {
 		CardIssueFeedbackId uint32 `json:"card_issue_feedback_id"`
+		ExpressCompany      string `json:"express_company"`    // 物流公司
+		ExpressCompanyNo    string `json:"express_company_no"` // 物流公司编号
+		ExpressNo           string `json:"express_no"`         // 物流单号
 	}{}
 	if c.ShouldBindJSON(&req) != nil {
 		logger.Error("parameter err")
 		RespJson(c, status.BadRequest, nil)
 		return
 	}
-	var issueFeedback model.CardIssueFeedback
-	err := model.NewCardIssueFeedbackQuerySet(model.DB).IDEq(req.CardIssueFeedbackId).One(&issueFeedback)
+	//var issueFeedback model.CardIssueFeedback
+	_, err := model.NewCardIssueFeedbackQuerySet(model.DB).IDEq(req.CardIssueFeedbackId).GetUpdater().
+		SetExpressCompany(req.ExpressCompany).SetExpressCompanyNo(req.ExpressCompanyNo).
+		SetDeliverExpressNo(req.ExpressNo).UpdateNum()
 	if err != nil {
 		logger.Error("card issue feedback err")
 		RespJson(c, status.InternalServerError, nil)
@@ -857,23 +863,6 @@ func CardIssueDeliver(c *gin.Context) {
 	}
 	//model.GetImpo()
 
-	var store model.Store
-	err = model.NewStoreQuerySet(model.DB).IDEq(issueFeedback.StoreId).One(&store)
-	if err != nil && err != model.RecordNotFound {
-		logger.Error("store err")
-		RespJson(c, status.InternalServerError, nil)
-		return
-	}
-	var gameCard model.GameCard
-	err = model.NewGameCardQuerySet(model.DB).IDEq(issueFeedback.GameCardId).One(&gameCard)
-	if err != nil && err != model.RecordNotFound {
-		logger.Error("game card err")
-		RespJson(c, status.InternalServerError, nil)
-		return
-	}
-	issueFeedback.Store = &store
-	issueFeedback.GameCard = &gameCard
-
-	RespOK(c, issueFeedback)
+	RespOK(c, nil)
 	return
 }
diff --git a/router/router_app.go b/router/router_app.go
index 676e626..98e4613 100644
--- a/router/router_app.go
+++ b/router/router_app.go
@@ -207,7 +207,7 @@ func ConfigAppRouter(r gin.IRouter) {
 		shareCard.POST("card_issue/cancel", controller.CardIssueCancel)   // 我的共享卡问题反馈
 		shareCard.POST("card_issue/list", controller.CardIssueList)       // 我的共享卡问题反馈列表
 		shareCard.POST("card_issue/info", controller.CardIssueInfo)       // 我的共享卡问题反馈详情
-		shareCard.POST("card_issue/deliver", controller.CardIssueDeliver) // 我的共享卡问题反馈详情
+		shareCard.POST("card_issue/deliver", controller.CardIssueDeliver) // 我的共享卡问题反馈卡发货
 
 		//shoppingCart.POST("del", controller.ShoppingCartDel)   //