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

app/admin/command/GenerrateInvoice.php

@@ -97,7 +97,6 @@ class GenerrateInvoice extends Command
 			if(isset($result['ZTDM'])&&$result['ZTDM']=='010000'){
 				Db::name("invoice_interface")->where(['DDQQPCH'=>$result['DDQQPCH']])->update(['status'=>1,
 				"remark"=>$result['ZTXX'],"updatetime"=>date("Y-m-d H:i:s")]);
-//				Cache::push("DDQQPCH",$result['DDQQPCH']);
 			}else{
 				Db::name("invoice_interface")->where(['DDQQPCH'=>$value['DDPCXX']['DDQQPCH']])->update(['status'=>4,"remark"=>$result['ZTXX']??$result['message'],"updatetime"=>date("Y-m-d H:i:s")]);
 			}

app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -53,10 +53,9 @@ class GetOrderInfoAndInvoiceInfo extends Command
 						$status=4;
 						$rmark=$this->updateQRd($invNo);
 						if($rmark==''){
-							Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update
-							(["status"=>$status,"seller_check"=>1,"buyer_check"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+							Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>$status,"seller_check"=>1,"buyer_check"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
 						}else{
-							Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>5,"remark"=>$rmark,"updatetime"=>date("Y-m-d H:i:s")]);
+							Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>5,"check_remark"=>$rmark,"updatetime"=>date("Y-m-d H:i:s")]);
 						}
 					}
 					$da=Db::name("invoice_interface")->where($value)->update(["is_check"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
@@ -67,7 +66,7 @@ class GetOrderInfoAndInvoiceInfo extends Command
 						Db::name("invoice_red")->where(["invRed"=>$value['invNo'],"is_del"=>0])->update(["status"=>6,"updatetime"=>date("Y-m-d H:i:s")]);
 
 					}else{
-						Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>5,"updatetime"=>date("Y-m-d H:i:s")]);
+						Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>5,"check_remark"=>$value['remark'],"updatetime"=>date("Y-m-d H:i:s")]);
 
 					}
 					Db::name("invoice_interface")->where($value)->update(["is_check"=>1,"updatetime"=>date("Y-m-d H:i:s")]);

app/admin/controller/Export.php

@@ -244,7 +244,7 @@ class Export extends BaseController
             a.trade_out 付款银行单位名称,
             a.trade_remark 付款备注,
             a.trade_time 交易时间,
-            a.tradNo 资金编号,a.status 状态,a.total_fee 收入金额,a.balance 未认领金额,a.used_fee 已认领金额,b.logNo 资金认领编号,
+            a.tradNo 资金编号,a.status 状态,a.total_fee 收入金额,a.balance 未认领金额,b.total_fee 已认领金额,b.logNo 资金认领编号,
             b.customerNo 认领企业,c.orderCode 订单编号,d.poCode 平台编号,d.goodName 产品名称,d.ownerName 资金创建人,c.apply_name 认领创建人,b.status 认领审批状态,b.remark 驳回原因')
             ->leftJoin('trade_pool b', 'b.tradNo=a.tradNo')
             ->leftJoin('assoc c', 'c.viceCode=b.logNo and c.type=2 and c.status<>3')

app/admin/controller/OrderPay.php

@@ -992,12 +992,6 @@ class OrderPay extends BaseController{
             if (!$val_item->check($value)) return error_show(1004, $val_item->getError());
 
             if (!isset($company[$value['companyNo']])) $company[$value['companyNo']] = $value['companyNo'];
-//
-//            if (isset($tradNos[$value['tradNo']])) $tradNos[$value['tradNo']] = bcadd($tradNos[$value['tradNo']], $value['trad_fee'], 2);
-//            else $tradNos[$value['tradNo']] = $value['trad_fee'];
-//
-//            if (isset($orderCodes[$value['orderCode']])) $orderCodes[$value['orderCode']] = bcadd($orderCodes[$value['orderCode']], $value['trad_fee'], 2);
-//            else $orderCodes[$value['orderCode']] = $value['trad_fee'];
         }
 
         //判断绑定公司
@@ -1012,10 +1006,11 @@ class OrderPay extends BaseController{
         Db::startTrans();
 
         try {
-        	$i=0;
+        	$i=1;
         	//批量资金认领
         	foreach ($list as $key=>$value){
         		//资金明细判断
+        		$i++;
         	   $all_trade = Db::name('trade')
                 ->where('is_del', 0)
                 ->whereIn('status', [1, 2])

app/command/Report.php

@@ -277,7 +277,7 @@ class Report extends Command
 		          a.status 状态,
 		          a.total_fee 收入金额,
 		          a.balance 未认领金额,
-		          a.used_fee 已认领金额,
+		          b.total_fee 已认领金额,
 		          b.logNo 资金认领编号,
 		          b.customerNo 认领企业,
 		          c.orderCode 订单编号,

extend/TaxInvoice.php

@@ -192,7 +192,7 @@ class TaxInvoice {
 * @param $data
  * @return array|bool|float|int|mixed|stdClass|string|null
 */public function ReturnData($data){
-	\think\facade\Log::info("返回值:".$data);
+	\think\facade\Log::info("返回值:".json_encode($data,JSON_UNESCAPED_UNICODE));
       if(key_exists("returnCode",$data['returnStateInfo'])){
          	if ($data['returnStateInfo']['returnCode']=='0000'){
          	$result= base64_decode($data['content']);