diff --git a/build/artShowServerTest b/build/artShowServerTest index 111b89b..a2d0c72 100644 Binary files a/build/artShowServerTest and b/build/artShowServerTest differ diff --git a/cmd/service/show_price.go b/cmd/service/show_price.go index 57909a6..5909e27 100644 --- a/cmd/service/show_price.go +++ b/cmd/service/show_price.go @@ -33,8 +33,7 @@ func ArtworkPriceList(in *artShow.ShowDetailReq) (err error, artworkPriceList [] func UpdateArtworkPriceReward(in *artShow.UpdateArtworkRewardReq) (err error) { var ( - showUid string - reward int + reward map[string]int ) tx := db.DbArtShow.Begin() @@ -46,13 +45,13 @@ func UpdateArtworkPriceReward(in *artShow.UpdateArtworkRewardReq) (err error) { return err } - if showUid == "" { - showUid = artwork.ShowUID + if reward[artwork.ShowUID] == 0 { + reward[artwork.ShowUID] = 0 } artworkReward, _ := strconv.Atoi(in.Data[i].Reward) - reward += int(artwork.Ruler) * artworkReward + reward[artwork.ShowUID] += int(artwork.Ruler) * artworkReward err = dao.UpdateArtworkInfoWithMap(tx, map[string]interface{}{"reward": in.Data[i].Reward}, "", in.Data[i].ArtworkPriceUid) if err != nil { @@ -61,14 +60,16 @@ func UpdateArtworkPriceReward(in *artShow.UpdateArtworkRewardReq) (err error) { } } - err = dao.UpdateArtShow(tx, &model.ArtShow{ - ShowUID: showUid, - IsShow: m.ARTSHOW_REWARD_PASS, - Reward: int64(reward), - }) - if err != nil { - fmt.Println("update art_show err is :", err) - return err + for showUid, reward := range reward { + err = dao.UpdateArtShow(tx, &model.ArtShow{ + ShowUID: showUid, + IsShow: m.ARTSHOW_REWARD_PASS, + Reward: int64(reward), + }) + if err != nil { + fmt.Println("update art_show err is :", err) + return err + } } err = tx.Commit().Error diff --git a/conf/conf.ini b/conf/conf.ini index d6742cf..bebfed0 100644 --- a/conf/conf.ini +++ b/conf/conf.ini @@ -21,13 +21,13 @@ mode = prod #正式prod #测试dev ;DbName = art_show ;正式服 172.16.100.30 now -[mysql] -Db = mysql -DbHost = 172.16.100.30 -DbPort = 3306 -DbUser = root -DbPassWord = IhQmhg8HZjDmU=Ove5PnA^D -DbName = art_show +;[mysql] +;Db = mysql +;DbHost = 172.16.100.30 +;DbPort = 3306 +;DbUser = root +;DbPassWord = IhQmhg8HZjDmU=Ove5PnA^D +;DbName = art_show ;188 ;[mysql] @@ -39,14 +39,14 @@ DbName = art_show ;DbName = art_show ;214 -;[mysql] -;Db = mysql -;DbHost = 172.16.100.99 #214 -;;DbHost = 172.16.39.93 #214 -;DbPort = 9007 -;DbUser = artuser -;DbPassWord = "C250PflXIWv2SQm8" -;DbName = art_show +[mysql] +Db = mysql +DbHost = 172.16.100.99 #214 +;DbHost = 172.16.39.93 #214 +DbPort = 9007 +DbUser = artuser +DbPassWord = "C250PflXIWv2SQm8" +DbName = art_show ;[mysql] ;Db = mysql diff --git a/conf/dubbogo.yaml b/conf/dubbogo.yaml index e9f1f53..5b51ba7 100644 --- a/conf/dubbogo.yaml +++ b/conf/dubbogo.yaml @@ -3,8 +3,8 @@ dubbo: demoZK: protocol: zookeeper timeout: 3s - address: zookeeper:2181 # 正式服务 -# address: 127.0.0.1:2181 # 测试服务q +# address: zookeeper:2181 # 正式服务 + address: 127.0.0.1:2181 # 测试服务q protocols: triple: #triple name: tri