退款é€金豆失效é—

app/common/repositories/store/order/StoreRefundOrderRepository.php

@@ -342,8 +342,9 @@ class StoreRefundOrderRepository extends BaseRepository
      * @author Qinii
      * @day 2020-06-12
      */
-    public function getList(array $where, int $page, int $limit)
+    public function getList(array $where, int $page, int $limit,$status)
     {
+        if($status == 2) $where['status'] = '1,2';
         $query = $this->dao->search($where)->where('is_system_del', 0)->with(['order' => function ($query) {
             $query->field('order_id,order_sn,douhuomall');
         }, 'refundProduct.product', 'user' => function ($query) {
@@ -356,7 +357,7 @@ class StoreRefundOrderRepository extends BaseRepository
             'audit' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 0]),
             'refuse' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => -1]),
             'agree' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 1]),
-            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 2]),
+            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => '1,2']),
             'end' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 3]),
 
 
@@ -1573,5 +1574,10 @@ class StoreRefundOrderRepository extends BaseRepository
             ->where('order_id', $orderId)
             ->where('status', -1)
             ->update(['status' => 0]);
+
+        Db::name("user_sign_jingdou")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
     }
 }

app/controller/merchant/store/order/RefundOrder.php

@@ -43,9 +43,10 @@ class RefundOrder extends BaseController
     public function lst()
     {
         list($page,$limit) = $this->getPage();
-        $where = $this->request->params(['refund_order_sn','status','refund_type','date','order_sn']);
+        $where = $this->request->params(['refund_order_sn','refund_type','date','order_sn']);
+        $status = $this->request->params('status');
         $where['mer_id'] = $this->request->merId();
-        return app('json')->success($this->repository->getList($where,$page,$limit));
+        return app('json')->success($this->repository->getList($where,$page,$limit,$status));
     }
 
     /**