ad

app/cxinv/controller/Purchease.php

@@ -0,0 +1,12 @@
+<?php
+
+
+namespace app\cxinv\controller;
+
+
+use think\App;class Purchease extends Base{
+    public function __construct(App $app) {
+        parent::__construct($app);
+    }
+
+}

app/cxinv/controller/Sale.php

@@ -0,0 +1,29 @@
+<?php
+
+
+namespace app\cxinv\controller;
+
+
+use app\cxinv\model\QrdInfo;use think\App;
+class Sale extends Base{
+    public function __construct(App $app) {
+        parent::__construct($app);
+        $this->model=new QrdInfo();
+    }
+
+    public function status(){
+      $param= $this->request->param(["id"=>"","status"=>""],"post","trim");
+      $valid= $this->validate($param,[
+          'id|订单编号'=>'require|number',
+          'status|订单状态'=>'require|number|in:0,1,2,3'
+      ]);
+      if($valid!==true) return error($valid);
+      $model= $this->model->findOrEmpty($param['id']);
+      if($model->isEmpty())return error("订单不存在");
+      if($model->status==$param['status']) return error("订单状态已更新");
+      $model->status=$param['status'];
+      $save = $model->save();
+      if($save===false)return error("更新失败");
+      return success("更新成功");
+    }
+}

app/cxinv/controller/Trade.php

@@ -543,9 +543,9 @@ class Trade extends Base{
         ]);
          $companyArr= Business::whereIn('companyNo',array_column($list,'companyNo'))->column('company','companyNo');
          if(empty($companyArr)) return error("收款方业务公司不存在");
-         $orderArr= QrdInfo::whereIn('sequenceNo',array_column($list,'orderCode'))->where(["is_del"=>0])->column('id,customerNo,companyNo,status,pay_fee,apay_fee,wpay_fee,pay_status,totalPrice,platform_type,cxCode',"sequenceNo");
+         $orderArr= QrdInfo::whereIn('sequenceNo',array_column($list,'orderCode'))->where(["is_del"=>0])->column('id,customerNo,companyNo,is_comon,status,pay_fee,apay_fee,wpay_fee,pay_status,totalPrice,platform_type,cxCode',"sequenceNo");
          if(empty($orderArr)) return error("订单信息不存在");
-         $tradeArr=$this->model->whereIn("tradNo",array_column($list,'tradNo'))->where(['is_del'=>0,"status"=>[1,2]])->column("id,balance,used_fee,companyNo,trade_time","tradNo");
+         $tradeArr=$this->model->whereIn("tradNo",array_column($list,'tradNo'))->where(['is_del'=>0,"status"=>[1,2]])->column("id,balance,used_fee,companyNo,trade_time,trade_type","tradNo");
          if(empty($tradeArr)) return error("资金流水信息不存在");
          $Assoc=[];
          $trade_log=[];
@@ -557,6 +557,7 @@ class Trade extends Base{
              if($orderArr[$value['orderCode']]['wpay_fee']< $value['trad_fee']) return error($value['orderCode'].'销售单未付款金额不足核销金额');
              $orderArr[$value['orderCode']]['wpay_fee']-=$value['trad_fee'];
              if(!isset($tradeArr[$value['tradNo']])) return error($value['tradNo'].'资金流水信息不存在');
+             if($tradeArr[$value['tradNo']]['trade_type']!=1 && $orderArr[$value['orderCode']]['is_comon']==1) return error($value['orderCode'].'销售单类型与资金类型不匹配');
              if($tradeArr[$value['tradNo']]['balance']< $value['trad_fee']) return error($value['tradNo'].'资金流水余额不足核销金额');
              $tradeArr[$value['tradNo']]['balance']-=$value['trad_fee'];
              if($tradeArr[$value['tradNo']]['companyNo']!=$value['companyNo']) return error($value['tradNo'].'资金流水业务公司与卖出方公司不一致');