|
|
@@ -21,6 +21,7 @@ class Payment extends Base
|
|
|
// 已作废：invalidated
|
|
|
// 已红冲：reversed
|
|
|
protected $invStatus=[0=>"待验证","1"=>'正常',"2"=>'已作废',"3"=>'已红冲'];
|
|
|
+ public $novalidate=['*'];
|
|
|
public function __construct(App $app) {
|
|
|
parent::__construct($app);
|
|
|
$invoice =Config::get("invoiceType");
|
|
|
@@ -231,7 +232,7 @@ class Payment extends Base
|
|
|
$value['inv_tag_remark']='';
|
|
|
if($value['pay_tag']==1 || $value['inv_tag']==1){
|
|
|
$tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
- (['code'=>$payNo])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
|
|
|
+ (['code'=>$value['payNo']])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
|
|
|
$value['inv_tag_name']=$tag[2]['tag_name']??'';
|
|
|
$value['inv_tag_id']=$tag[2]['id']??'0';
|
|
|
$value['pay_tag_id']=$tag[1]['id']??'0';
|
