Skip to content

B
bwallet
Commit a3d0c467 authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'feature/live' into 'develop'

Feature/live See merge request !18
parents be33a96d 34cdc655
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
routers/api/app/live.go
View file @ a3d0c467
...@@ -172,6 +172,7 @@ func LiveStatus(c *gin.Context) { ...@@ -172,6 +172,7 @@ func LiveStatus(c *gin.Context) {
live_service := live_info_service.LiveInfo{ live_service := live_info_service.LiveInfo{
ApplyId: uint32(apply_id), ApplyId: uint32(apply_id),
OrderSn: order_sn, OrderSn: order_sn,
Status: models.PEDDING_PAYMENT,
PageNum: util.GetPage(c), PageNum: util.GetPage(c),
PageSize: util.GetLimit(c), PageSize: util.GetLimit(c),
} }
...@@ -202,6 +203,7 @@ func VerifyStatus(c *gin.Context) { ...@@ -202,6 +203,7 @@ func VerifyStatus(c *gin.Context) {
live_service := live_info_service.LiveInfo{ live_service := live_info_service.LiveInfo{
OrderSn: info.OrderSn, OrderSn: info.OrderSn,
Status: models.PEDDING_PAYMENT,
PageNum: util.GetPage(c), PageNum: util.GetPage(c),
PageSize: util.GetLimit(c), PageSize: util.GetLimit(c),
} }
...@@ -216,12 +218,12 @@ func VerifyStatus(c *gin.Context) { ...@@ -216,12 +218,12 @@ func VerifyStatus(c *gin.Context) {
return return
} }
if live[0].Status != models.PEDDING_PAYMENT { if live[0].Status != uint8(models.PEDDING_PAYMENT) {
handler.SendResponse(c, errno.ErrUpdateLiveInfo, nil) handler.SendResponse(c, errno.ErrUpdateLiveInfo, nil)
return return
} }
if info.LiveStatus != models.LIVEED { if info.LiveStatus != uint8(models.LIVEED) {
handler.SendResponse(c, errno.ErrUpdateLiveInfo, nil) handler.SendResponse(c, errno.ErrUpdateLiveInfo, nil)
return return
} }
...@@ -252,6 +254,7 @@ func NotifyUrl(c *gin.Context) { ...@@ -252,6 +254,7 @@ func NotifyUrl(c *gin.Context) {
live_service := live_info_service.LiveInfo{ live_service := live_info_service.LiveInfo{
OrderSn: info.OrderSn, OrderSn: info.OrderSn,
Status: models.PEDDING_PAYMENT,
PageNum: util.GetPage(c), PageNum: util.GetPage(c),
PageSize: util.GetLimit(c), PageSize: util.GetLimit(c),
} }
...@@ -266,11 +269,6 @@ func NotifyUrl(c *gin.Context) { ...@@ -266,11 +269,6 @@ func NotifyUrl(c *gin.Context) {
return return
} }
if live[0].Status != models.PEDDING_PAYMENT {
handler.SendResponse(c, errno.ErrUpdateLiveInfo, nil)
return
}
if live[0].Price != info.Price { if live[0].Price != info.Price {
handler.SendResponse(c, errno.ErrPrice, nil) handler.SendResponse(c, errno.ErrPrice, nil)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment