ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-17 02:55:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/monitor/lib/event/trigger/notify/email.php
View File

@@ -71,7 +71,14 @@ class monitor_event_trigger_notify_email extends monitor_event_trigger_notify_co
$receiverInfo = $eventReceiverMdl->getList('receiver',['id'=>$receiverId]);
}
}else{
$receiverInfo[] = ['receiver'=>$notifyInfo['receiver']];
$receiverInfo = [];
if(is_array($notifyInfo['receiver'])) {
foreach($notifyInfo['receiver'] as $receiver) {
$receiverInfo[] = ['receiver'=>$receiver];
}
}else{
$receiverInfo[] = ['receiver'=>$notifyInfo['receiver']];
}
}
// 安全检查：确保$receiverInfo有值且包含有效的receiver字段
if (empty($receiverInfo) || !is_array($receiverInfo)) {
@@ -132,4 +139,4 @@ class monitor_event_trigger_notify_email extends monitor_event_trigger_notify_co
return ['rsp' =>'fail','msg'=> $emailLib->ErrorInfo];
}
}
}

50
app/monitor/lib/event/trigger/notify/zhannei.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
/**
* @Author: xueding@shopex.cn
* @Vsersion: 2022/10/18
* @Describe: 预警通知邮件发送
*/
class monitor_event_trigger_notify_zhannei extends monitor_event_trigger_notify_common
{
public function send($notifyInfo)
{
if (!$notifyInfo['send_content']) {
return ['rsp' => 'fail', 'msg' => '发送失败，发送内容为空'];
}
if ($notifyInfo['status'] == '1') {
return ['rsp' => 'fail', 'msg' => '已发送不能重复发送'];
}
// 系统消息推送到 service（monitor.service.notify.zhannei），以便业务自定义扩展行为
foreach (kernel::servicelist('monitor.service.notify.zhannei') as $object) {
if (method_exists($object, 'send')) {
$object->send($notifyInfo);
}
}
try {
// 获取rpcnotify模型
$rpcNotifyMdl = app::get('base')->model('rpcnotify');
// 准备插入数据
$data = [
'callback' => '', // 空回调地址
'rsp' => 'succ', // 默认成功状态
'msg' => $notifyInfo['send_content'], // 发送内容作为消息
'notifytime' => time(), // 当前时间戳
'status' => 'false', // 默认未读状态
];
// 插入数据到rpcnotify表
$result = $rpcNotifyMdl->insert($data);
if ($result) {
return ['rsp' => 'succ', 'msg' => '数据已成功写入rpcnotify表'];
} else {
return ['rsp' => 'fail', 'msg' => '数据写入失败'];
}
} catch (Exception $e) {
return ['rsp' => 'fail', 'msg' => $e->getMessage()];
}
}
}