edit

app/cash/lib/Cron.php

@@ -179,18 +179,48 @@ class Cron
     # 修正礼品卡结算单金额，之前是九折，现在不是了
     public function up_cash_api()
     {
-        $order = Dever::db('shop/order')->select();
+        $order = Dever::db('shop/sell_order')->select();
         if ($order) {
             foreach ($order as $k => $v) {
                 if ($v['card_code_cash'] > 0) {
                     # 礼品卡订单
                     $info = Dever::db('cash/order')->select(array('pay_type' => 2, 'source_order_num' => $v['order_num']));
-                    if ($info) {
-                        
+                    $order_data = $v;
+                    $order_data['type'] = 1;
+                    $order_data['type_id'] = $order_data['shop_id'];
+                    $order_data['source_type'] = 4;
+                    $order_data['source_id'] = -1;
+                    $order_data['price'] = $v['card_code_cash'];
+                    $order_data['p_price'] = $v['card_code_cash'];
+
+                    if (!$info) {
+                        if ($v['status'] == 5 || $v['status'] == 6) {
+                            # 完成
+                            Dever::load('cash/lib/order')->up($order_data, 3, 2, false, 2, $v['fdate']);
+                        } elseif ($v['status'] == 8) {
+                            # 退款
+                            Dever::load('cash/lib/order')->up($order_data, 2, 2, false, 2, $v['operdate']);
+                        } elseif ($v['status'] == 7) {
+                            # 取消
+                            Dever::load('cash/lib/order')->up($order_data, 3, 3, false, 2, $v['operdate']);
+                        } else {
+                            # 处理中
+                            Dever::load('cash/lib/order')->up($order_data, 3, 1, false, 2, $v['cdate']);
+                        }
+                    } elseif ($info) {
+                        if ($v['status'] == 5 || $v['status'] == 6) {
+                            Dever::load('cash/lib/order')->up($order_data, 3, 2, false, 2, $v['fdate']);
+                        } elseif ($v['status'] == 8) {
+                            Dever::load('cash/lib/order')->up($order_data, 2, 2, false, 2);
+                        } elseif ($v['status'] == 7) {
+                            Dever::load('cash/lib/order')->up($order_data, 3, 3, false, 2, $v['operdate']);
+                        }
                     }
                 }
             }
         }
+
+        return 'ok';
     }
 
 }

app/cash/lib/Order.php

@@ -7,7 +7,7 @@ use Dever;
 class Order
 {
 	# 更新结算单
-    public function up($order, $jstype = 1, $audit = 1, $refund = false, $pay_type = 1)
+    public function up($order, $jstype = 1, $audit = 1, $refund = false, $pay_type = 1, $operdate = false)
     {
         Dever::config('base')->hook = true;
         if (!$order) {
@@ -41,7 +41,7 @@ class Order
         $update['audit_type'] = $audit_type;
 
         if ($update['status'] == 2) {
-            $update['operdate'] = time();
+            $update['operdate'] = $operdate ? $operdate : time();
             $update['fdate'] = $update['operdate'];
             if (isset($order['fdate']) && $order['fdate'] && ($order['status'] == 5 || $order['status'] == 6)) {
                 $update['fdate'] = $order['fdate'];

app/shop/lib/Sell.php

@@ -385,13 +385,13 @@ class Sell
                     # 还原礼品卡
                     Dever::db('card/code')->decUseCash(array('where_id' => $data['card_code_id'], 'set_use_cash' => $data['card_code_cash']));
 
-                    Dever::load('cash/lib/order')->up($data, 3, 2, false, 2);
+                    Dever::load('cash/lib/order')->up($data, 3, 3, false, 2);
 
                 } elseif (isset($data['wallet_cash']) && $data['wallet_cash'] && $data['wallet_cash'] > 0) {
                     # 还原钱包
                     Dever::load('shop/lib/money')->up($data['uid'], 4, $data['wallet_cash'], $data['id'], '商品退款', 2);
 
-                    Dever::load('cash/lib/order')->up($data, 3, 2, false, 3);
+                    Dever::load('cash/lib/order')->up($data, 3, 3, false, 3);
                 }
 
                 $this->updateSell($data, 2);

service/agent/src/My.php

@@ -1162,7 +1162,7 @@ class My extends Core
     private function getAreaOne($v)
     {
         $date = date('Y年m月', $v['month']);
-        $v['name'] = Dever::load("area/api.string", $v['name'], '') . '区域收入' . $date . '对账单';
+        $v['name'] = Dever::load("area/api.string", $v['name'], '') . '区域运营收益' . $date . '对账单';
 
         list($year, $month, $end) = explode('-', date('Y-m-t', $v['month']));
 

service/bill/database/cash.php

@@ -25,7 +25,7 @@ $type = array
     12 => '消费',
     13 => '区域招商补贴',
     14 => '创V归店补贴',
-    15 => '区域收益',
+    15 => '区域运营收益',
 );
 
 $role = function()

service/mail/lib/Manage.php

@@ -1047,7 +1047,7 @@ class Manage
                         $member = Dever::db('agent/member')->find($v['mid']);
                         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 . '区域运营收益';
                             $state = Dever::load('bill/lib/cash')->up($v['mid'], 15, $cash, $member['role'], $v['id'], $desc, 2, true);
                             if ($state) {
                                 $where = array();