增加注释

app/command/CommissionCronTask.php

@@ -3,39 +3,10 @@ declare (strict_types=1);
 
 namespace app\command;
 
-use AdaPaySdk\Drawcash;
-use AdaPaySdk\PaymentConfirm;
-use AdaPaySdk\SettleAccount;
-use app\common\model\merchant\order\OrderMerchant;
-use app\common\model\store\order\StoreOrder;
-use app\common\model\user\User;
-use app\common\model\user\UserCertification;
-use app\common\repositories\merchant\order\OrderGzcRepository;
-use app\common\repositories\merchant\order\OrderMerchantRepository;
-use app\common\repositories\store\order\StoreOrderStatusRepository;
-use app\common\repositories\store\order\StoreRefundOrderRepository;
-use app\common\repositories\store\product\ProductRepository;
-use app\common\repositories\user\UserBillRepository;
-use app\common\repositories\user\UserRepository;
-use app\common\repositories\user\UserThirdRepository;
-use app\controller\api\Common;
 use app\controller\api\cron\CommissionCron;
-use app\controller\api\merchant\sxy\Access;
-use app\controller\api\store\product\Jd;
-use app\controller\api\util\Signature;
-use app\traits\GongApiRequest;
-use app\traits\GzcApiRequest;
-use app\traits\ShouxinyiApiRequest;
-use Carbon\Carbon;
-use think\App;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
-use think\Exception;
-use think\facade\Db;
-use think\facade\Log;
-use app\common\repositories\store\order\StoreOrderRepository;
-use think\facade\Request;
 
 /**
  * Class PensionTasks

app/controller/api/cron/CommissionCron.php

@@ -551,34 +551,174 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
         return app('json')->success('操作成功');
     }
 
+    //定时任务写日账单，月账单
+    public function cron($day,$mer_id=496)
+    {
+        //        $day=date('Y-m-d', strtotime('-1 days'));
+        //        $enterprise_bill_item=[];
+        //        $order= $order_query->select();
+        //        foreach ($order as $v) {
+        //            $arr = [];
+        //            $arr['mer_id'] = $mer_id;
+        //            $arr['transaction_time'] = $v['pay_time'];
+        //            $arr['money'] = $v['pay_price'];
+        //            $arr['uid'] = $v['uid'];
+        //            $arr['order_sn'] = $v['order_sn'];
+        //            $arr['type'] = 1;
+        //            $enterprise_bill_item[] = $arr;
+        //        }
+        //        if ($enterprise_bill_item) {
+        //            Db::name('enterprise_bill_item')->insertAll($enterprise_bill_item);
+        //        }
+
+        Db::name('enterprise_day_bill')->where('mer_id', $mer_id)->where('day', $day)->delete();
+
+        $day_flow_query = Db::name('enterprise_platform_income_detail')
+            ->where('mer_id', $mer_id)
+            ->when($mer_id, function ($query) use ($mer_id) {
+                $query->where('deal_type', -1);//没有流水
+            }, function ($query) use ($mer_id) {
+                $query->whereIn('deal_type', [3]);
+            })
+
+            ->where('deal_type', 4)
+            ->where('pm', 1);
+        $day_flow_query_month = clone $day_flow_query;
+        // 日订单流水
+        $day_flow = $day_flow_query->where("DATE(deal_time) = '" . $day . "'")->sum('money');
+
+        $accounting_query = Db::name('enterprise_platform_income_detail')
+            ->where('mer_id', $mer_id)
+            ->when($mer_id, function ($query) use ($mer_id) {
+                $query->where('deal_type', 1);
+            }, function ($query) use ($mer_id) {
+                $query->whereIn('deal_type', [6,7]);
+            })
+            ->where('pm', 1);
+        $accounting_query_month = clone $accounting_query;
+        // 入账金额
+        $day_accounting = $accounting_query->where("DATE(deal_time) = '" . $day . "'")->sum('money');
+
+        $expenditure_query = Db::name('enterprise_platform_income_detail')
+            ->when($mer_id, function ($query) use ($mer_id) {
+                $query->where('mer_id', $mer_id)
+                    ->where('deal_type', -1);//没有流水
+            }, function ($query) use ($mer_id) {
+                $query->whereIn('deal_type', [4,5]);
+            });
+        $expenditure_query_month = clone $expenditure_query;
+        // 日支出总额
+        $day_expenditure = 0;
+        if($mer_id==0){
+            $day_expenditure = $expenditure_query->where("DATE(deal_time) = '" . $day . "'")
+                ->whereIn('deal_type', [4,5])
+                ->where('mer_id',0)
+                ->sum('money');
+        }
+
+        $insert = [];
+        $insert['mer_id'] = $mer_id;
+        $insert['day'] = $day;
+        $insert['flow'] = $day_flow;
+        $insert['expenditure'] = $day_expenditure;
+        $insert['accounting'] = $day_accounting;
+
+        $previousDate = date('Y-m-d', strtotime($day . ' -1 day'));
+        $balance_zuotian = Db::name('enterprise_day_bill')->where('day', $previousDate)->where('mer_id', $mer_id)->value('balance');
+        $balance = $balance_zuotian ? $balance_zuotian : 0;
+
+        if($mer_id){
+            $tixian = Db::name('user_extract')->where("DATE(status_time) = '" . $day . "'")->where('mer_id', $mer_id)->where('status', 1)->sum('extract_price');
+            $service_money = Db::name('user_extract')->where("DATE(status_time) = '" . $day . "'")->where('mer_id', $mer_id)->where('status', 1)->sum('service_money');
+            $tixian -= $service_money;
+            $ylj = Db::name('user_bill')->where('mer_id', $mer_id)->where('status', 1)->where("DATE(take_time) = '" . $day . "'")->sum('number');
+            $insert['balance'] = $day_accounting - $tixian + $balance - $ylj;
+        }else{
+            $tixian =  Db::name('enterprise_platform_income_detail')
+                ->where("deal_time >'$day'")
+                ->where("deal_time <'$day 23:59:59'")
+                ->where('deal_type', 5)
+                ->sum('money');
+            $insert['balance'] = $day_accounting - $tixian + $balance ;
+        }
+
+
+
+        Db::name('enterprise_day_bill')->insertGetId($insert);
+
+
+        $month_list[] = date('Y-m', strtotime('-4 month'));
+        $month_list[] = date('Y-m', strtotime('-3 month'));
+        $month_list[] = date('Y-m', strtotime('-2 month'));
+        $month_list[] = date('Y-m', strtotime('-1 month'));
+        $month_list[] = date('Y-m');
+        foreach ($month_list as $month) {
+            Db::name('enterprise_month_bill')->where('mer_id',$mer_id)->where('month', $month)->delete();
+
+            $flow_query_month_clone = clone $day_flow_query_month;
+            $accounting_query_month_clone = clone $accounting_query_month;
+            $expenditure_query_month_clone = clone $expenditure_query_month;
+
+            $startDate = date('Y-m-01 00:00:00', strtotime($month));
+            $endDate = date("Y-m-d 00:00:00", strtotime('+1 month', strtotime($month)));
+
+            // 月订单流水
+            $money_flow = $flow_query_month_clone->whereBetween('deal_time', [$startDate, $endDate])->sum('money');
+
+            // 月入账总额
+            $money_accounting = $accounting_query_month_clone->whereBetween('deal_time', [$startDate, $endDate])->sum('money');
+
+            // 月支出总额
+            $money_expenditure = $expenditure_query_month_clone->whereBetween('deal_time', [$startDate, $endDate])->sum('money');
+
+            $insert2 = [];
+            $insert2['month'] = $month;
+            $insert2['mer_id'] = $mer_id;
+            $insert2['flow'] = $money_flow;
+            $insert2['expenditure'] = $money_expenditure;
+            $insert2['accounting'] = $money_accounting;
+            Db::name('enterprise_month_bill')->insertGetId($insert2);
+        }
+
+    }
+
     /**
      * 定时获取 交易类型 1订单入账 2佣金提现支出 3养老金（红积分兑换订单）
      */
     public function platform_income_detail_get()
     {
 
+        // 1、获取所有 商户 商户名称非空， 状态为正常、商户状态为开启
         $merchant_list = Db::name('merchant')
             ->where('status', 1)
             ->where('mer_state', 1)
             ->where("mer_name  != ''")
             ->column('mer_id');
-        $Reconciliation = app()->make(Reconciliation::class);
 
-        $unique_list = [];
+        // 2、插入日账单、月账单
+        // $Reconciliation = app()->make(Reconciliation::class);
+        $Reconciliation = $this;
 
+        // 3、获取 已有的 平台收支明细，并创建 唯一的 key
+        $unique_list = [];
         $enterprise_platform_income_detail_list = Db::name('enterprise_platform_income_detail')
             ->select()
             ->toArray();
         foreach ($enterprise_platform_income_detail_list as $item) {
+            // deal_type : '交易类型 1自营订单入账(商户) 2佣金提现到账(商户) 3订单支付 4商户佣金提现 5用户佣金提现 6订单入账 7 创客自营订单让利 '
+            // user_extra_id : 提现表id
             $unique_list[] = $item['deal_type'] . $item['uid'] . $item['order_sn'] . $item['order_id'] . $item['user_extra_id'] . $item['mer_id'];
         }
-        foreach ($merchant_list as $mer_id) {
 
+        // 4、循环所有商户ID
+        foreach ($merchant_list as $mer_id) {
+            /** @var OrderMerchantRepository $OrderMerchantRepository */
             $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
 
             $is_first = empty($enterprise_platform_income_detail_list);
 
             // 1自营订单入账金额=已结算订单金额-运费-养老金-汇付通道服务费； 订单结算的时候才统计
+            // 查询 该商户 所有的 平台订单（已支付、平台订单、已结算）
             $store_order_list = Db::name('store_order')
                 ->where('mer_id', $mer_id)
                 ->where('paid', 1)
@@ -590,26 +730,31 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
                 ->toArray();
 
             foreach ($store_order_list as $store_order) {
+                // 判断该笔订单是否已 存在 平台收支明细表 的记录中
                 if (in_array('1' . $store_order['uid'] . $store_order['order_sn'] . $store_order['order_id'] . '0' . $mer_id, $unique_list)) continue;
+                // 支付方式，有疑问？？
                 $pay_type = $store_order['pay_type'];
                 if (!in_array($pay_type, [0, 1])) continue;
-
+                // 用户订单表
                 $group_order = Db::name('store_group_order')
                     ->alias('sgo')
                     ->where('sgo.group_order_id', $store_order['group_order_id'])
                     ->find();
                 if (empty($group_order)) continue;
-
+                // 获取 店铺奖金设置
                 $shop_bonus_setting = merchantConfig($store_order['mer_id'], 'shop_bonus_setting') ?: [
                     'shop_bonus_rate' => 30,
                     'yanglao_rate'    => 5,
                 ];
+                // 获取这笔订单发放的养老金 TODO 这里查询应该不对，有可能查询出多列
                 $yanglao = Db::name('user_bill')
                     ->where('order_sn', $store_order['order_sn'])
                     ->where('commission_type', 5)
                     ->value('number');
                 $ru_money = 0;
+                // 如果pay_type 不是 0 ？？
                 if ($pay_type != 0) {
+                    // 根据订单编号 查询 订单分账表 状态是 已分账成功的数据
                     $store_split_order = Db::name('store_split_order')
                         ->where('group_order_id', $group_order['group_order_sn'])
                         ->where('status', 1)
@@ -626,6 +771,7 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
                         //支付宝
                         $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
                     }
+                    // 汇付支付id
                     $params['payment_confirm_id'] = $store_split_order['hf_pay_id'];
                     $params['api_key'] = $api_key;
                     //查询支付确认对象
@@ -634,12 +780,14 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
                     Db::name("log")->insert(array('data' => '汇付查询支付确认对象返回-----' . json_encode($res)));//日志记录
                     // 获取分账后一个工作日时间
                     $close_time = $this->getNextWorkday(date('Y-m-d H:i:s', strtotime('+1 days', strtotime($store_order['pay_time']))));
+                    // 如果成功查询到 分账信息 则更新订单的 汇付通道服务费 汇付分账成功时间
                     if (isset($res['status'])) {
                         Db::name('store_order')->where('order_id', $store_order['order_id'])->update([
                             'hf_fee_amt'    => $res['fee_amt'],
                             'hf_clear_time' => $close_time
                         ]);
                     }
+                    //
                     if (isset($res['status']) && time() > strtotime($close_time)) {
                         if ($store_order['mer_id'] == 496) {
                             $ru_money = $store_order['pay_price'] - $yanglao - $res['fee_amt'];