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

调整补贴列表

Browse Source
This commit is contained in:
luofei 2024-03-21 16:37:43 +08:00
parent 541990a1b2
commit c2d6ece975
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controller/admin/system/financial/Subsidy.php
View File

@ -29,6 +29,7 @@ class Subsidy extends BaseController
}]) }])
->where('status', StoreCouponDetail::STATUS_INVALID) ->where('status', StoreCouponDetail::STATUS_INVALID)
->where('type', StoreCouponDetail::TYPE_INCOME); ->where('type', StoreCouponDetail::TYPE_INCOME);
$couponIds = StoreCoupon::whereIn('type', [StoreCouponRepository::TYPE_STORE_COUPON, StoreCouponRepository::TYPE_SALE_SUBSIDY])->column('coupon_id');
if (!empty($type)) { if (!empty($type)) {
if ($type == 1) { if ($type == 1) {
$couponWhere = ['type' => StoreCouponRepository::TYPE_STORE_COUPON]; $couponWhere = ['type' => StoreCouponRepository::TYPE_STORE_COUPON];
@ -37,6 +38,8 @@ class Subsidy extends BaseController
} }
$couponId = StoreCoupon::where($couponWhere)->value('coupon_id'); $couponId = StoreCoupon::where($couponWhere)->value('coupon_id');
$query->where('coupon_id', $couponId); $query->where('coupon_id', $couponId);
} else {
$query->whereIn('coupon_id', $couponIds);
} }
if ($status !== '') { if ($status !== '') {
$query->where('send_status', $status); $query->where('send_status', $status);