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

app/admin/controller/InterOrder.php

@@ -428,7 +428,7 @@ class InterOrder extends \app\admin\BaseController{
 									if($qrd_order['status']==0 && $cgd_order['status']==0){
 										$qrd['goodNum'] = $param['goodNum'];//销售数量,
 										$qrd['goodPrice'] = $param['goodPrice'];//销售数量,
-										$qrd['totalPrice'] = $param['totalPrice'];//销售数量,
+										$qrd['totalPrice'] = round( $param['goodPrice']*$param['goodNum'],2);//销售数量,
 										$qrd['sendNum'] = $param['goodNum'];//销售数量,
 										$qrd['wpay_fee'] = round( $param['goodPrice']*$param['goodNum'],2);//销售数量,
 										$qrd['winv_fee'] = round( $param['goodPrice']*$param['goodNum'],2);//销售数量,

app/admin/controller/OrderInv.php

@@ -158,13 +158,6 @@ class OrderInv extends BaseController{
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
-//                    if($invoice_good['tax']==0){
-//                    	$invoice_good['addTax'] = $invoice_good['is_discount']==0?'': $good_info['addTax']??"";
-//                    	$invoice_good['inv_tag'] = $invoice_good['is_discount']==0?3:$good_info['inv_tag']??'0';
-//                    }else{
-//                    	$invoice_good['addTax'] = $invoice_good['is_discount']==0?'': $good_info['addTax']??"";
-//                    	$invoice_good['inv_tag'] ='';
-//                    }
                     $update = [
                         "inv_fee"=>$qrd['inv_fee']+$value['inv_fee'],
                         "winv_fee"=>$qrd['winv_fee']-$value['inv_fee'],

app/admin/controller/Payment.php

@@ -513,6 +513,11 @@ class Payment extends BaseController
                             Db::rollback();
                            return error_show(1004,"对账驳回失败");
                        }
+                       $payinfoup =Db::name("pay_info")->where(["payNo"=>$payNo,"is_del"=>0])->update(['status'=>0,"updatetime"=>date("Y-m-d H:i:s")]);
+                       if($payinfoup==false){
+                            Db::rollback();
+                           return error_show(1004,"对账驳回失败");
+                       }
                        foreach ($cgdNo as $value){
                            $report=ReportCode::where(["cgdNo"=>$value])->find();
                            if($report)$report->rmField("payNo",$payNo);

app/command/good.php

@@ -23,17 +23,16 @@ class good extends Command
     protected function execute(Input $input, Output $output)
     {
         // 指令输出
-	    $this->date=date("Y-m-d 00:00:00",time());
+	    $this->date=date("Y-m-d H:i:s",time()-3600);
 	    $goodset =Cache::store("redis")->get("goodSet");
 	    if($goodset ==1) return;
 	    Cache::store("redis")->set("goodSet",1,1800);
-//	    $this->date="2022-06-01 00:00:00";
 	    try{
 		    $this->goodBasic();
 		    $this->goodZx();
-		    Cache::store("redis")->set("goodSet",0);
+//		    Cache::store("redis")->set("goodSet",0);
 	    }catch (\Exception $e){
-		    Cache::store("redis")->set("goodSet",0);
+//		    Cache::store("redis")->set("goodSet",0);
 		    $output->writeln("【".date("Y-m-d H:i:s")."】".$e->getMessage());
 	    }