Skip to content

Commit

Permalink
新增详细数据
Browse files Browse the repository at this point in the history
  • Loading branch information
heyunpeng committed Aug 18, 2015
1 parent e5a9e57 commit f216fe8
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 39 deletions.
38 changes: 35 additions & 3 deletions app/controllers/tracelogs_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ def double

tracelog.gametype = 1
tracelog.coin = params[:tracelogs]["flag#{i}_1"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -67,6 +69,8 @@ def double

tracelog.gametype = 2
tracelog.coin = params[:tracelogs]["flag#{i}_2"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -75,7 +79,7 @@ def double
end
end
end
user.update(coin: user.coin-totalcoin)
user.update(coin: user.coin)
end
respond_to do |format|
format.html {}
Expand Down Expand Up @@ -134,6 +138,8 @@ def single

tracelog.gametype = 1
tracelog.coin = params[:tracelogs]["flag#{i}_1"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -154,6 +160,8 @@ def single

tracelog.gametype = 2
tracelog.coin = params[:tracelogs]["flag#{i}_2"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -173,6 +181,8 @@ def single

tracelog.gametype = 3
tracelog.coin = params[:tracelogs]["flag#{i}_3"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -192,6 +202,8 @@ def single

tracelog.gametype = 4
tracelog.coin = params[:tracelogs]["flag#{i}_4"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -211,6 +223,8 @@ def single

tracelog.gametype = 5
tracelog.coin = params[:tracelogs]["flag#{i}_5"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -230,6 +244,8 @@ def single

tracelog.gametype = 6
tracelog.coin = params[:tracelogs]["flag#{i}_6"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -249,6 +265,8 @@ def single

tracelog.gametype = 1
tracelog.coin = params[:tracelogs]["flag#{i}_8"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -268,6 +286,8 @@ def single

tracelog.gametype = 2
tracelog.coin = params[:tracelogs]["flag#{i}_9"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -287,6 +307,8 @@ def single

tracelog.gametype = 3
tracelog.coin = params[:tracelogs]["flag#{i}_10"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -306,6 +328,8 @@ def single

tracelog.gametype = 4
tracelog.coin = params[:tracelogs]["flag#{i}_11"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save
@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
"maintype"=>tracelog.maintype,"coin"=>tracelog.coin}
Expand All @@ -314,7 +338,7 @@ def single
end
end

user.update(coin: user.coin-totalcoin)
user.update(coin: user.coin)
end
respond_to do |format|
format.html {}
Expand Down Expand Up @@ -364,6 +388,8 @@ def combination
tracelog.mulbability = Gridconfig.find_by_gridtype(1).mulbability
tracelog.gametype = 1
tracelog.coin = params[:tracelogs]["flag#{i}_1"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -384,6 +410,8 @@ def combination
tracelog.mulbability = Gridconfig.find_by_gridtype(2).mulbability
tracelog.gametype = 2
tracelog.coin = params[:tracelogs]["flag#{i}_2"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -404,6 +432,8 @@ def combination
tracelog.mulbability = Gridconfig.find_by_gridtype(3).mulbability
tracelog.gametype = 3
tracelog.coin = params[:tracelogs]["flag#{i}_3"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -424,6 +454,8 @@ def combination
tracelog.mulbability = Gridconfig.find_by_gridtype(4).mulbability
tracelog.gametype = 4
tracelog.coin = params[:tracelogs]["flag#{i}_4"]
user.coin -= tracelog.coin
tracelog.usercoin = user.coin
tracelog.save

@result[@result.length] = {"pos"=>i,"gametype"=>tracelog.gametype,
Expand All @@ -432,7 +464,7 @@ def combination
end
end
end
user.update(coin: user.coin-totalcoin)
user.update(coin: user.coin)
end
respond_to do |format|
format.html {}
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/manage.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<%= link_to '历史开奖', controller: 'gridgame', action: 'index' %>
</li>
<li>
<%= link_to '报表查询', controller: 'tracelogs', action: 'index' %>
<%= link_to '投注记录', controller: 'tracelogs', action: 'index' %>
</li>
<li>
<a href="#"><i class="fa fa-sitemap fa-fw"></i>用户管理<span class="fa arrow"></span></a>
Expand Down
59 changes: 34 additions & 25 deletions app/views/tracelogs/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@
<div class="col-lg-12">
<h1 class="page-header"></h1>
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">
报表查询
</div>
<!-- /.panel-heading -->
<div class="panel-heading">投注记录</div>
<div class="panel-body">
<div class="dataTable_wrapper">
<table class="table table-striped table-bordered table-hover" id="dataTables-example">
Expand All @@ -29,6 +24,7 @@
<th>类型</th>
<th>位置</th>
<th>金币</th>
<th>本期增减</th>
<th>结果</th>
<th>时间</th>
</tr>
Expand All @@ -39,15 +35,29 @@
<td><%= log.useraccount %></td>
<td><%= log.gameid %></td>
<% if log.maintype == 1 %>
<% if log.gametype == 1 %>
<td>三筒</td>
<% elsif log.gametype == 2 %>
<td>同色</td>
<% elsif log.gametype == 3 %>
<td>顺子</td>
<% else %>
<td>对子</td>
<% end %>
<% if log.gametype == 1 %>
<td>三筒</td>
<% elsif log.gametype == 2 %>
<td>同色</td>
<% elsif log.gametype == 3 %>
<td>顺子</td>
<% elsif log.gametype == 4 %>
<td>对子</td>
<% end %>
<% elsif log.maintype == 2 %>
<% if log.gametype == 1 %>
<td>A</td>
<% elsif log.gametype == 2 %>
<td>9</td>
<% elsif log.gametype == 3 %>
<td>10</td>
<% elsif log.gametype == 4 %>
<td>J</td>
<% elsif log.gametype == 5 %>
<td>Q</td>
<% elsif log.gametype == 6 %>
<td>K</td>
<% end %>
<% elsif log.maintype == 3 %>
<% if log.gametype == 1 %>
<td>大</td>
Expand All @@ -56,17 +66,15 @@
<% elsif log.gametype == 3 %>
<td>小</td>
<% end %>
<% else %>
<% elsif log.maintype == 4 %>
<% if log.gametype == 1 %>
<td>A</td>
<% elsif log.gametype <= 10 %>
<td><%=log.gametype%></td>
<% elsif log.gametype == 11 %>
<td>J</td>
<% elsif log.gametype == 12 %>
<td>Q</td>
<% elsif log.gametype == 13 %>
<td>K</td>
<td>红</td>
<% elsif log.gametype == 2 %>
<td>方</td>
<% elsif log.gametype == 3 %>
<td>黑</td>
<% elsif log.gametype == 4 %>
<td>梅</td>
<% end %>
<% end %>
<% if log.maintype == 1 %>
Expand All @@ -86,6 +94,7 @@
<% else %>
<td><%=log.pos%></td>
<% end %>
<td><%= log.usercoin %></td>
<% if log.status == 1 %>
<td><font color="red">+<%= log.coin * log.mulbability %></font></td>
<% else %>
Expand Down
12 changes: 2 additions & 10 deletions config/initializers/task.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def processprize (userid, coin)
user = User.find(userid)
if user != nil
totalcoin = user.coin + coin
user.update(coin: totalcoin)
user.update(coin: totalcoin.to_i)
else
Rails.logger.error "can't find user #{userid}"
end
Expand Down Expand Up @@ -152,7 +152,7 @@ def checkGrid (object)
gridconfig = Gridconfig.new
gridconfig.gridtype = i
gridconfig.probability = 1.0
gridconfig.mulbability = 1.0
gridconfig.mulbability = 2.0
gridconfig.save
end
end
Expand All @@ -170,14 +170,6 @@ def checkGrid (object)
if left_count > 0
begin_count = 90 - left_count

#reset user daycoin every day at 5am
if Time.now.hour == 5
users = User.all
users.each do |user|
user.update(todaycoin: 0)
end
end

objects = []
objindex = 0
for i in 0..left_count-1
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20150611111119_changeall.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class Changeall < ActiveRecord::Migration
def change
add_column :tracelogs, :usercoin, :integer
end
end

0 comments on commit f216fe8

Please sign in to comment.