ad

app/admin/controller/DataChange.php

@@ -4,12 +4,15 @@
 namespace app\admin\controller;
 
 
-use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use think\facade\Validate;class DataChange extends Base{
+use app\admin\model\GoodZixun;
+use app\cxinv\model\CaixiaoData;
+use think\App;
+use think\facade\Validate;
+class DataChange extends Base{
     public function __construct(App $app) {
         parent::__construct($app);
         $this->model=new \app\admin\model\DataChange();
     }
-
     public function create(){
         $param =$this->request->only(["code"=>'',"source"=>"","remark"=>"","type"=>"",'oaCode'=>'',"change"=>"","apply_id"=>""],
             "post","trim");
@@ -132,5 +135,4 @@ use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use
         $info->save();
         return success("操作成功");
   }
-
 }

app/admin/controller/Good.php

@@ -0,0 +1,26 @@
+<?php
+
+
+namespace app\admin\controller;
+
+
+use think\App;
+class Good extends Base{
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->model=new \app\admin\model\Good();
+    }
+
+    public function list(){
+    }
+    public function create(){
+    }
+
+    public function info(){
+    }
+    public function update(){
+    }
+    public function delete(){
+    }
+}

app/admin/model/DataChange.php

@@ -79,6 +79,9 @@ class DataChange extends Base
        if($data['type']==2){
            Sale::where(['orderCode'=>$data['code']])->update($data['after']);
        }
+       if($data['type']==3){
+           GoodZixun::where(['spuCode'=>$data['code']])->update($data['after']);
+       }
     }
      //数据修正
      public static function updateOrder($data) {
@@ -88,9 +91,6 @@ class DataChange extends Base
 		   if($data['type']==2){
 		     self::qrdUpdate($data);
 		   }
-		   if($data['type']==3){
-		     self::goodUpdate($data);
-		   }
 	}
     /**
 	* @param $row

app/cxinv/controller/Trade.php

@@ -132,7 +132,7 @@ class Trade extends Base{
 
     public function list(){
         $params = $this->request->param(["tradNo"=>"","status"=>[],"name"=>"","bank"=>"","start"=>"","end"=>"","companyNo"=>"",
-        'poCode'=>'',"page"=>1,"size"=>20,'used_lower'=>"",'used_upper'=>'','total_lower'=>'','total_upper'=>'',"relaComNo"=>"",
+        'poCode'=>'',"page"=>1,"size"=>20,'used_lower'=>"",'used_upper'=>'','total_lower'=>'','total_upper'=>'',"relaComNo"=>"",'trade_in_code'=>'',
         "trade_type"=>"","palt_po"=>"","skuCode"=>"","goodName"=>"","plat_total_lower"=>"",'plat_total_upper'=>'',"com_total_lower"=>"",
         "com_total_upper"=>"","trade_used"=>"","create_start"=>"","create_end"=>""],"post","trim");
         $where=[["is_del","=",0]];
@@ -143,6 +143,7 @@ class Trade extends Base{
         if($params['start']!=="") $where[]=["trade_time",">=",startTime($params['start'])];
         if($params['end']!=="") $where[]=["trade_time","<=",endTime($params['end'])];
         if($params['companyNo']!=="")$where[]=["companyNo","like","%".$params['companyNo']."%"];
+        if($params['trade_in_code']!=="") $where[]=["trade_in_code","like","%".$params['trade_in_code']."%"];
         if($params['relaComNo']!=="")$where[]=["companyNo","like","%".$params['relaComNo']."%"];
         if($params['used_lower']!=="") $where[]=["used_fee",">=",$params['used_lower']];
         if($params['used_upper']!=="") $where[]=["used_fee","<=",$params['used_upper']];
@@ -160,7 +161,7 @@ class Trade extends Base{
         if($params['trade_used']!=="") $where[]=["trade_used","like",'%'.$params['trade_used'].'%'];
         if($params['create_start']!=="") $where[]=["createtime",">=",startTime($params['create_start'])];
         if($params['create_end']!=="") $where[]=["createtime","<=",endTime($params['create_end'])];
-        $list = $this->model->with(["company",'Lib'])->withJoin("Lib","left")->where($where)->order("id desc")->paginate(["list_rows"=>$params['size'],"page"=>$params['page']]);
+        $list = $this->model->with(['Lib'])->withJoin("Lib","left")->where($where)->order("id desc")->paginate(["list_rows"=>$params['size'],"page"=>$params['page']]);
         return success("成功",['list'=>$list->items(),'count'=>$list->total()]);
     }
 
@@ -244,7 +245,7 @@ class Trade extends Base{
     public function PoolInfo(){
         $logNo = $this->request->post("logNo","","trim");
         if($logNo=="") return error("参数错误");
-        $info = TradePool::with(["Trade"=>["company"],"Lib"])
+        $info = TradePool::with(["Trade","Lib"])
         ->where(["logNo"=>$logNo,"is_del"=>0])
         ->findOrEmpty();
         if($info->isEmpty()) return error("资金认领信息不存在");
@@ -351,7 +352,7 @@ class Trade extends Base{
     public function BackInfo(){
         $returnCode = $this->request->post("returnCode","","trim");
         if($returnCode=="") return error("参数错误");
-        $info = TradeReturn::with(["trade"=>["company"],"pool"])->where(["returnCode"=>$returnCode,"is_del"=>0])->findOrEmpty();
+        $info = TradeReturn::with(["trade","pool"])->where(["returnCode"=>$returnCode,"is_del"=>0])->findOrEmpty();
         if($info->isEmpty()) return error("退款申请数据未找到");
          $info['log_total_fee']= $info->pool->total_fee;
          $info['log_apply_id']= $info->pool->apply_id;
@@ -433,8 +434,9 @@ class Trade extends Base{
         'pcCode'  =>'varchar',//批次号
  */
         $valid = Validate::rule([
-            "companyNo|收款方公司编号"=>"require|max:255",
-            "trade_type|汇款类型"=>"require|number|in:0,1",
+            "companyNo|业务公司编号"=>"require|max:255",
+            "trade_type|交易类型"=>"require|number|in:0,1",
+            "trade_in_code|收款方公司编号"=>"require|number|in:0,1",
             "trade_in_account|收款账户"=>"require|max:255",
             "tradeTime|交易时间"=>"require|date",
             "trade_fee|交易金额"=>"require|float",
@@ -455,19 +457,22 @@ class Trade extends Base{
             "comPrice|业务公司单价"=>"requireIf:trade_type,1|float",
             "com_total|业务公司总额"=>"requireIf:trade_type,1|float",
          ]);
-        $companyArr= Business::whereIn("companyNo",array_column($data,'companyNo'))->column("company","companyNo");
+        $companyArr= Business::whereIn("companyNo",array_merge(array_column($data,'companyNo'),array_column($data,'trade_in_code')))->column("company","companyNo");
         $list=[];
         $lib=[];
         $pcCode= makeNo("PC");
         foreach ($data as $key=>$value){
             if(!$valid->check($value)) return error('第'.($key+1).'行'.$valid->getError());
             if(!isset($companyArr[$value['companyNo']])) return error('第'.($key+1).'行收款方业务公司不存在');
+             if(!isset($companyArr[$value['trade_in_code']])) return error('第'.($key+1).'行收款方公司不存在');
             $radStr= Str::random(3,3);
             $tradNo= makeNo('S'.$radStr,str_pad($key+1,4,'0',STR_PAD_LEFT));
             $list[]=[
                 "tradNo"=>$tradNo,
                 "companyNo"=>$value['companyNo'],
-                "trade_in"=>$value['trade_in']??$companyArr[$value['companyNo']],
+                "companyName"=>$companyArr[$value['companyNo']]??"",
+                "trade_in_code"=>$value['trade_in_code'],
+                "trade_in"=>$value['trade_in']??$companyArr[$value['trade_in_code']],
                 "trade_out"=>$value['trade_out'],
                 "trade_type"=>$value['trade_type']??0,
                 "total_fee"=>str_replace(',','',$value['trade_fee']),

app/cxinv/model/Trade.php

@@ -33,10 +33,6 @@ use app\user\model\Business;class Trade extends Base
        ];
     protected $createTime = 'addtime';
     protected $updateTime = 'updatetime';
-    public function company(){
-        return $this->belongsTo(Business::class,'companyNo','companyNo')->bind(["companyName"=>"company"]);
-    }
-
     public function Lib(){
        return $this->belongsTo(TradeLib::class,'tradNo','tradNo')->bind(["palt_po","skuCode","goodName","goodNum","platPrice","plat_total","tax","cat_code","cat_name","comPrice","com_total","pcCode"]);
     }