jcgitadmin
/
jingcai-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jcgitadmin:7d10e19b3f8c182d347dbabbb530a7f51ed65903
Branches Tags
jcgitadmin:main
..
compare: jcgitadmin:8baa5aa793c3d111f64bcc3e04a9fdb0fa1f9fae
Branches Tags
jcgitadmin:main

No commits in common. "7d10e19b3f8c182d347dbabbb530a7f51ed65903" and "8baa5aa793c3d111f64bcc3e04a9fdb0fa1f9fae" have entirely different histories.
7d10e19b3f ... 8baa5aa793

2 changed files with 1 additions and 24 deletions
Show Stats Expand all files Collapse all files

10
app/Http/Controllers/Api/Customer/BjdcController.php
View File

@ -463,7 +463,6 @@ class BjdcController extends BaseController
*/
public function orderCreate(Request $request, BjdcService $service)
{
ThrowException::isTrue(!$this->allowHour(), '早六点到上午十点是非销售时间');
$data = $request->all();
$lotteryTypeId = Arr::get($data, 'lottery_type_id');
$lotteryType = LotteryType::find($lotteryTypeId);
@ -491,12 +490,5 @@ class BjdcController extends BaseController
'pay_types' => $this->getPayTypes()
]);
}
public function allowHour()
{
$h = date('H');
if ($h >= 6 && $h <= 10 ){
return false;
}
return true;
}
}

15
app/Model/Order.php
View File

@ -585,21 +585,6 @@ class Order extends BaseModel
$this->button_qupiao = BoolEnum::YES;
}
}
if (in_array($this->lottery_state, [LottState::WIN])) {
if ($this->cooperate_id > 0) {
if ($this->shop_id == $seller->shop_id) {
if ($this->cooperate_show == BoolEnum::NO && $this->cooperate_common == 1) {
$this->button_paijiang = BoolEnum::YES;
}
} else {
if ($this->cooperate_show == BoolEnum::YES) {
$this->button_paijiang = BoolEnum::YES;
}
}
} else {
$this->button_paijiang = BoolEnum::YES;
}
}
// 派奖，取票
if ($this->lottery_state == LottState::WAIT) {