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

修改商户冻结金转账时间

Browse Source
This commit is contained in:
luofei 2024-03-16 11:45:21 +08:00
parent f68bc5b684
commit fd161f381d
2 changed files with 10 additions and 2 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\CloudProduct;
use app\common\model\store\product\Product; 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\StoreCouponProductRepository;
use app\common\repositories\store\coupon\StoreCouponRepository; use app\common\repositories\store\coupon\StoreCouponRepository;
use app\common\repositories\store\StoreActivityRepository; use app\common\repositories\store\StoreActivityRepository;
@ -167,6 +168,13 @@ class SpuRepository extends BaseRepository
unset($where['order_remark']); unset($where['order_remark']);
$count = $queryCount->count(); $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 = $this->dao->search($where);
$query->with([ $query->with([

4
crmeb/listens/AutoUnlockMerchantMoneyListen.php
View File

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