Merge branch 'release/v1.1.4发布'

zhaojs

2023-07-20 8c00bd0245ca4756ca04483a4980ad202714e43e

 application/api/logic/order/DyOrder.php

@@ -87,8 +87,9 @@
        $list = $this->model->where(['is_distribution'=>0,'channel_code'=>['neq',''],'channel_code'=>['neq',0]])->whereOr("is_distribution = 1 And tk_z_status = 2 And channel_code !=''")->limit(20)->order('id desc')->select();
        if(!empty($list)){
            $LogicDyCommission = new LogicDyCommission();
            foreach($list as $order){
                $result = $LogicDyCommission->fanliCommission($order);
            foreach($list as $order){ 
                $result = $LogicDyCommission->fanliCommissionNew($order);
               // $result = $LogicDyCommission->fanliCommission($order);
                if(!$result){
                    mylog('订单拆分错误',$result['info'],"errorInfo");
                }