Your Name 2 years ago
parent
commit
9079c195c0

+ 1 - 1
learn/active/database/info_refund.php

@@ -176,7 +176,7 @@ return array
                 'state' => 1,
                 'status' => 2,
             ),
-            'type' => 'one',
+            'type' => 'all',
             'order' => array('cdate' => 'desc'),
             'col' => '*,sum(price) as price',
         ),

+ 36 - 15
learn/active/lib/Manage.php

@@ -289,20 +289,29 @@ Class Manage
         }
         // print_R($id);die;
         $refund = Dever::db('active/info_refund')->getSearch(array('order_id'=>$id));
-        // echo dever::sql();die;
-        $refund_log = Dever::db('active/info_refund_log')->getSearch(array('order_id'=>$id));
-        $refund_money = $refund['price'] + $refund_log['price'];
+        $refund_path = array();
         $refund_desc = '';
-        if ($refund['desc']) {
-            $refund_desc = $refund['desc'];
-        } else if ($refund_log && $refund_log['desc']) {
-            $refund_desc = $refund_log['desc'];
+        if ($refund) {
+            foreach ($refund as $k1 => $v1) {
+                 $refund_log = Dever::db('active/info_refund_log')->getSearch(array('order_id'=>$v1['id']));
+                 $refund_desc = $v1['desc'];
+                 if ($refund_log) {
+                    if ($refund_log['desc'] != $v1['desc']) {
+                        $refund_desc = $refund_log['desc'];
+                    }
+                 }
+                 if (!$v1['num']) {
+                    $v1['num'] = 0;
+                 }
+                 if (!$v1['price']) {
+                    $v1['price'] = 0;
+                 }
+                $refund_path[] =  array('退款数量',$v1['num']);
+                $refund_path[] = array('退款金额',$v1['price']);
+                $refund_path[] = array('退款备注',$refund_desc);
+            }
         }
-        // if ($active['col'] && $active['col'] == 'idcard') {
-        //     $user_idcard = $user['idcard'];
-        // } else {
-        //     $user_idcard = '';
-        // }
+
         $path = array();
         $path_data = array();
         if ($info['path']) {
@@ -344,13 +353,25 @@ Class Manage
                 ),
                 array
                 (
-                    array('退款数量', $info['refund_num']),
-                    array('退款总金额', $refund_money),
-                    array('退款备注', $refund_desc),
+                    // array('退款数量', $info['refund_num']),
+                    // array('退款总金额', $refund_money),
+                    // array('退款备注', $refund_desc),
                     
                 ),
             ),
         );
+        if ($refund_path && $refund) {
+            $result['退款信息'] = array
+            (
+                'type' => 'info',
+                'content' => array
+                (
+                    $refund_path,
+                ),
+            );
+        }
+        
+        
         $result['用户信息'] = array
         (
             'type' => 'info',

+ 18 - 0
tool/work/database/appoint.php

@@ -9,6 +9,11 @@ $admin = function()
     }
     return $array;
 };
+$email = array
+(
+    1 => '不发送',
+    2 => '发送',
+);
 return array
 (
     # 表名
@@ -69,6 +74,19 @@ return array
             'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
         ),
 
+        'email'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '是否发送邮件',
+            'default'   => '1',
+            'desc'      => '是否发送邮件',
+            'match'     => 'option',
+            'option'    => $email,
+            // 'search'    => 'linkage',
+            'update'    => 'radio',
+            // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
+        ),
+
         'group'       => array
         (
             'type'      => 'int-11',

+ 18 - 0
tool/work/database/info.php

@@ -70,6 +70,11 @@ $status = array
     3 => '完成关闭',
     4 => '取消关闭',
 );
+$email = array
+(
+    1 => '不发送',
+    2 => '发送',
+);
 $admin = Dever::load("manage/auth.info");
 $admin_id = '';
 if ($admin) {
@@ -357,6 +362,19 @@ return array
             'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
         ),
 
+        'email'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '是否发送邮件',
+            'default'   => '1',
+            'desc'      => '是否发送邮件',
+            'match'     => 'option',
+            'option'    => $email,
+            // 'search'    => 'linkage',
+            'update'    => 'radio',
+            // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
+        ),
+
         'status'      => array
         (
             'type'      => 'int-11',

+ 10 - 0
tool/work/lib/Appoint.php

@@ -53,6 +53,7 @@ Class Appoint
 		Dever::config('base')->hook = true;
 		$info_id = Dever::param('info_id',$data);
 		$branch = Dever::param('admin_id',$data);
+        $email = Dever::param('email',$data);
 		if ($info_id ) {
 			$info = Dever::db('work/info')->find($info_id);
 			$admin = Dever::load('manage/auth.info');
@@ -99,6 +100,15 @@ Class Appoint
                 }
 				Dever::db('work/appoint')->update($wh);
 			}
+            if ($email && $email == 2) {
+                $admin = Dever::db('manage/admin')->find($branch['1']);
+                $res = Dever::load('work/lib/manage')->getTotal($admin['id'],'1,2');
+                 $work_list =Dever::url('project/database/list?project=work&table=info&search_option_dever_auth=2&search_option_state=1&[refer]', 'manage');
+                $url = Dever::url('home?link=' . urlencode($work_list) . '&group=10&parent_menu=work&menu=work.info' , 'manage');
+                // $url = 
+                $content = '你有'.$res.'个待处理工单,<a href="'.$url.'">点此跳转至工单系统查看</a>';
+                Dever::load('work/lib/cron')->send($admin['email'],$admin['username'],'你有新的工单待处理',$content);
+            }
 		}
 	}
 	#指派人

+ 1 - 1
tool/work/lib/Cron.php

@@ -108,7 +108,7 @@ Class Cron
         $mail->SMTPAuth = true;
         $mail->Username = $config['username'];
         $mail->Password = $config['password'];
-        $mail->setFrom($config['from'][0], '统');
+        $mail->setFrom($config['from'][0], '工单系统');
         $mail->addAddress($email, $username);
         $mail->Subject = "=?utf-8?B?" . base64_encode($title) . "?=";
         $mail->Body = $content;

+ 11 - 0
tool/work/lib/Manage.php

@@ -111,6 +111,7 @@ Class Manage
 		$mobile = Dever::param('mobile',$data);
 		$cate_id = Dever::param('cate_id',$data);
 		$name = Dever::param('name',$data);
+		$email = Dever::param('email',$data);
 		$user = Dever::db('work/user')->find(array('mobile'=>$mobile));
 		if ($user) {
 			if ($name && $user['name'] != $name) {
@@ -176,6 +177,16 @@ Class Manage
 				$w['where_id'] = $id;
 				Dever::db('work/info')->update($w);
 			}
+			if ($email && $email == 2) {
+				if ($w) 
+				$admin = Dever::db('manage/admin')->find($branch_id[1]);
+                $res = Dever::load('work/lib/manage')->getTotal($admin['id'],'1,2');
+                // $url = Dever::url('project/database/list?project=work&table=info&search_option_dever_auth=2&search_option_state=1&[refer]', 'manage');
+                $work_list =Dever::url('project/database/list?project=work&table=info&search_option_dever_auth=2&search_option_state=1&[refer]', 'manage');
+                $url = Dever::url('home?link=' . urlencode($work_list) . '&group=10&parent_menu=work&menu=work.info' , 'manage');
+                $content = '你有'.$res.'个待处理工单,<a href="'.$url.'">点此跳转至工单系统查看</a>';
+                Dever::load('work/lib/cron')->send($admin['email'],$admin['username'],'你有新的工单待处理',$content);
+			}
 		}
 	}
 	public function getWorkId()