|
@@ -3897,7 +3897,13 @@ class WholeController extends Curd
|
|
|
|
|
|
try {
|
|
|
Db::beginTransaction();
|
|
|
-
|
|
|
+ $dept = [];
|
|
|
+ if (!empty($params['dept_premises_id'])) {
|
|
|
+ $dept = SysDept::where('dept_id', $params['dept_premises_id'])
|
|
|
+ ->orWhere('dept_name', $params['dept_premises_id'])
|
|
|
+ ->select('dept_id', 'dept_name', 'dept_status', 'dept_category', 'dept_super_id', 'dept_super_path')
|
|
|
+ ->first();
|
|
|
+ }
|
|
|
// 核销数据
|
|
|
$params = [
|
|
|
'dept_premises_id' => $request->post('dept_premises_id'),
|
|
@@ -3957,6 +3963,12 @@ class WholeController extends Curd
|
|
|
}
|
|
|
if ($orderUsedComplete == 'Y') {
|
|
|
Order::where('order_id', $key)->update(['order_is_complete' => 'Y', 'order_status_system' => 'DONE']);
|
|
|
+ $processParams = [
|
|
|
+ 'join_order_member_id' => $params['join_order_member_id'],
|
|
|
+ 'orderId' => $key,
|
|
|
+ 'submit_premises_id' => $dept['dept_id'] ?? 0,
|
|
|
+ ];
|
|
|
+ Event::dispatch('order.complete', $processParams);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3964,13 +3976,7 @@ class WholeController extends Curd
|
|
|
foreach ($benefits as $benefit) {
|
|
|
foreach ($benefitList as $list) {
|
|
|
if ($list['member_benefit_id'] == $benefit['member_benefit_id'] && (!empty($benefit['join_benefit_goods_id']) || !empty($benefit['join_benefit_package_id'])) && !empty($benefit['join_benefit_order_id'])) {
|
|
|
- $dept = [];
|
|
|
- if (!empty($params['dept_premises_id'])) {
|
|
|
- $dept = SysDept::where('dept_id', $params['dept_premises_id'])
|
|
|
- ->orWhere('dept_name', $params['dept_premises_id'])
|
|
|
- ->select('dept_id', 'dept_name', 'dept_status', 'dept_category', 'dept_super_id', 'dept_super_path')
|
|
|
- ->first();
|
|
|
- }
|
|
|
+
|
|
|
$params['charge_amount'] = $list['nbr'];
|
|
|
$params['goods_id'] = !empty($benefit['join_benefit_goods_id']) ? $benefit['join_benefit_goods_id'] : (!empty($benefit['join_benefit_package_id']) ? $benefit['join_benefit_package_id'] : '');
|
|
|
$params['goods_sku_id'] = $benefit['join_benefit_goods_sku_id'];
|