From 7223604699c0df93fe4cb326eb71c1d2177ee0b4 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 10:53:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=97=A0=E6=B3=95=E9=87=8D=E6=96=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/activity/live/LiveAnchorServices.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/activity/live/LiveAnchorServices.php b/crmeb/app/services/activity/live/LiveAnchorServices.php index b360ab7cd..304f56c3e 100644 --- a/crmeb/app/services/activity/live/LiveAnchorServices.php +++ b/crmeb/app/services/activity/live/LiveAnchorServices.php @@ -92,10 +92,13 @@ class LiveAnchorServices extends BaseServices * @param int $id * @param array $data * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function save(int $id, array $data) { - $liveAnchor = $this->dao->get(['wechat' => $data['wechat']]); + $liveAnchor = $this->dao->get(['wechat' => $data['wechat'], 'is_del' => 0]); if (!MiniProgramService::getRoleList(2, 0, 30, $data['wechat'])) { throw new AdminException(400426); } From 972f2a317fd5af0f486f380906115ecadeca2de5 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 12:05:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8E=E5=88=97=E8=A1=A8=E7=9A=84=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/order/StoreOrder.php | 9 ++++++++- .../src/pages/order/orderList/handle/orderDetails.vue | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index 25835f3c5..4c049aae3 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -458,7 +458,7 @@ class StoreOrder extends AuthController */ public function order_info($id) { - if (!$id || !($orderInfo = $this->services->get($id))) { + if (!$id || !($orderInfo = $this->services->get($id, [], ['refund']))) { return app('json')->fail(400118); } /** @var UserServices $services */ @@ -497,6 +497,13 @@ class StoreOrder extends AuthController } else $orderInfo['_store_name'] = ''; $orderInfo['spread_name'] = $services->value(['uid' => $orderInfo['spread_uid']], 'nickname') ?? '无'; + $orderInfo['_info'] = app()->make(StoreOrderCartInfoServices::class)->getOrderCartInfo((int)$orderInfo['id']); + $cart_num = 0; + $refund_num = array_sum(array_column($orderInfo['refund'], 'refund_num')); + foreach ($orderInfo['_info'] as $items) { + $cart_num += $items['cart_info']['cart_num']; + } + $orderInfo['is_all_refund'] = $refund_num == $cart_num; $userInfo = $userInfo->toArray(); return app('json')->success(compact('orderInfo', 'userInfo')); } diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index 1af441237..138e63abd 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -15,7 +15,16 @@
订单信息
订单ID：{{ orderDatalist.orderInfo.order_id }} - 订单状态：{{ orderDatalist.orderInfo._status._title }} + 订单状态：{{ orderDatalist.orderInfo._status._title }} + {{ + orderDatalist.orderInfo.refund.length + ? orderDatalist.orderInfo.is_all_refund + ? '退款中' + : '部分退款中' + : '' + }} + 商品总数：{{ orderDatalist.orderInfo.total_num }} From 719893332027153fd5b61d75033554ff163c7cdd Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 12:08:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=A0=81=E5=85=B3?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/wechat/WechatQrcodeRecordDao.php | 1 + crmeb/app/services/wechat/WechatQrcodeServices.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/dao/wechat/WechatQrcodeRecordDao.php b/crmeb/app/dao/wechat/WechatQrcodeRecordDao.php index 87bebcd0e..d2d4f4db5 100644 --- a/crmeb/app/dao/wechat/WechatQrcodeRecordDao.php +++ b/crmeb/app/dao/wechat/WechatQrcodeRecordDao.php @@ -44,6 +44,7 @@ class WechatQrcodeRecordDao extends BaseDao * @param $timeType * @param $field * @param $str + * @param string $orderStatus * @return mixed */ public function getRecordTrend($qid, $time, $timeType, $field, $str, $orderStatus = '') diff --git a/crmeb/app/services/wechat/WechatQrcodeServices.php b/crmeb/app/services/wechat/WechatQrcodeServices.php index 8e3db0072..4a80dfad1 100644 --- a/crmeb/app/services/wechat/WechatQrcodeServices.php +++ b/crmeb/app/services/wechat/WechatQrcodeServices.php @@ -219,7 +219,7 @@ class WechatQrcodeServices extends BaseServices * @param int $isFollow * @return mixed */ - public function wechatQrcodeRecord($qrcodeInfo, $userInfo, $spreadInfo, $isFollow = 0) + public function wechatQrcodeRecord($qrcodeInfo, $userInfo, $spreadInfo, $isFollow = 1) { $response = $this->transaction(function () use ($qrcodeInfo, $userInfo, $spreadInfo, $isFollow) { From b18b2aa3b2ed709206493942e1d6514e28f41d94 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 12:12:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=89=80=E6=9C=89=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E6=B8=85=E9=99=A4=E6=8E=A8=E5=B9=BF=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/user/UserCancelServices.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/services/user/UserCancelServices.php b/crmeb/app/services/user/UserCancelServices.php index 52199ce5c..ad17879ff 100644 --- a/crmeb/app/services/user/UserCancelServices.php +++ b/crmeb/app/services/user/UserCancelServices.php @@ -32,6 +32,7 @@ class UserCancelServices extends BaseServices /** @var WechatUserServices $wechatUserServices */ $wechatUserServices = app()->make(WechatUserServices::class); $userServices->update($uid, ['is_del' => 1]); + $userServices->update(['spread_uid' => $uid], ['spread_uid' => 0, 'spread_time' => 0]); $wechatUserServices->update(['uid' => $uid], ['is_del' => 1]); } From b17d02ef219b455d5af5d42b34d1392dc4c9b1e6 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 12:15:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=87=8D=E5=A4=8D=E6=9C=AA=E4=BD=9C=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/user/User.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crmeb/app/adminapi/controller/v1/user/User.php b/crmeb/app/adminapi/controller/v1/user/User.php index db6501581..3767ce9d1 100644 --- a/crmeb/app/adminapi/controller/v1/user/User.php +++ b/crmeb/app/adminapi/controller/v1/user/User.php @@ -387,6 +387,9 @@ class User extends AuthController if ($data['phone']) { if (!preg_match("/^1[3456789]\d{9}$/", $data['phone'])) return app('json')->fail(400252); } + if ($this->services->count(['phone' => $data['phone'], 'is_del' => 0])) { + return app('json')->fail(400314); + } if ($data['card_id']) { if (!check_card($data['card_id'])) return app('json')->fail(400315); } From b90c791b18ba91a55db094cb61f007eba1d0169e Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 23 Mar 2023 12:19:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8E=A8=E5=B9=BF=E6=8E=92=E8=A1=8C=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/user/UserDao.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/dao/user/UserDao.php b/crmeb/app/dao/user/UserDao.php index 887259c30..c26240aa1 100644 --- a/crmeb/app/dao/user/UserDao.php +++ b/crmeb/app/dao/user/UserDao.php @@ -164,6 +164,7 @@ class UserDao extends BaseDao ->order('count desc') ->order('t0.uid desc') ->where('t1.spread_time', 'BETWEEN', $time) + ->where('t0.is_del', 0) ->page($page, $limit) ->group('t0.uid') ->select()->toArray();