pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

main
Jing Li 2024-04-12 19:15:20 +08:00
parent d91abe02e7
commit e63c72d96e
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Ledger.php
View File

@ -49,20 +49,12 @@ class Ledger extends Model
return $this->hasMany(LedgerItem::class); return $this->hasMany(LedgerItem::class);
} }
<<<<<<< Updated upstream
/** /**
* 是否允许重新上报 * 是否允许重新上报
*/ */
public function allowReReport(): bool public function allowReReport(): bool
{ {
return is_null($this->ledger_amount) && is_null($this->actual_commission) && is_null($this->actual_income); return is_null($this->ledger_amount) && is_null($this->actual_commission) && is_null($this->actual_income);
=======
public function canReport(): bool
{
return is_null($this->ledger_amount)
&& is_null($this->actual_commission)
&& is_null($this->actual_income);
>>>>>>> Stashed changes
} }
protected function ledgerDifference(): Attribute protected function ledgerDifference(): Attribute

12
routes/api.php
View File

@ -3,13 +3,8 @@
use App\Http\Controllers\Api\Auth\AccessTokenController; use App\Http\Controllers\Api\Auth\AccessTokenController;
use App\Http\Controllers\Api\ComplaintController; use App\Http\Controllers\Api\ComplaintController;
use App\Http\Controllers\Api\FeedbackController; use App\Http\Controllers\Api\FeedbackController;
<<<<<<< Updated upstream
use App\Http\Controllers\Api\Ledger\LedgerController; use App\Http\Controllers\Api\Ledger\LedgerController;
use App\Http\Controllers\Api\Ledger\LotteryTypeController; use App\Http\Controllers\Api\Ledger\LotteryTypeController;
=======
use App\Http\Controllers\Api\LedgerController;
use App\Http\Controllers\Api\LotteryTypeController;
>>>>>>> Stashed changes
use App\Http\Controllers\Api\StatsController; use App\Http\Controllers\Api\StatsController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
@ -28,18 +23,11 @@ Route::group([
Route::get('/stats/dashboard', [StatsController::class, 'dashboard']); Route::get('/stats/dashboard', [StatsController::class, 'dashboard']);
<<<<<<< Updated upstream
// 数据上报 // 数据上报
Route::post('/ledger/ledgers', [LedgerController::class, 'store']); Route::post('/ledger/ledgers', [LedgerController::class, 'store']);
Route::get('/ledger/ledgers/{date}', [LedgerController::class, 'show']); Route::get('/ledger/ledgers/{date}', [LedgerController::class, 'show']);
Route::get('/ledger/lottery-types', [LotteryTypeController::class, 'index']); Route::get('/ledger/lottery-types', [LotteryTypeController::class, 'index']);
=======
Route::resource('/ledger', LedgerController::class)->only(['store', 'show']);
// 彩种类型
Route::get('lottery-types', [LotteryTypeController::class, 'index']);
>>>>>>> Stashed changes
// 举报投诉 // 举报投诉
Route::post('complaints', [ComplaintController::class, 'store']); Route::post('complaints', [ComplaintController::class, 'store']);
// 意见箱 // 意见箱