rabin 3 years ago
parent
commit
3892948c58
2 changed files with 11 additions and 9 deletions
  1. 2 2
      service/bill/lib/Cash.php
  2. 9 7
      service/mail/lib/Manage.php

+ 2 - 2
service/bill/lib/Cash.php

@@ -6,7 +6,7 @@ use Dever;
 
 
 class Cash
 class Cash
 {
 {
-    public function up($mid, $type, $cash, $role, $type_id, $desc, $status)
+    public function up($mid, $type, $cash, $role, $type_id, $desc, $status, $insert = false)
     {
     {
         if ($cash == 0) {
         if ($cash == 0) {
             return false;
             return false;
@@ -34,7 +34,7 @@ class Cash
                 }
                 }
         		return Dever::db('bill/cash')->insert($data);
         		return Dever::db('bill/cash')->insert($data);
         	}
         	}
-            return $info['id'];
+            return !$insert ? $info['id'] : false;
         }
         }
 
 
         return false;
         return false;

+ 9 - 7
service/mail/lib/Manage.php

@@ -988,13 +988,15 @@ class Manage
                         if ($cash > 0 && $member && $member['status'] == 2) {
                         if ($cash > 0 && $member && $member['status'] == 2) {
 
 
                             $desc = Dever::load("area/api.string", $v['name'], '') . $date . '区域分润';
                             $desc = Dever::load("area/api.string", $v['name'], '') . $date . '区域分润';
-                            Dever::load('bill/lib/cash')->up($v['mid'], 15, $cash, $member['role'], $v['id'], $desc, 2);
-                            $where = array();
-                            $where['where_id'] = $v['mid'];
-                            $where['cash'] = $cash;
-                            $where['clear'] = true;
-                            Dever::db('agent/member')->upCash($where);
-                            Dever::db('mail/area_stat')->update(array('where_id' => $v['id'], 'cash_status' => 1));
+                            $state = Dever::load('bill/lib/cash')->up($v['mid'], 15, $cash, $member['role'], $v['id'], $desc, 2, true);
+                            if ($state) {
+                                $where = array();
+                                $where['where_id'] = $v['mid'];
+                                $where['cash'] = $cash;
+                                $where['clear'] = true;
+                                Dever::db('agent/member')->upCash($where);
+                                Dever::db('mail/area_stat')->update(array('where_id' => $v['id'], 'cash_status' => 1));
+                            }
                         }
                         }
                     }
                     }
                 }
                 }