mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#180) from dev into master

Browse Source 
Reviewed-on: #180
This commit is contained in:
lihai 2024-03-16 13:54:46 +08:00
commit 67382cfdf0
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/common/repositories/store/product/SpuRepository.php
View File

@ -12,6 +12,7 @@ namespace app\common\repositories\store\product;
use app\common\model\store\product\CloudProduct;
use app\common\model\store\product\Product;
use app\common\model\system\merchant\Merchant;
use app\common\repositories\store\coupon\StoreCouponProductRepository;
use app\common\repositories\store\coupon\StoreCouponRepository;
use app\common\repositories\store\StoreActivityRepository;
@ -167,6 +168,13 @@ class SpuRepository extends BaseRepository
unset($where['order_remark']);
$count = $queryCount->count();
if (isset($where['mer_id'])) {
$typeId = Merchant::where('mer_id', $where['mer_id'])->value('type_id');
$isOfficialStore = $typeId == 22;
}
if (isset($isOfficialStore) && $isOfficialStore) {
$where['order'] = 'price_asc';
}
$query = $this->dao->search($where);
$query->with([

2
app/event.php
View File

@ -56,7 +56,7 @@ return [
\crmeb\listens\CloseUserSvipListen::class,
\crmeb\listens\SendSvipCouponListen::class,
\crmeb\listens\AutoCheckCreditBuyListen::class,
\crmeb\listens\ActivateConsumptionListen::class,
// \crmeb\listens\ActivateConsumptionListen::class,
\crmeb\listens\SetProductProfitRateListen::class,
\crmeb\listens\SendSubsidyCouponListen::class,
] : [],

4
crmeb/listens/AutoUnlockMerchantMoneyListen.php
View File

@ -25,13 +25,13 @@ class AutoUnlockMerchantMoneyListen extends TimerService implements ListenerInte
public function handle($event): void
{
$this->tick(1000 * 60 * 60, function () {
if (time() >= strtotime('today 18:00:00') && time() <= strtotime('today 20:00:00')) {
if (time() >= strtotime('today 00:00:00') && time() <= strtotime('today 02:00:00')) {
request()->clearCache();
/** @var UserBillRepository $userBill */
$userBill = app()->make(UserBillRepository::class);
// $timer = ((int)systemConfig('mer_lock_time'));
// $time = date('Y-m-d H:i:s', $timer ? strtotime("- $timer day") : time());
$time = date('Y-m-d 00:00:00');
$time = date('Y-m-d 00:00:00', strtotime('-1 day'));
$bills = $userBill->getTimeoutMerchantMoneyBill($time);
$merchant = app()->make(MerchantRepository::class);
$count = 0;