minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:

Browse Source
This commit is contained in:
li 2022-04-19 12:36:34 +08:00
parent 73013ed758
commit e9970a0825
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
controller/user_share_card.go
View File

@ -691,6 +691,7 @@ func CardIssueCreate(c *gin.Context) {
ObtainType: req.ObtainType, ObtainType: req.ObtainType,
Problem: req.Problem, Problem: req.Problem,
Remark: req.Remark, Remark: req.Remark,
State: model.CardIssueStateFollowing,
} }
} else { } else {
logger.Error("obtain type err:") logger.Error("obtain type err:")
@ -842,14 +843,19 @@ func CardIssueInfo(c *gin.Context) {
func CardIssueDeliver(c *gin.Context) { func CardIssueDeliver(c *gin.Context) {
req := struct { req := struct {
CardIssueFeedbackId uint32 `json:"card_issue_feedback_id"` 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 { if c.ShouldBindJSON(&req) != nil {
logger.Error("parameter err") logger.Error("parameter err")
RespJson(c, status.BadRequest, nil) RespJson(c, status.BadRequest, nil)
return return
} }
var issueFeedback model.CardIssueFeedback //var issueFeedback model.CardIssueFeedback
err := model.NewCardIssueFeedbackQuerySet(model.DB).IDEq(req.CardIssueFeedbackId).One(&issueFeedback) _, err := model.NewCardIssueFeedbackQuerySet(model.DB).IDEq(req.CardIssueFeedbackId).GetUpdater().
SetExpressCompany(req.ExpressCompany).SetExpressCompanyNo(req.ExpressCompanyNo).
SetDeliverExpressNo(req.ExpressNo).UpdateNum()
if err != nil { if err != nil {
logger.Error("card issue feedback err") logger.Error("card issue feedback err")
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
@ -857,23 +863,6 @@ func CardIssueDeliver(c *gin.Context) {
} }
//model.GetImpo() //model.GetImpo()
var store model.Store RespOK(c, nil)
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)
return return
} }

2
router/router_app.go
View File

@ -207,7 +207,7 @@ func ConfigAppRouter(r gin.IRouter) {
shareCard.POST("card_issue/cancel", controller.CardIssueCancel) // 我的共享卡问题反馈 shareCard.POST("card_issue/cancel", controller.CardIssueCancel) // 我的共享卡问题反馈
shareCard.POST("card_issue/list", controller.CardIssueList) // 我的共享卡问题反馈列表 shareCard.POST("card_issue/list", controller.CardIssueList) // 我的共享卡问题反馈列表
shareCard.POST("card_issue/info", controller.CardIssueInfo) // 我的共享卡问题反馈详情 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) // //shoppingCart.POST("del", controller.ShoppingCartDel) //