edit

config/base.php

@@ -74,19 +74,18 @@ $config['base'] = array
             'link' => 'option/lib/email.act',
             'content' => '<img src="https://7.churenyiliao.com/1/2022/02/28/ca21f07ab6333b74dcb78d09fdcd2d20.png" width="150"/>
 <br /><br />
-{username}，您好，
+尊敬的{username}，您好：
 <br /><br />
 欢迎您使用期权管理系统，请点击以下链接，完成邮箱验证。
 <br /><br />
-验证后请重新打开期权管理系统，确认您的期权交付情况。
-<br /><br />
+验证链接：
 【{link}】
 <br /><br />
-验证邮件发送日期：{date}
+验证通过后，请重新登录期权管理系统，完成期权确认。
 <br /><br />
 请于7日内点击确认按钮，超过时限未确认，将失去期权获取资格。
 <br /><br />
-本邮件仅供期权使用人验证邮箱使用，请勿回复。
+本邮件为系统自动发放，请勿回复。如有疑问联系客服咨询。
 <br /><br /><br /><br />
 
 <img src="https://7.churenyiliao.com/1/2022/04/02/67a6241c822ed18b768cce6d1f938ef5.png" width="150"/>

service/bill/database/cash.php

@@ -18,7 +18,7 @@ $type = array
 (
     1 => '直推佣金',
     2 => '市场培训费',
-    3 => '代理区域分润',
+    //3 => '代理区域分润',
     4 => '活动分佣',
     10 => '手动发放',
     11 => '提现',

service/bill/database/cash_in_stat.php

@@ -31,7 +31,7 @@ $config = array
             'search'    => 'day',
             'search_button' => array
             (
-                'sum' => 'cash,daili_cash,soft_cash,goods_cash,zt_cash,sc_cash',
+                'sum' => 'cash,daili_cash,soft_cash,goods_cash,zt_cash,sc_cash,hd_cash,sd_cash',
                 'option' => array(
                     'day' => '按天',
                     'week' => '按周',
@@ -45,68 +45,90 @@ $config = array
 
         'cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
             'name'      => '总收入',
             'default'   => '0',
             'desc'      => '总收入',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({cash}, 2)',
+            'list'      => true,
         ),
 
         'daili_cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
             'name'      => '代理费',
             'default'   => '0',
             'desc'      => '代理费',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({daili_cash}, 2)',
+            'list'      => true,
         ),
 
         'soft_cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
             'name'      => '软件服务费',
             'default'   => '0',
             'desc'      => '代软件服务费理费',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({soft_cash}, 2)',
+            'list'      => true,
         ),
 
         'goods_cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
             'name'      => '赠送商品价值',
             'default'   => '0',
             'desc'      => '赠送商品价值',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({goods_cash}, 2)',
+            'list'      => true,
         ),
 
         'zt_cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
             'name'      => '直推佣金',
             'default'   => '0',
             'desc'      => '直推佣金',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({zt_cash}, 2)',
+            'list'      => true,
         ),
 
         'sc_cash'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'float-11,2',
+            'name'      => '市场培训费',
+            'default'   => '0',
+            'desc'      => '市场培训费',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'list'      => true,
+        ),
+
+        'hd_cash'        => array
+        (
+            'type'      => 'float-11,2',
+            'name'      => '活动佣金',
+            'default'   => '0',
+            'desc'      => '活动佣金',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'list'      => true,
+        ),
+
+        'sd_cash'        => array
+        (
+            'type'      => 'float-11,2',
             'name'      => '市场培训费',
             'default'   => '0',
             'desc'      => '市场培训费',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'      => 'round({sc_cash}, 2)',
+            'list'      => true,
         ),
 
         'state'     => array
@@ -156,7 +178,7 @@ $config = array
             'order' => array('time' => 'desc', 'cdate' => 'desc'),
             'page' => array(20, 'list'),
             'group' => 'day',//cash,daili_cash,soft_cash,goods_cash,zt_cash,sc_cash
-            'col' => '*,min(day) as time, sum(cash) as cash, sum(daili_cash) as daili_cash, sum(soft_cash) as soft_cash, sum(zt_cash) as zt_cash, sum(goods_cash) as goods_cash, sum(sc_cash) as sc_cash',
+            'col' => '*,min(day) as time, sum(cash) as cash, sum(daili_cash) as daili_cash, sum(soft_cash) as soft_cash, sum(zt_cash) as zt_cash, sum(goods_cash) as goods_cash, sum(sc_cash) as sc_cash, sum(hd_cash) as hd_cash, sum(sd_cash) as sd_cash',
         ),
     ),
 );

service/bill/lib/Cron.php

@@ -213,7 +213,7 @@ class Cron
     }
 
     # 资金账户统计：日期，总收入，代理费，软件服务费，赠送商品价值，直推佣金，市场培训费
-    # 总收入金额 = 代理费金额 + 软件服务费 - 赠送商品价值 - 直推分佣 - 市场培训费。
+    # 总收入金额 = 代理费金额 + 软件服务费 - 赠送商品价值 - 直推分佣 - 市场培训费 - 活动分佣 - 手动发放
     public function cash_in_api()
     {
         $num = Dever::input('num', 1);
@@ -224,6 +224,86 @@ class Cron
         $end = Dever::maketime($end . ' 23:59:59');
         $day = intval(($end - $start)/86400);
         
+        for($i=0; $i<=$day; $i++) {
+            $where = array();
+            $where['start'] = $start + 86400*$i;
+            $where['end'] = $start + 86400*$i + 86399;
+            $data = array();
+            $data['day'] = $where['start'];
+            $info = Dever::db('bill/cash_in_stat')->find($data);
+
+            $where['status'] = 4;
+            $data['daili_cash'] = 0;
+            $cash = Dever::db('agent/order')->getDailiCash($where);
+            if ($cash) {
+                $data['daili_cash'] = $cash['total'];
+            }
+            $data['soft_cash'] = 0;
+            $cash = Dever::db('agent/order')->getSoftCash($where);
+            if ($cash) {
+                $data['soft_cash'] = $cash['total'];
+            }
+            $data['goods_cash'] = 0;
+            $cash = Dever::db('agent/order')->getGoodsCash($where);
+            if ($cash) {
+                $data['goods_cash'] = $cash['total'];
+            }
+            unset($where['status']);
+
+            $where['type'] = 1;
+
+            $data['zt_cash'] = 0;
+            $cash = Dever::db('bill/cash')->getCash($where);
+            if ($cash) {
+                $data['zt_cash'] = $cash['total'];
+            }
+
+            $where['type'] = 2;
+
+            $data['sc_cash'] = 0;
+            $cash = Dever::db('bill/cash')->getCash($where);
+            if ($cash) {
+                $data['sc_cash'] = $cash['total'];
+            }
+
+            $where['type'] = 4;
+
+            $data['hd_cash'] = 0;
+            $cash = Dever::db('bill/cash')->getCash($where);
+            if ($cash) {
+                $data['hd_cash'] = $cash['total'];
+            }
+
+            $where['type'] = 10;
+
+            $data['sd_cash'] = 0;
+            $cash = Dever::db('bill/cash')->getCash($where);
+            if ($cash) {
+                $data['sd_cash'] = $cash['total'];
+            }
+
+            $data['cash'] = $data['daili_cash'] + $data['soft_cash'] - $data['goods_cash'] - $data['sc_cash'] - $data['zt_cash'] - $data['hd_cash'] - $data['sd_cash'];
+
+            if (!$info) {
+                Dever::db('bill/cash_in_stat')->insert($data);
+            } else {
+                $data['where_id'] = $info['id'];
+                Dever::db('bill/cash_in_stat')->update($data);
+            }
+        }
+    }
+
+    # 应付金额 = 现存余额 + 未审核提现 + 已审核待发放提现。
+    public function cash_out_api()
+    {
+        $num = Dever::input('num', 1);
+        $start = Dever::input('start', date('Y-m-d', strtotime('-'.$num.' day')));
+        $end = Dever::input('end', date('Y-m-d'));
+
+        $start = Dever::maketime($start . ' 00:00:00');
+        $end = Dever::maketime($end . ' 23:59:59');
+        $day = intval(($end - $start)/86400);
+        
         for($i=0; $i<=$day; $i++) {
             $where = array();
             $where['start'] = $start + 86400*$i;

service/option/lib/Manage.php

@@ -40,6 +40,7 @@ class Manage
         Dever::config('base')->hook = true;
         $update = array();
         $audit = Dever::param('audit', $data);
+        $desc = Dever::param('audit_desc', $data);
         $send_email = Dever::param('send_email', $data);
         $email = Dever::param('email', $data);
         $info = Dever::db('option/account')->one($id);
@@ -63,6 +64,16 @@ class Manage
                     }   
                 }
             }
+
+            if ($audit == 3) {
+                if (Dever::project('sms')) {
+                    Dever::load('sms/api')->send('qiquan_reg_yes', $info['mobile'], array('name' => $info['name']));
+                }
+            } elseif ($audit == 4) {
+                if (Dever::project('sms')) {
+                    Dever::load('sms/api')->send('qiquan_reg_no', $info['mobile'], array('name' => $info['name'], 'content' => $desc));
+                }
+            }
         }
     }
 
@@ -72,6 +83,7 @@ class Manage
         Dever::config('base')->hook = true;
         $update = array();
         $audit = Dever::param('audit', $data);
+        $desc = Dever::param('audit_desc', $data);
         $info = Dever::db('option/agreement')->one($id);
         if ($audit > 1 && $info) {
             $admin = Dever::load('manage/auth.info');
@@ -86,6 +98,15 @@ class Manage
             if ($state && $audit == 3) {
                 Dever::load('option/lib/cash.setValue_commit', $info);
             }
+            if ($audit == 3) {
+                if (Dever::project('sms')) {
+                    Dever::load('sms/api')->send('qiquan_audit', $info['mobile'], array('name' => $info['name']));
+                }
+            } elseif ($audit == 4) {
+                if (Dever::project('sms')) {
+                    Dever::load('sms/api')->send('qiquan_audit', $info['mobile'], array('name' => $info['name'], 'content' => $desc));
+                }
+            }
         }
     }