From 9f11fa42afb4086824516a7007e6ec71c69a37fd Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 18 May 2023 14:51:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemMenusServices.php | 5 +---- template/admin/src/pages/setting/systemMenus/index.vue | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/crmeb/app/services/system/SystemMenusServices.php b/crmeb/app/services/system/SystemMenusServices.php index 27ca95b78..0b4029eff 100644 --- a/crmeb/app/services/system/SystemMenusServices.php +++ b/crmeb/app/services/system/SystemMenusServices.php @@ -144,14 +144,11 @@ class SystemMenusServices extends BaseServices public function createMenusForm(array $formData = []) { $field[] = Form::input('menu_name', '按钮名称', $formData['menu_name'] ?? '')->required('按钮名称必填'); -// $field[] = Form::select('pid', '父级id', $formData['pid'] ?? 0)->setOptions($this->getFormSelectMenus())->filterable(1); $field[] = Form::input('menu_path', '路由名称', $formData['menu_path'] ?? '')->placeholder('请输入前台跳转路由地址')->required('请填写前台路由地址'); $field[] = Form::input('unique_auth', '权限标识', $formData['unique_auth'] ?? '')->placeholder('不填写则后台自动生成'); - $params = $formData['params'] ?? ''; -// $field[] = Form::input('params', '参数', is_array($params) ? '' : $params)->placeholder('举例:a/123/b/234'); $field[] = Form::frameInput('icon', '图标', $this->url(config('app.admin_prefix', 'admin') . '/widget.widgets/icon', ['fodder' => 'icon']), $formData['icon'] ?? '')->icon('md-add')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::number('sort', '排序', (int)($formData['sort'] ?? 0))->precision(0); - $field[] = Form::radio('auth_type', '类型', $formData['auth_type'] ?? 1)->options([['value' => 2, 'label' => '接口'], ['value' => 1, 'label' => '菜单(包含页面按钮)']]); + $field[] = Form::radio('auth_type', '类型', $formData['auth_type'] ?? 1)->options([['value' => 1, 'label' => '菜单'], ['value' => 3, 'label' => '按钮']]); $field[] = Form::radio('is_show', '权限状态', $formData['is_show'] ?? 1)->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]); $field[] = Form::radio('is_show_path', '是否显示', $formData['is_show_path'] ?? 0)->options([['value' => 1, 'label' => '显示'], ['value' => 0, 'label' => '隐藏']]); [$menuList, $data] = $this->getFormCascaderMenus((int)($formData['pid'] ?? 0)); diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue index 8f069c541..7e4a2be4b 100644 --- a/template/admin/src/pages/setting/systemMenus/index.vue +++ b/template/admin/src/pages/setting/systemMenus/index.vue @@ -44,7 +44,7 @@ @@ -58,6 +58,7 @@ :false-value="0" @on-change="onchangeIsShow(row)" size="large" + v-if="row.auth_type == 1" > 显示 隐藏 @@ -176,7 +177,7 @@ export default { roleData: { is_show: 1, keyword: '', - auth_type: 1, + // auth_type: 1, }, defaultProps: { children: 'children', From c63a31067ddeb00af3faced1980a6ef0c22bef7f Mon Sep 17 00:00:00 2001 From: Gosowong <1329847115@qq.com> Date: Thu, 18 May 2023 15:51:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E8=BF=94=E8=B4=A7bug=20=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D=E5=8A=A1=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/order/StoreOrderDao.php | 2 +- .../listener/order/OrderShippingListener.php | 6 +++++- crmeb/app/services/order/StoreOrderServices.php | 8 ++++---- .../orderShipping/MiniOrderService.php | 3 +-- .../easywechat/orderShipping/OrderClient.php | 17 ++++++++--------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index 066fc0389..e0c870f43 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -980,6 +980,6 @@ class StoreOrderDao extends BaseDao public function getSubOrderNotSend(int $pid, int $order_id) { - return $this->getModel()->where('id', $pid)->where('status', '0')->where('id', '<>', $order_id)->count(); + return $this->getModel()->where('pid', $pid)->where('status', '0')->where('id', '<>', $order_id)->count(); } } diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php index 1089f39e1..37c4d983d 100644 --- a/crmeb/app/listener/order/OrderShippingListener.php +++ b/crmeb/app/listener/order/OrderShippingListener.php @@ -24,12 +24,16 @@ class OrderShippingListener implements ListenerInterface $delivery_mode = 1; $is_all_delivered = true; if ($order['pid'] > 0) { - $order = ''; $delivery_mode = 2; // 判断订单是否全部发货 /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); $is_all_delivered = $orderServices->checkSubOrderNotSend((int)$order['pid'], (int)$order['id']); + $p_order = $orderServices->get((int)$order['pid']); + if (!$p_order) { + throw new AdminException('拆单异常'); + } + $out_trade_no = $p_order['order_id']; } // 整理商品信息 diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index 23be2afad..f6348c390 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -2498,7 +2498,7 @@ HTML; } // 判断是否开启小程序订单管理 $orderData['order_shipping_open'] = false; - if (sys_config('order_shipping_open', 0) && MiniOrderService::isManaged()) { + if (sys_config('order_shipping_open', 0) && MiniOrderService::isManaged() && $order['channel_type'] == 'routine') { $orderData['order_shipping_open'] = true; } return $orderData; @@ -2654,15 +2654,15 @@ HTML; /** * 取消商家寄件 - * @author 等风来 - * @email 136327134@qq.com - * @date 2023/5/15 * @param int $id * @param string $msg * @return array|mixed * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException + * @author 等风来 + * @email 136327134@qq.com + * @date 2023/5/15 */ public function shipmentCancelOrder(int $id, string $msg) { diff --git a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php index 5541b27a6..9cd7fd0a7 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/MiniOrderService.php @@ -111,9 +111,8 @@ class MiniOrderService * 判断是否开通 * @return bool * @throws HttpException - * @throws \Psr\SimpleCache\InvalidArgumentException * - * @date 2023/05/09 + * @date 2023/05/17 * @author yyw */ public static function isManaged() diff --git a/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php b/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php index c3dee6f57..0dd1e98fe 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/OrderClient.php @@ -13,6 +13,8 @@ class OrderClient extends BaseOrder { const redis_prefix = 'mimi_order'; + const express_company = 'ZTO'; // 默认发货快递公司为（中通快递） + /** * @var \Redis @@ -70,13 +72,9 @@ class OrderClient extends BaseOrder */ public function shippingByTradeNo(string $out_trade_no, int $logistics_type, array $shipping_list, string $payer_openid, int $delivery_mode = 1, bool $is_all_delivered = true) { -// $this->setMesJumpPath('demo'); - -// if (!$this->checkManaged()) { -// throw new AdminException('开通小程序订单管理服务后重试'); -// } - - + if (!$this->checkManaged()) { + throw new AdminException('开通小程序订单管理服务后重试'); + } $params = [ 'order_key' => [ 'order_number_type' => 1, @@ -264,14 +262,15 @@ class OrderClient extends BaseOrder if (!$this->getRedis()->exists($key)) { $date = $this->setDeliveryList(); if (!isset($date[$company_name])) { - throw new AdminException('物流公司异常1'); +// throw new AdminException('物流公司异常1'); } $express_company = $date[$company_name]; } else { $express_company = $this->getRedis()->hMGet($key, [$company_name])[$company_name] ?? ''; } if (empty($express_company)) { - throw new AdminException('物流公司异常2'); +// throw new AdminException('物流公司异常2'); + $express_company = self::express_company; } return $express_company;