Merge pull request 'dev' (#3) from dev into master

Reviewed-on: #3

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

@@ -903,6 +903,9 @@ class StoreOrderRepository extends BaseRepository
             case 8:
                 $param['StoreOrder.paid'] = 1;
                 break;  // 已支付
+            case 20:
+                $param['StoreOrder.status'] = 2;
+                break;  // 已收货的商品才可以继续导入
             default:
                 unset($param['StoreOrder.is_del']);
                 break;  // 全部
@@ -1709,6 +1712,7 @@ class StoreOrderRepository extends BaseRepository
     {
         $status = $where['status'] ?? '';
         unset($where['status']);
+        halt($where);
         // 未支付订单
         if ($status == 1) {
             $query = $this->dao->search($where)->where($this->getOrderType($status))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where('StoreOrder.is_del', 0);

public/static.dev/images/plant-header.png:Zone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=about:internet

public/static/images/plant-header.png:Zone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=about:internet