From 63f35528bbf88242c085a055e4741738df8cd8d4 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 17 Apr 2023 12:02:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=80=BB=E4=BB=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods/order_confirm/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index ac832ab71..4e38c72b3 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -338,7 +338,8 @@ } ], - virtual_type: 0, + virtual_type: 0, + allPrice: 0, formContent: '', payType: '', //支付方式 openType: 1, //优惠券打开方式 1=使用 @@ -1830,4 +1831,4 @@ .fontC { color: grey; } - + From 6d685a636c213ae62fc7a28ed55862c3b5802199 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 17 Apr 2023 12:06:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/order/StoreOrderController.php | 1 + crmeb/app/dao/order/StoreOrderDao.php | 10 ++++++---- crmeb/app/services/order/StoreOrderServices.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 82ed1573e..fc166831d 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -605,6 +605,7 @@ class StoreOrderController * 订单统计数据 * @param Request $request * @return mixed + * @throws \ReflectionException */ public function data(Request $request) { diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index 67c94b37c..c8a62c478 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -50,17 +50,19 @@ class StoreOrderDao extends BaseDao $realName = $where['real_name'] ?? ''; $fieldKey = $where['field_key'] ?? ''; $fieldKey = $fieldKey == 'all' ? '' : $fieldKey; + $status = $where['status'] ?? ''; + unset($where['status']); return parent::search($where, $search)->when($isDel, function ($query) use ($where) { $query->where('is_del', $where['is_del']); })->when(isset($where['is_system_del']), function ($query) { $query->where('is_system_del', 0); - })->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) { - switch ((int)$where['status']) { + })->when($status !== '', function ($query) use ($where, $status) { + switch ((int)$status) { case 0://未支付 $query->where('paid', 0)->where('status', 0)->where('refund_status', 0)->where('is_del', 0); break; case 1://已支付 未发货 - $query->where('paid', 1)->whereIn('status', [0, 4])->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) { + $query->where('paid', 1)->where('status', 0)->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) { $query->where('shipping_type', 1); })->where('is_del', 0); break; @@ -95,7 +97,7 @@ class StoreOrderDao extends BaseDao $query->where('is_del', 1); break; case 9://全部用户未删除的订单 - $query->where('is_del', 0); + $query->whereIn('refund_status', [0, 3])->where('is_del', 0); break; } })->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) { diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index a70f05b44..420d9e138 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -93,7 +93,7 @@ class StoreOrderServices extends BaseServices { [$page, $limit] = $this->getPageValue(); $data = $this->dao->getOrderList($where, $field, $page, $limit, $with); - $count = $this->dao->count($where); + $count = $this->dao->count($where, false); $data = $this->tidyOrderList($data); foreach ($data as &$item) { $refund_num = array_sum(array_column($item['refund'], 'refund_num')); From e36720f605f88f1ed40ce7d0c02123246a52a4ad Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 17 Apr 2023 12:29:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=B7=B2=E7=BB=8F=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=9A=84=E8=AE=A2=E5=8D=95=E8=BF=98=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E4=B8=AD=E5=AD=97=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/pages/order/orderList/handle/orderDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index cf15bba9b..8d87eed18 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -18,7 +18,7 @@ 订单状态：{{ orderDatalist.orderInfo._status._title }} {{ - orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length + orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length && orderDatalist.orderInfo.refund_status < 2 ? orderDatalist.orderInfo.is_all_refund ? '退款中' : '部分退款中' From 75b0434b89e62806cd7855e72fb417b0c97f7e8b Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 17 Apr 2023 15:24:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8D=E6=98=AF=E4=BB=98=E8=B4=B9?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=9A=84=E7=94=A8=E6=88=B7=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E4=BB=98=E8=B4=B9=E4=BC=9A=E5=91=98=E5=88=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/services/activity/coupon/StoreCouponIssueServices.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php index 269a45384..1fd936257 100644 --- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php +++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php @@ -363,6 +363,9 @@ class StoreCouponIssueServices extends BaseServices public function issueUserCoupon($id, $user, bool $is_receive = false) { $issueCouponInfo = $this->dao->getInfo((int)$id); + if ($user->is_money_level <= 0 && $issueCouponInfo['receive_type'] == 4) { + throw new ApiException(400097); + } $uid = $user->uid; if (!$issueCouponInfo) throw new ApiException(400516); /** @var StoreCouponIssueUserServices $issueUserService */