admin update

admin/control/control.php

@@ -9,6 +9,7 @@
 defined('InShopNC') or exit('Access Invalid!');
 require_once(BASE_HELPER_PATH . '/mtopcard/mtopcard.php');
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
+require_once(BASE_DATA_PATH . '/model/merchant.model.php');
 class SystemControl
 {
     const STATE_TEXT = ['使用中', '已禁用'];
@@ -17,6 +18,10 @@ class SystemControl
         mtopcard\ThirdElectricProduct => '电费产品',
         mtopcard\ThirdSMSProduct => '短信产品'
     ];
+    const ADD_TYPE_TEXT = [
+        merchantModel::type_mch_deposit => '商户预存', merchantModel::type_adm_deposit => '后台手动预存', merchantModel::type_adm_adjust => '后台手动调款',
+        merchantModel::type_adm_finpos => '余额找平', merchantModel::type_mch_transfer => '平台转款', merchantModel::type_refund_back => '订单返销'
+    ];
 	/**
 	 * 管理员资料 name id group
 	 */

admin/control/orderstats.php

@@ -165,9 +165,21 @@ class orderstatsControl extends SystemControl
             $cond['time_type'] = $_GET['order_time_type'];
         }
 
+        $add_type_text = self::ADD_TYPE_TEXT;
         $balance_list = $mod->getBalanceList($cond, 200);
         foreach ($balance_list as &$item) {
-
+            $transfer_detail_data = [];
+
+            if(!empty($item['transfer_detail'])) {
+                $transfer_detail = json_decode($item['transfer_detail'], true);
+                foreach ($transfer_detail as $add_type => $value) {
+                    $transfer_detail_data[$add_type] = [
+                        'name' => $add_type_text[$add_type],
+                        'amount' => $value
+                    ];
+                }
+            }
+            $item['transfer_detail_data'] = $transfer_detail_data;
         }
         
         $order_time_type_text = ['notify_time' => '回调时间', 'order_time' => '下单时间'];
@@ -186,8 +198,9 @@ class orderstatsControl extends SystemControl
 
         $condition = ['end' => $end_unixtime];
 
+        $end_txt = date("Y-m-d H:i:s");
         $manager = new task\manager();
-        $task = $manager->add_task('refill_balance_stat_all',$condition,1,-1,'对账统计');
+        $task = $manager->add_task('refill_balance_stat_all',$condition,1,-1,"对账统计-{$end_txt}");
         if ($task->completed() && $task->success()) {
             exit(json_encode(['code' => true, 'msg' => '操作成功，此记录已新建成功。']));
         } else {
@@ -278,19 +291,6 @@ class orderstatsControl extends SystemControl
             showMessage('记录不存在！');
         }
 
-        $start_stamp = strtotime($_POST['start_stamp']);
-        if(empty($start_stamp)) {
-            $start_stamp = 0;
-        }
-        $end_text = $_POST['end_text'];
-        if (!empty($end_text)) {
-            $end_stamp = strtotime($end_text);
-        } else {
-            $end_stamp = 0;
-        }
-        if($start_stamp > $end_stamp){
-            showMessage('统计日期有误！');
-        }
         $success_count = $_POST['success_count'] ?? 0;
         $refill_amount = $_POST['refill_amount'] ?? 0;
         $mch_amount = $_POST['mch_amount'] ?? 0;
@@ -303,7 +303,7 @@ class orderstatsControl extends SystemControl
         $remark = $_POST['remark'] ?? '';
 
         $update = [
-            'start_stamp' => $start_stamp, 'end_stamp' => $end_stamp, 'end_text' => $end_text, 'success_count' => $success_count,
+            'success_count' => $success_count,
             'refill_amount' => $refill_amount, 'mch_amount' => $mch_amount, 'channel_amount' => $channel_amount,
             'profit_amount' => $profit_amount, 'refund_amount' => $refund_amount, 'except_amount' => $except_amount,
             'accumulate_balance' => $accumulate_balance, 'balance' => $balance, 'remark' => $remark

admin/control/refill_evidence.php

@@ -109,10 +109,7 @@ class refill_evidenceControl extends SystemControl
     {
         $status_text = [merchantModel::status_applying =>'申请中', merchantModel::status_passed => '已通过', merchantModel::status_denied => '已驳回'];
         $operation_text = [merchantModel::oper_undeposited => '未预存', merchantModel::oper_deposited => '已预存'];
-        $add_type_text = [
-            merchantModel::type_mch_deposit => '商户预存', merchantModel::type_adm_deposit => '后台手动预存', merchantModel::type_adm_adjust => '后台手动调款',
-            merchantModel::type_adm_finpos => '余额找平', merchantModel::type_mch_transfer => '平台转款', merchantModel::type_refund_back => '订单返销'
-        ];
+        $add_type_text = self::ADD_TYPE_TEXT;
         $is_bank_text = ['否','是'];
 
         $merchants = [];

admin/control/refill_order_manual.php

@@ -628,7 +628,7 @@ class refill_order_manualControl extends SystemControl
         $input['after_available'] = ncPriceFormat($mem_info['available_predeposit'] + $params['mch_amount']);
         $input['admin_name'] = $admininfo['name'];
         $input['admin_id'] = $admininfo['id'];
-        $input['add_type'] = Model('merchant')::type_refund_back;
+        $input['add_type'] = merchantModel::type_refund_back;
 
         return Model('merchant')->addRefillEvidence($input);
     }