diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 815fc767..56f8eb7d 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/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); diff --git a/public/static.dev/ajcaptcha/1.jpg b/public/static.dev/ajcaptcha/1.jpg new file mode 100644 index 00000000..e0795028 Binary files /dev/null and b/public/static.dev/ajcaptcha/1.jpg differ diff --git a/public/static.dev/ajcaptcha/2.jpg b/public/static.dev/ajcaptcha/2.jpg new file mode 100644 index 00000000..2039deed Binary files /dev/null and b/public/static.dev/ajcaptcha/2.jpg differ diff --git a/public/static.dev/ajcaptcha/3.jpg b/public/static.dev/ajcaptcha/3.jpg new file mode 100644 index 00000000..65dbce91 Binary files /dev/null and b/public/static.dev/ajcaptcha/3.jpg differ diff --git a/public/static.dev/ajcaptcha/4.jpg b/public/static.dev/ajcaptcha/4.jpg new file mode 100644 index 00000000..92785753 Binary files /dev/null and b/public/static.dev/ajcaptcha/4.jpg differ diff --git a/public/static.dev/ajcaptcha/5.jpg b/public/static.dev/ajcaptcha/5.jpg new file mode 100644 index 00000000..9ecdc0bb Binary files /dev/null and b/public/static.dev/ajcaptcha/5.jpg differ diff --git a/public/static.dev/ajcaptcha/6.jpg b/public/static.dev/ajcaptcha/6.jpg new file mode 100644 index 00000000..78dd223d Binary files /dev/null and b/public/static.dev/ajcaptcha/6.jpg differ diff --git a/public/static.dev/images/plant-header.png b/public/static.dev/images/plant-header.png new file mode 100644 index 00000000..bdb1b754 Binary files /dev/null and b/public/static.dev/images/plant-header.png differ diff --git a/public/static.dev/images/plant-header.png:Zone.Identifier b/public/static.dev/images/plant-header.png:Zone.Identifier new file mode 100644 index 00000000..053d1127 --- /dev/null +++ b/public/static.dev/images/plant-header.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=about:internet diff --git a/public/static/ajcaptcha/1.jpg b/public/static/ajcaptcha/1.jpg new file mode 100644 index 00000000..e0795028 Binary files /dev/null and b/public/static/ajcaptcha/1.jpg differ diff --git a/public/static/ajcaptcha/2.jpg b/public/static/ajcaptcha/2.jpg new file mode 100644 index 00000000..2039deed Binary files /dev/null and b/public/static/ajcaptcha/2.jpg differ diff --git a/public/static/ajcaptcha/3.jpg b/public/static/ajcaptcha/3.jpg new file mode 100644 index 00000000..65dbce91 Binary files /dev/null and b/public/static/ajcaptcha/3.jpg differ diff --git a/public/static/ajcaptcha/4.jpg b/public/static/ajcaptcha/4.jpg new file mode 100644 index 00000000..92785753 Binary files /dev/null and b/public/static/ajcaptcha/4.jpg differ diff --git a/public/static/ajcaptcha/5.jpg b/public/static/ajcaptcha/5.jpg new file mode 100644 index 00000000..9ecdc0bb Binary files /dev/null and b/public/static/ajcaptcha/5.jpg differ diff --git a/public/static/ajcaptcha/6.jpg b/public/static/ajcaptcha/6.jpg new file mode 100644 index 00000000..78dd223d Binary files /dev/null and b/public/static/ajcaptcha/6.jpg differ diff --git a/public/static/images/plant-header.png b/public/static/images/plant-header.png new file mode 100644 index 00000000..bdb1b754 Binary files /dev/null and b/public/static/images/plant-header.png differ diff --git a/public/static/images/plant-header.png:Zone.Identifier b/public/static/images/plant-header.png:Zone.Identifier new file mode 100644 index 00000000..053d1127 --- /dev/null +++ b/public/static/images/plant-header.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=about:internet