Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/OrderPay.php

@@ -273,6 +273,11 @@ class OrderPay extends BaseController{
         $used_upper =isset($this->post['used_upper'])&&$this->post['used_upper']!==""? floor($this->post['used_upper']):"";
         if($used_lower!=="")$condition[]=["used_fee",">=",$used_lower];
         if($used_upper!=="")$condition[]=["used_fee","<=",$used_upper];
+
+        $total_lower =isset($this->post['total_lower'])&&$this->post['total_lower']!==""? floor($this->post['total_lower']) :"0";
+        $total_upper =isset($this->post['total_upper'])&&$this->post['total_upper']!==""? floor($this->post['total_upper']):"";
+        if($total_lower!=="")$condition[]=["total_fee",">=",$total_lower];
+        if($total_upper!=="")$condition[]=["total_fee","<=",$total_upper];
          if($companyNo!==""){
             $condition[]=["companyNo","=",$companyNo];
         }
@@ -1026,7 +1031,7 @@ class OrderPay extends BaseController{
                 ->field('id,customerNo,status,pay_fee,apay_fee,wpay_fee,pay_status,totalPrice')
                 ->findOrEmpty();
         	   if(empty($all_order))throw new Exception("{$value['orderCode']}销售单未找到数据");
-        	   if($all_trade['wpay_fee']<$value['trad_fee'])throw new Exception("{$value['orderCode']}销售单未付款金额不足核销金额");
+        	   if($all_order['wpay_fee']<$value['trad_fee'])throw new Exception("{$value['orderCode']}销售单未付款金额不足核销金额");
         	    $OrderCodeToAssocNo = substr(makeNo('AS'), 0, -3).str_pad($i,3,'0',STR_PAD_LEFT);
                 $OrderCodeToLogNo = substr(makeNo('TRC'), 0, -3).str_pad($i,3,'0',STR_PAD_LEFT);
                 //资金数据更新处理

app/command/handleCxData.php

@@ -432,7 +432,7 @@ class handleCxData extends command
                 if ($wait_insert_data) Db::name('caixiao_wait')->insert($wait_insert_data);
                 Db::name("caixiao_data")->where('uniqkey',$result['uniqkey'])->update(['status'=>0]);
 				Db::commit();
-                $output->writeln('处理成功');
+                $output->writeln("[$date]:{$result['id']}处理成功");
 
             } catch (Exception $exception) {
             	Db::rollback();