From 39d46328dfa178304facca23621838862ae2e3af Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 29 Feb 2024 18:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A5=E8=B4=B4=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/common/dao/store/consumption/StoreConsumptionUserDao.php | 4 ++++
crmeb/listens/SendSubsidyCouponListen.php | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/app/common/dao/store/consumption/StoreConsumptionUserDao.php b/app/common/dao/store/consumption/StoreConsumptionUserDao.php
index 392aa73d..64e0754d 100755
--- a/app/common/dao/store/consumption/StoreConsumptionUserDao.php
+++ b/app/common/dao/store/consumption/StoreConsumptionUserDao.php
@@ -51,6 +51,7 @@ class StoreConsumptionUserDao extends BaseDao
public $startTime;
public $endTime;
+ public $billExtra;
protected function getModel(): string
{
@@ -272,6 +273,9 @@ class StoreConsumptionUserDao extends BaseDao
} else {
$extra['group_order_id'] = $groupOrderIds;
}
+ if (!empty($this->billExtra)) {
+ $extra = array_merge($extra, $this->billExtra);
+ }
$userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [
'link_id' => $model['coupon_user_id'],
'status' => $status == -1 ?: 1,
diff --git a/crmeb/listens/SendSubsidyCouponListen.php b/crmeb/listens/SendSubsidyCouponListen.php
index 94724c01..fedc4bda 100644
--- a/crmeb/listens/SendSubsidyCouponListen.php
+++ b/crmeb/listens/SendSubsidyCouponListen.php
@@ -39,6 +39,11 @@ class SendSubsidyCouponListen extends TimerService implements ListenerInterface
//补贴金额为当前补贴减去已获得的补贴
$amount = bcsub($item['subsidy'], $gotSubsidy, 2);
$consumptionRepo = new StoreConsumptionUserDao();
+ $consumptionRepo->billExtra = [
+ 'coupon_id' => $consumption['coupon_id'],
+ 'sale_amount' => $item['amount'],
+ 'purchase_amount' => $purchaseAmount,
+ ];
$consumptionRepo->send($consumption, 1, $merchant->uid, 0, $amount, StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
$count++;
}