diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 5619da9e..a56bfcad 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -206,7 +206,7 @@ class StoreOrderRepository extends BaseRepository
             $profitsharing = [];
             $financialRecordRepository = app()->make(FinancialRecordRepository::class);
             $financeSn = $financialRecordRepository->getSn();
-            $userMerchantRepository = app()->make(UserMerchantRepository::class);
+            $userMerchantRepository = app()->make(UserMerchantRepository::class); //商户用户表
             $storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class);
             $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
             $uid = $groupOrder->uid;
@@ -220,6 +220,7 @@ class StoreOrderRepository extends BaseRepository
             $isPoints = false;
             $financeDao = new FinancialRecordDao();
             foreach ($groupOrder->orderList as $_k => $order) {
+                $isPickupCard = $order->source == 999;
                 $order->paid = 1;
                 $order->pay_time = $time;
                 $svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2);
@@ -410,7 +411,8 @@ class StoreOrderRepository extends BaseRepository
         Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
         app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id);
         event('order.paySuccess', compact('groupOrder'));
-        event('data.screen.send', []);
+
+        event('data.screen.send', []);//数据大屏清空缓存
     }
 
     /**
diff --git a/app/controller/api/store/order/StoreRefundOrder.php b/app/controller/api/store/order/StoreRefundOrder.php
index 5b3d8e94..04e519e7 100644
--- a/app/controller/api/store/order/StoreRefundOrder.php
+++ b/app/controller/api/store/order/StoreRefundOrder.php
@@ -131,6 +131,10 @@ class StoreRefundOrder extends BaseController
             return app('json')->fail('订单已过退款/退货期限');
         if ($order->status < 0) return app('json')->fail('订单已退款');
         if ($order->status == 10) return app('json')->fail('订单不支持退款');
+        if ($order->activity_type == 0) {
+            if ($order->status == 1) return app('json')->fail('订单已发货不支持退款');
+        }
+
         if($order->is_virtual && $data['refund_type'] == 2) return app('json')->fail('订单不支持退款退货');
         if ($type == 1) {
             $refund = $this->repository->refund($order, (int)$ids[0], $num, $uid, $data);
@@ -151,11 +155,13 @@ class StoreRefundOrder extends BaseController
     public function lst()
     {
         $type = $this->request->param('type');
+        $productType = $this->request->param('product_type', 0);
         [$page, $limit] = $this->getPage();
         return app('json')->success($this->repository->userList([
             'type' => $type,
             'uid' => $this->request->uid(),
             'is_del' => 0,
+            'product_type' => $productType,
         ], $page, $limit));
     }