Merge branch 'master' of http://git.dongerkj.com:9095/waibao/NN2023021801

* 'master' of http://git.dongerkj.com:9095/waibao/NN2023021801:
  wes 多宝福袋 添加忽略
  wes 多宝福袋

.gitignore

@@ -7,4 +7,6 @@
 runtime
 /composer.lock
 /vendor/*
-/public/upload
+/public/upload
+*.zip
+.DS_Store

app/common/service/PaymentService.php

@@ -110,8 +110,12 @@ class PaymentService
         if($data){
             return $data;
         }
-        $field = $field? $field : 'id,out_trade_no,uid,state,trade_type,out_trade_no1,hy_token_id,syl_sureorderid,hy_bill_no,is_retreat,pay_way,order_type,sid,remarks,trade_no';
-        $data = $this->model->where(['out_trade_no'=> $outTradeNo,'state'=> $state])
+        $where = ['out_trade_no'=> $outTradeNo];
+        if($state){
+            $where['state'] = $state;
+        }
+        $field = $field? $field : 'id,out_trade_no,uid,total_fee,state,trade_type,out_trade_no1,hy_token_id,syl_sureorderid,hy_bill_no,is_retreat,pay_way,order_type,sid,remarks,trade_no';
+        $data = $this->model->where($where)
             ->field($field)
             ->value('id');
         if($data){