server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

Browse Source
This commit is contained in:
hujiabin 2024-10-12 17:17:48 +08:00
commit e8cc56d3fa
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/frienddb.mysql.cluster.php Normal file
View File

@ -0,0 +1,11 @@
<?php
return array(
'instance_id' => 1,
'host' => 'mysql-host',
'port' => 3306,
'user' => 'root',
'passwd' => 'keji178',
'dbname' => 'frienddb_dev_1'
);

6
webapp/models/HashRateShopBuyRecord.php
View File

@ -75,17 +75,17 @@ class HashRateShopBuyRecord extends BaseModel
'this_day_buy_times' => function () use($goodsNum) {
$nowDaySeconds = myself()->_getNowDaySeconds();
$cond = " last_buy_time>=${nowDaySeconds} AND last_buy_time<=${nowDaySeconds} + 3600 * 24 ";
return "CASE WHEN (${cond}) THEN this_day_buy_times + ${goodsNum} ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_day_buy_times + ${goodsNum} ELSE ${goodsNum} END";
},
'this_week_buy_times' => function () use($goodsNum) {
$mondaySeconds = myself()->_getMondaySeconds();
$cond = " last_buy_time>=${mondaySeconds} AND last_buy_time<=${mondaySeconds} + 3600 * 24 * 7 ";
return "CASE WHEN (${cond}) THEN this_week_buy_times + ${goodsNum} ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_week_buy_times + ${goodsNum} ELSE ${goodsNum} END";
},
'this_month_buy_times' => function () use($goodsNum) {
$monthFirstDaySeconds = myself()->_getMonthFirstDaySeconds();
$cond = " last_buy_time>=${monthFirstDaySeconds} ";
return "CASE WHEN (${cond}) THEN this_month_buy_times + ${goodsNum} ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_month_buy_times + ${goodsNum} ELSE ${goodsNum} END";
},
'total_buy_times' => function () use($goodsNum) {
return "total_buy_times + ${goodsNum}";

14
webapp/models/ShopBuyRecord.php
View File

@ -32,11 +32,13 @@ class ShopBuyRecord extends BaseModel
);
return array_map(function ($row) {
$nowDaySeconds = myself()->_getNowDaySeconds();
if (!($row['last_buy_time'] >= $nowDaySeconds && $row['last_buy_time'] <= $nowDaySeconds)) {
if (!($row['last_buy_time'] >= $nowDaySeconds &&
$row['last_buy_time'] <= $nowDaySeconds + 3600 * 24)) {
$row['this_day_buy_times'] = 0;
}
$mondaySeconds = myself()->_getMondaySeconds();
if (!($row['last_buy_time'] >= $mondaySeconds && $row['last_buy_time'] <= $mondaySeconds)) {
if (!($row['last_buy_time'] >= $mondaySeconds &&
$row['last_buy_time'] <= $mondaySeconds + 3600 * 24 * 7)) {
$row['this_week_buy_times'] = 0;
}
return $row;
@ -71,12 +73,12 @@ class ShopBuyRecord extends BaseModel
'this_day_buy_times' => function () {
$nowDaySeconds = myself()->_getNowDaySeconds();
$cond = " last_buy_time>=${nowDaySeconds} AND last_buy_time<=${nowDaySeconds} + 3600 * 24 ";
return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 1 END";
},
'this_week_buy_times' => function () {
$mondaySeconds = myself()->_getMondaySeconds();
$cond = " last_buy_time>=${mondaySeconds} AND last_buy_time<=${mondaySeconds} + 3600 * 24 * 7 ";
return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 1 END";
},
'total_buy_times' => function () {
return 'total_buy_times + 1';
@ -111,12 +113,12 @@ class ShopBuyRecord extends BaseModel
'this_day_buy_times' => function () {
$nowDaySeconds = myself()->_getNowDaySeconds();
$cond = " last_buy_time>=${nowDaySeconds} AND last_buy_time<=${nowDaySeconds} + 3600 * 24 ";
return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 1 END";
},
'this_week_buy_times' => function () {
$mondaySeconds = myself()->_getMondaySeconds();
$cond = " last_buy_time>=${mondaySeconds} AND last_buy_time<=${mondaySeconds} + 3600 * 24 * 7 ";
return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 0 END";
return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 1 END";
},
'total_buy_times' => function () {
return 'total_buy_times + 1';

1
webapp/mt/Shop.php
View File

@ -43,6 +43,7 @@ class Shop {
const WEEKLY_BUY_LIMIT = 2;
const TOTAL_BUY_LIMIT = 3;
const DAILY_HERO_SHOP = 2;
const OUTAPP_SHOP = 7;
const INAPP_SHOP_DIAMOND = 9;

3
webapp/services/ShopService.php
View File

@ -42,7 +42,6 @@ class ShopService {
'bought_times' => 0,
'free_num' => 0,
);
array_push($goodsList, $goodsDto);
switch ($goodsMeta['limit_type']) {
case mt\Shop::DAILY_BUY_LIMIT: {
$buyRecord = getXVal($buyRecordHash, $goodsMeta['goods_id']);
@ -63,7 +62,7 @@ class ShopService {
}
break;
}
array_push($goodsList, $goodsDto);
$itemMeta = mt\Item::get($goodsMeta['item_id']);
if ($itemMeta) {
/*