|
|
@@ -8,7 +8,7 @@ use app\admin\model\InvoiceOrder;
|
|
|
use app\admin\model\OrderCategory;
|
|
|
use app\admin\model\PayInfo;
|
|
|
use think\App;
|
|
|
-use think\facade\Db;use think\facade\Validate;
|
|
|
+use think\facade\Validate;
|
|
|
class InvoiceItem extends Base{
|
|
|
public function __construct(App $app) {
|
|
|
# $this->novalidate = ["*"];
|
|
|
@@ -16,11 +16,12 @@ class InvoiceItem extends Base{
|
|
|
}
|
|
|
//查询
|
|
|
public function cgdListByPayNo(){
|
|
|
- $param = $this->request->param(["payNo"=>"","merge_code"=>"","inv_good_name"=>""],"post","trim");
|
|
|
+ $param = $this->request->param(["payNo"=>"","merge_code"=>"","inv_good_name"=>"",'good_name'=>''],"post","trim");
|
|
|
$where=[["a.status","=",1],["a.is_del","=",0]];
|
|
|
if($param["payNo"]!=="") $where[]=["a.payNo","=",$param["payNo"]];
|
|
|
- if($param["merge_code"]!=="") $where[]=["c.merge_code","=",$param["merge_code"]];
|
|
|
+ if($param["merge_code"]!=="") $where[]=["c.merge_code","like","%{$param['good_name']}%"];
|
|
|
if($param["inv_good_name"]!=="") $where[]=["c.inv_good_name","like","%{$param["inv_good_name"]}%"];
|
|
|
+ if($param["good_name"]!=="") $where[]=["b.goodName","like","%{$param["good_name"]}%"];
|
|
|
$list = PayInfo::alias('a')
|
|
|
->join('cgd_info b','a.cgdNo=b.sequenceNo',"left")
|
|
|
->join('order_category c','b.sequenceNo=c.code and b.goodNo=c.spuCode and c.order_type=2',"left")
|
