From baad5c717c7bf3aaa0dba959b164f763c4aa8224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Tue, 21 Feb 2023 15:26:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=A8=E7=99=BE=E5=BA=A6=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=9F=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/command/OrderClean.php | 14 + app/data/command/UserAgent.php | 14 + app/data/command/UserAmount.php | 14 + app/data/command/UserTransfer.php | 14 + app/data/command/UserUpgrade.php | 14 + app/data/controller/api/Auth.php | 17 +- app/data/controller/api/Data.php | 14 + app/data/controller/api/Goods.php | 14 + app/data/controller/api/Login.php | 14 + app/data/controller/api/News.php | 14 + app/data/controller/api/Notify.php | 14 + app/data/controller/api/Wechat.php | 14 + app/data/controller/api/Wxapp.php | 25 +- app/data/controller/api/auth/Address.php | 16 + app/data/controller/api/auth/Balance.php | 14 + app/data/controller/api/auth/Center.php | 17 +- app/data/controller/api/auth/News.php | 14 + app/data/controller/api/auth/Order.php | 24 +- app/data/controller/api/auth/Rebate.php | 14 + app/data/controller/api/auth/Transfer.php | 14 + app/data/controller/base/Config.php | 14 + app/data/controller/base/Discount.php | 17 +- app/data/controller/base/Message.php | 14 + app/data/controller/base/Pager.php | 14 + app/data/controller/base/Payment.php | 16 +- app/data/controller/base/Slider.php | 14 + app/data/controller/base/Upgrade.php | 14 + app/data/controller/base/postage/Company.php | 19 +- app/data/controller/base/postage/Template.php | 31 +- app/data/controller/news/Item.php | 16 +- app/data/controller/news/Mark.php | 14 + app/data/controller/shop/Cate.php | 14 + app/data/controller/shop/Goods.php | 14 + app/data/controller/shop/Mark.php | 14 + app/data/controller/shop/Order.php | 17 +- app/data/controller/shop/Send.php | 17 +- app/data/controller/total/Portal.php | 14 + app/data/controller/user/Admin.php | 14 + app/data/controller/user/Balance.php | 14 + app/data/controller/user/Message.php | 14 + app/data/controller/user/Rebate.php | 14 + app/data/controller/user/Transfer.php | 14 + .../database/20221013045838_install_user.php | 52 +- .../20221013045839_install_user_data.php | 14 + .../20221013045840_install_user_region.php | 3784 ----------------- app/data/model/BasePostageCompany.php | 14 + app/data/model/BasePostageRegion.php | 14 - app/data/model/BasePostageTemplate.php | 14 + app/data/model/BaseUserDiscount.php | 14 + app/data/model/BaseUserMessage.php | 14 + app/data/model/BaseUserPayment.php | 14 + app/data/model/BaseUserUpgrade.php | 14 + app/data/model/DataNewsItem.php | 14 + app/data/model/DataNewsMark.php | 14 + app/data/model/DataNewsXCollect.php | 14 + app/data/model/DataUser.php | 14 + app/data/model/DataUserAddress.php | 14 + app/data/model/DataUserBalance.php | 14 + app/data/model/DataUserMessage.php | 14 + app/data/model/DataUserPayment.php | 14 + app/data/model/DataUserRebate.php | 14 + app/data/model/DataUserToken.php | 14 + app/data/model/DataUserTransfer.php | 14 + app/data/model/ShopGoods.php | 14 + app/data/model/ShopGoodsCate.php | 14 + app/data/model/ShopGoodsItem.php | 14 + app/data/model/ShopGoodsMark.php | 14 + app/data/model/ShopGoodsStock.php | 14 + app/data/model/ShopOrder.php | 14 + app/data/model/ShopOrderItem.php | 14 + app/data/model/ShopOrderSend.php | 14 + app/data/readme.md | 6 +- app/data/service/ExpressService.php | 49 +- app/data/service/GoodsService.php | 14 + app/data/service/MessageService.php | 14 + app/data/service/NewsService.php | 14 + app/data/service/OrderService.php | 14 + app/data/service/PaymentService.php | 14 + app/data/service/RebateService.php | 14 + app/data/service/UserAdminService.php | 14 + app/data/service/UserBalanceService.php | 14 + app/data/service/UserRebateService.php | 15 + app/data/service/UserTokenService.php | 14 + app/data/service/UserTransferService.php | 14 + app/data/service/UserUpgradeService.php | 14 + .../service/payment/AlipayPaymentService.php | 14 + .../service/payment/BalancePaymentService.php | 14 + .../service/payment/EmptyPaymentService.php | 14 + .../service/payment/JoinpayPaymentService.php | 14 + .../service/payment/VoucherPaymentService.php | 14 + .../service/payment/WechatPaymentService.php | 14 + app/data/sys.php | 14 + 92 files changed, 1311 insertions(+), 3877 deletions(-) delete mode 100644 app/data/database/20221013045840_install_user_region.php delete mode 100644 app/data/model/BasePostageRegion.php diff --git a/app/data/command/OrderClean.php b/app/data/command/OrderClean.php index 03a237b19..0c873d875 100644 --- a/app/data/command/OrderClean.php +++ b/app/data/command/OrderClean.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\command; use app\data\model\ShopOrder; diff --git a/app/data/command/UserAgent.php b/app/data/command/UserAgent.php index fd18ac27d..ee4654d5b 100644 --- a/app/data/command/UserAgent.php +++ b/app/data/command/UserAgent.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\command; use app\data\model\DataUser; diff --git a/app/data/command/UserAmount.php b/app/data/command/UserAmount.php index 3bfa15ef5..6edb1a3b0 100644 --- a/app/data/command/UserAmount.php +++ b/app/data/command/UserAmount.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\command; use app\data\model\DataUser; diff --git a/app/data/command/UserTransfer.php b/app/data/command/UserTransfer.php index da5c36071..cd08cbbd2 100644 --- a/app/data/command/UserTransfer.php +++ b/app/data/command/UserTransfer.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\command; use app\data\model\DataUser; diff --git a/app/data/command/UserUpgrade.php b/app/data/command/UserUpgrade.php index c2ceac0c6..a1291ca9e 100644 --- a/app/data/command/UserUpgrade.php +++ b/app/data/command/UserUpgrade.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\command; use app\data\model\DataUser; diff --git a/app/data/controller/api/Auth.php b/app/data/controller/api/Auth.php index f04f51b91..0d717faba 100644 --- a/app/data/controller/api/Auth.php +++ b/app/data/controller/api/Auth.php @@ -1,9 +1,24 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\service\UserAdminService; use app\data\service\UserTokenService; +use Exception; use think\admin\Controller; use think\exception\HttpResponseException; @@ -77,7 +92,7 @@ abstract class Auth extends Controller return UserAdminService::get($this->uuid, $this->type); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error($exception->getMessage()); } diff --git a/app/data/controller/api/Data.php b/app/data/controller/api/Data.php index a9520ee8b..ae1e30346 100644 --- a/app/data/controller/api/Data.php +++ b/app/data/controller/api/Data.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\model\BaseUserMessage; diff --git a/app/data/controller/api/Goods.php b/app/data/controller/api/Goods.php index 5f5b3bb63..5b2be8bfa 100644 --- a/app/data/controller/api/Goods.php +++ b/app/data/controller/api/Goods.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\model\ShopGoods; diff --git a/app/data/controller/api/Login.php b/app/data/controller/api/Login.php index 6ef763885..a2252c1e7 100644 --- a/app/data/controller/api/Login.php +++ b/app/data/controller/api/Login.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\model\DataUser; diff --git a/app/data/controller/api/News.php b/app/data/controller/api/News.php index e6879bdba..1d4a6849a 100644 --- a/app/data/controller/api/News.php +++ b/app/data/controller/api/News.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\model\DataNewsItem; diff --git a/app/data/controller/api/Notify.php b/app/data/controller/api/Notify.php index e8a076dab..427de0e95 100644 --- a/app/data/controller/api/Notify.php +++ b/app/data/controller/api/Notify.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\service\payment\AlipayPaymentService; diff --git a/app/data/controller/api/Wechat.php b/app/data/controller/api/Wechat.php index fda806ea5..f28a490e7 100644 --- a/app/data/controller/api/Wechat.php +++ b/app/data/controller/api/Wechat.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\service\UserAdminService; diff --git a/app/data/controller/api/Wxapp.php b/app/data/controller/api/Wxapp.php index 30819f63b..edaaae8a5 100644 --- a/app/data/controller/api/Wxapp.php +++ b/app/data/controller/api/Wxapp.php @@ -1,8 +1,23 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api; use app\data\service\UserAdminService; +use Exception; use think\admin\Controller; use think\exception\HttpResponseException; use think\Response; @@ -97,7 +112,7 @@ class Wxapp extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error("数据处理失败，{$exception->getMessage()}"); } @@ -126,7 +141,7 @@ class Wxapp extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error("授权换取失败，{$exception->getMessage()}"); } @@ -153,7 +168,7 @@ class Wxapp extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error($exception->getMessage()); } @@ -170,7 +185,7 @@ class Wxapp extends Controller $this->success('获取直播列表成功！', $list); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error($exception->getMessage()); } @@ -192,7 +207,7 @@ class Wxapp extends Controller $this->success('获取回放视频成功！', $result); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error($exception->getMessage()); } diff --git a/app/data/controller/api/auth/Address.php b/app/data/controller/api/auth/Address.php index c7e1546d2..049b72aa9 100644 --- a/app/data/controller/api/auth/Address.php +++ b/app/data/controller/api/auth/Address.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; @@ -76,6 +90,8 @@ class Address extends Auth /** * 修改地址状态 + * @return void + * @throws \think\db\exception\DbException */ public function state() { diff --git a/app/data/controller/api/auth/Balance.php b/app/data/controller/api/auth/Balance.php index f51f9d37a..14021407e 100644 --- a/app/data/controller/api/auth/Balance.php +++ b/app/data/controller/api/auth/Balance.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; diff --git a/app/data/controller/api/auth/Center.php b/app/data/controller/api/auth/Center.php index b0a038cb8..e9a58be48 100644 --- a/app/data/controller/api/auth/Center.php +++ b/app/data/controller/api/auth/Center.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; @@ -7,6 +21,7 @@ use app\data\model\BaseUserUpgrade; use app\data\model\DataUser; use app\data\service\UserAdminService; use app\data\service\UserUpgradeService; +use Exception; use think\admin\Storage; use think\exception\HttpResponseException; @@ -68,7 +83,7 @@ class Center extends Auth } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { trace_file($exception); $this->error($exception->getMessage()); } diff --git a/app/data/controller/api/auth/News.php b/app/data/controller/api/auth/News.php index 4b67d5a19..d99eee405 100644 --- a/app/data/controller/api/auth/News.php +++ b/app/data/controller/api/auth/News.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index 05e39e018..e7969db34 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; @@ -16,6 +30,8 @@ use app\data\service\GoodsService; use app\data\service\OrderService; use app\data\service\PaymentService; use app\data\service\UserAdminService; +use Exception; +use stdClass; use think\admin\extend\CodeExtend; use think\exception\HttpResponseException; @@ -189,7 +205,7 @@ class Order extends Auth $this->success('商品下单成功', $order); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error("商品下单失败，{$exception->getMessage()}"); } } @@ -358,10 +374,10 @@ class Order extends Auth // 返回订单数据及支付发起参数 $type = $order['amount_real'] <= 0 ? 'empty' : $data['payment_code']; $param = PaymentService::instance($type)->create($openid, $order['order_no'], $order['amount_real'], '商城订单支付', '', $data['payment_back'], $data['payment_image']); - $this->success('获取支付参数', ['order' => ShopOrder::mk()->where($map)->find() ?: new \stdClass(), 'param' => $param]); + $this->success('获取支付参数', ['order' => ShopOrder::mk()->where($map)->find() ?: new stdClass(), 'param' => $param]); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } @@ -489,7 +505,7 @@ class Order extends Auth empty($result['code']) ? $this->error($result['info']) : $this->success('快递追踪信息', $result); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } diff --git a/app/data/controller/api/auth/Rebate.php b/app/data/controller/api/auth/Rebate.php index 87188fd8c..0dc7841bb 100644 --- a/app/data/controller/api/auth/Rebate.php +++ b/app/data/controller/api/auth/Rebate.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; diff --git a/app/data/controller/api/auth/Transfer.php b/app/data/controller/api/auth/Transfer.php index 14a57564d..d54a96fa1 100644 --- a/app/data/controller/api/auth/Transfer.php +++ b/app/data/controller/api/auth/Transfer.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\api\auth; use app\data\controller\api\Auth; diff --git a/app/data/controller/base/Config.php b/app/data/controller/base/Config.php index 42f4e6580..fe19d23e4 100644 --- a/app/data/controller/base/Config.php +++ b/app/data/controller/base/Config.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use think\admin\Controller; diff --git a/app/data/controller/base/Discount.php b/app/data/controller/base/Discount.php index e8f470cda..513463a49 100644 --- a/app/data/controller/base/Discount.php +++ b/app/data/controller/base/Discount.php @@ -1,10 +1,23 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use app\data\model\BaseUserDiscount; use app\data\model\BaseUserUpgrade; -use app\data\service\UserUpgradeService; use think\admin\Controller; use think\admin\helper\QueryHelper; @@ -25,7 +38,7 @@ class Discount extends Controller */ public function index() { - $this->type = input('get.type', 'index'); + $this->type = $this->get['type'] ?? 'index'; BaseUserDiscount::mQuery()->layTable(function () { $this->title = '折扣方案管理'; }, function (QueryHelper $query) { diff --git a/app/data/controller/base/Message.php b/app/data/controller/base/Message.php index e53399d11..45e87b894 100644 --- a/app/data/controller/base/Message.php +++ b/app/data/controller/base/Message.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use app\data\model\BaseUserMessage; diff --git a/app/data/controller/base/Pager.php b/app/data/controller/base/Pager.php index 799c9c67e..1d72184e2 100644 --- a/app/data/controller/base/Pager.php +++ b/app/data/controller/base/Pager.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use think\admin\Controller; diff --git a/app/data/controller/base/Payment.php b/app/data/controller/base/Payment.php index 37d7e0d5c..e159b3b2e 100644 --- a/app/data/controller/base/Payment.php +++ b/app/data/controller/base/Payment.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use app\data\model\BaseUserPayment; @@ -32,7 +46,7 @@ class Payment extends Controller */ public function index() { - $this->type = input('get.type', 'index'); + $this->type = $this->get['type'] ?? 'index'; BaseUserPayment::mQuery()->layTable(function () { $this->title = '支付通道管理'; }, function (QueryHelper $query) { diff --git a/app/data/controller/base/Slider.php b/app/data/controller/base/Slider.php index f51dadae9..5513346be 100644 --- a/app/data/controller/base/Slider.php +++ b/app/data/controller/base/Slider.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use think\admin\Controller; diff --git a/app/data/controller/base/Upgrade.php b/app/data/controller/base/Upgrade.php index 39268e2e0..3fe8da5c7 100644 --- a/app/data/controller/base/Upgrade.php +++ b/app/data/controller/base/Upgrade.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base; use app\data\model\BaseUserUpgrade; diff --git a/app/data/controller/base/postage/Company.php b/app/data/controller/base/postage/Company.php index 8ff38586a..3564f6b27 100644 --- a/app/data/controller/base/postage/Company.php +++ b/app/data/controller/base/postage/Company.php @@ -1,9 +1,24 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base\postage; use app\data\model\BasePostageCompany; use app\data\service\ExpressService; +use Exception; use think\admin\Controller; use think\admin\helper\QueryHelper; use think\exception\HttpResponseException; @@ -25,7 +40,7 @@ class Company extends Controller */ public function index() { - $this->type = input('get.type', 'index'); + $this->type = $this->get['type'] ?? 'index'; BasePostageCompany::mQuery()->layTable(function () { $this->title = '快递公司管理'; }, function (QueryHelper $query) { @@ -108,7 +123,7 @@ class Company extends Controller $this->success('同步快递公司成功！'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error('同步快递公司数据失败！'); } } diff --git a/app/data/controller/base/postage/Template.php b/app/data/controller/base/postage/Template.php index ef7a327fb..3aa6ab65e 100644 --- a/app/data/controller/base/postage/Template.php +++ b/app/data/controller/base/postage/Template.php @@ -1,8 +1,21 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\base\postage; -use app\data\model\BasePostageRegion; use app\data\model\BasePostageTemplate; use app\data\service\ExpressService; use think\admin\Controller; @@ -26,7 +39,7 @@ class Template extends Controller */ public function index() { - $this->type = input('get.type', 'index'); + $this->type = $this->get['type'] ?? 'index';; BasePostageTemplate::mQuery()->layTable(function () { $this->title = '快递邮费模板'; }, function (QueryHelper $query) { @@ -38,17 +51,20 @@ class Template extends Controller /** * 配送区域管理 * @auth true + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function region() { if ($this->request->isGet()) { $this->title = '配送区域管理'; - $this->citys = ExpressService::region(3, null); + $this->citys = ExpressService::region(); $this->fetch('form_region'); } else { - $data = $this->_vali(['nos.default' => '', 'oks.default' => '']); - if ($data['nos']) BasePostageRegion::mk()->whereIn('id', str2arr($data['nos']))->update(['status' => 0]); - if ($data['oks']) BasePostageRegion::mk()->whereIn('id', str2arr($data['oks']))->update(['status' => 1]); + $data = $this->_vali(['nos.default' => '']); + sysdata('data.NotRegion', str2arr($data['nos'])); $this->success('修改配送区域成功！', 'javascript:history.back()'); } } @@ -76,6 +92,9 @@ class Template extends Controller /** * 表单数据处理 * @param array $data + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ protected function _form_filter(array &$data) { diff --git a/app/data/controller/news/Item.php b/app/data/controller/news/Item.php index 2cc538aa2..5b2c32e75 100644 --- a/app/data/controller/news/Item.php +++ b/app/data/controller/news/Item.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\news; use app\data\model\DataNewsItem; @@ -26,7 +40,7 @@ class Item extends Controller */ public function index() { - $this->type = input('get.type', 'index'); + $this->type = $this->get['type'] ?? 'index'; DataNewsItem::mQuery($this->get)->layTable(function () { $this->title = '文章内容管理'; $this->marks = DataNewsMark::items(); diff --git a/app/data/controller/news/Mark.php b/app/data/controller/news/Mark.php index b0ff19952..9ac23edc3 100644 --- a/app/data/controller/news/Mark.php +++ b/app/data/controller/news/Mark.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\news; use app\data\model\DataNewsMark; diff --git a/app/data/controller/shop/Cate.php b/app/data/controller/shop/Cate.php index a45741599..a72b2ea82 100644 --- a/app/data/controller/shop/Cate.php +++ b/app/data/controller/shop/Cate.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\shop; use app\data\model\ShopGoodsCate; diff --git a/app/data/controller/shop/Goods.php b/app/data/controller/shop/Goods.php index 325ec6965..080722ae6 100644 --- a/app/data/controller/shop/Goods.php +++ b/app/data/controller/shop/Goods.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\shop; use app\data\model\BaseUserDiscount; diff --git a/app/data/controller/shop/Mark.php b/app/data/controller/shop/Mark.php index dd9839ff7..e505dd573 100644 --- a/app/data/controller/shop/Mark.php +++ b/app/data/controller/shop/Mark.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\shop; use app\data\model\ShopGoodsMark; diff --git a/app/data/controller/shop/Order.php b/app/data/controller/shop/Order.php index dc289dc43..e22fee9ee 100644 --- a/app/data/controller/shop/Order.php +++ b/app/data/controller/shop/Order.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\shop; use app\data\model\DataUser; @@ -8,6 +22,7 @@ use app\data\model\ShopOrderSend; use app\data\service\OrderService; use app\data\service\PaymentService; use app\data\service\UserAdminService; +use Exception; use think\admin\Controller; use think\admin\extend\CodeExtend; use think\exception\HttpResponseException; @@ -185,7 +200,7 @@ class Order extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } diff --git a/app/data/controller/shop/Send.php b/app/data/controller/shop/Send.php index 6974f0561..1393766f5 100644 --- a/app/data/controller/shop/Send.php +++ b/app/data/controller/shop/Send.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\shop; use app\data\model\BasePostageCompany; @@ -8,6 +22,7 @@ use app\data\model\ShopOrder; use app\data\model\ShopOrderSend; use app\data\service\ExpressService; use app\data\service\OrderService; +use Exception; use think\admin\Controller; use think\exception\HttpResponseException; @@ -154,7 +169,7 @@ class Send extends Controller $this->fetch('truck_query'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } diff --git a/app/data/controller/total/Portal.php b/app/data/controller/total/Portal.php index 91ae5a173..bfd433872 100644 --- a/app/data/controller/total/Portal.php +++ b/app/data/controller/total/Portal.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\total; use app\data\model\BaseUserUpgrade; diff --git a/app/data/controller/user/Admin.php b/app/data/controller/user/Admin.php index 6a1e5f824..95e138dd5 100644 --- a/app/data/controller/user/Admin.php +++ b/app/data/controller/user/Admin.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\user; use app\data\model\BaseUserUpgrade; diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php index 191a2c9b4..253b525f3 100644 --- a/app/data/controller/user/Balance.php +++ b/app/data/controller/user/Balance.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\user; use app\data\model\BaseUserUpgrade; diff --git a/app/data/controller/user/Message.php b/app/data/controller/user/Message.php index f31655cdb..166a1dcbb 100644 --- a/app/data/controller/user/Message.php +++ b/app/data/controller/user/Message.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\user; use app\data\model\DataUserMessage; diff --git a/app/data/controller/user/Rebate.php b/app/data/controller/user/Rebate.php index 58f9953b5..0394910ef 100644 --- a/app/data/controller/user/Rebate.php +++ b/app/data/controller/user/Rebate.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\user; use app\data\model\BaseUserUpgrade; diff --git a/app/data/controller/user/Transfer.php b/app/data/controller/user/Transfer.php index c371f71bd..d948a2311 100644 --- a/app/data/controller/user/Transfer.php +++ b/app/data/controller/user/Transfer.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\controller\user; use app\data\model\DataUser; diff --git a/app/data/database/20221013045838_install_user.php b/app/data/database/20221013045838_install_user.php index bf1aceb4b..1dcc85994 100644 --- a/app/data/database/20221013045838_install_user.php +++ b/app/data/database/20221013045838_install_user.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + use think\migration\Migrator; @set_time_limit(0); @@ -16,7 +30,6 @@ class InstallUser extends Migrator public function change() { $this->_create_base_postage_company(); - $this->_create_base_postage_region(); $this->_create_base_postage_template(); $this->_create_base_user_discount(); $this->_create_base_user_message(); @@ -83,43 +96,6 @@ class InstallUser extends Migrator $this->table($table)->changeColumn('id', 'integer', ['limit' => 20, 'identity' => true]); } - /** - * 创建数据对象 - * @class BasePostageRegion - * @table base_postage_region - * @return void - */ - private function _create_base_postage_region() - { - - // 当前数据表 - $table = 'base_postage_region'; - - // 存在则跳过 - if ($this->hasTable($table)) return; - - // 创建数据表 - $this->table($table, [ - 'engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '数据-快递-区域', - ]) - ->addColumn('pid', 'integer', ['limit' => 20, 'default' => 0, 'null' => true, 'comment' => '上级PID']) - ->addColumn('first', 'string', ['limit' => 50, 'default' => '', 'null' => true, 'comment' => '首字母']) - ->addColumn('short', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '区域简称']) - ->addColumn('name', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '区域名称']) - ->addColumn('level', 'integer', ['limit' => 4, 'default' => 0, 'null' => true, 'comment' => '区域层级']) - ->addColumn('pinyin', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '区域拼音']) - ->addColumn('code', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '区域邮编']) - ->addColumn('status', 'integer', ['limit' => 1, 'default' => 1, 'null' => true, 'comment' => '使用状态']) - ->addColumn('lng', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '所在经度']) - ->addColumn('lat', 'string', ['limit' => 100, 'default' => '', 'null' => true, 'comment' => '所在纬度']) - ->addIndex('pid', ['name' => 'idx_base_postage_region_pid']) - ->addIndex('name', ['name' => 'idx_base_postage_region_name']) - ->save(); - - // 修改主键长度 - $this->table($table)->changeColumn('id', 'integer', ['limit' => 20, 'identity' => true]); - } - /** * 创建数据对象 * @class BasePostageTemplate diff --git a/app/data/database/20221013045839_install_user_data.php b/app/data/database/20221013045839_install_user_data.php index b38357079..133d9a526 100644 --- a/app/data/database/20221013045839_install_user_data.php +++ b/app/data/database/20221013045839_install_user_data.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + use think\admin\extend\PhinxExtend; use think\migration\Migrator; diff --git a/app/data/database/20221013045840_install_user_region.php b/app/data/database/20221013045840_install_user_region.php deleted file mode 100644 index 058431829..000000000 --- a/app/data/database/20221013045840_install_user_region.php +++ /dev/null @@ -1,3784 +0,0 @@ -installRegion(); - } - - /** - * 写入默认区域数据 - * @return void - * @throws \think\db\exception\DbException - */ - private function installRegion() - { - // 检查数据 - $table = 'base_postage_region'; - $result = $this->fetchRow("select count(1) _count from $table"); - if (isset($result['_count']) && $result['_count'] > 0) return; - - // 写入数据 - $this->execute(<< +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/BasePostageRegion.php b/app/data/model/BasePostageRegion.php deleted file mode 100644 index c1dc174cf..000000000 --- a/app/data/model/BasePostageRegion.php +++ /dev/null @@ -1,14 +0,0 @@ - +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/BaseUserDiscount.php b/app/data/model/BaseUserDiscount.php index 3b43b9225..8df81698c 100644 --- a/app/data/model/BaseUserDiscount.php +++ b/app/data/model/BaseUserDiscount.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/BaseUserMessage.php b/app/data/model/BaseUserMessage.php index b17d31eff..e3267a176 100644 --- a/app/data/model/BaseUserMessage.php +++ b/app/data/model/BaseUserMessage.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/BaseUserPayment.php b/app/data/model/BaseUserPayment.php index 4ce692e1f..40a1f9724 100644 --- a/app/data/model/BaseUserPayment.php +++ b/app/data/model/BaseUserPayment.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/BaseUserUpgrade.php b/app/data/model/BaseUserUpgrade.php index 3c431009d..92f7f1072 100644 --- a/app/data/model/BaseUserUpgrade.php +++ b/app/data/model/BaseUserUpgrade.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use app\data\service\RebateService; diff --git a/app/data/model/DataNewsItem.php b/app/data/model/DataNewsItem.php index 7a3fe2347..75121e9eb 100644 --- a/app/data/model/DataNewsItem.php +++ b/app/data/model/DataNewsItem.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataNewsMark.php b/app/data/model/DataNewsMark.php index 674f6fb3f..3e02a65a0 100644 --- a/app/data/model/DataNewsMark.php +++ b/app/data/model/DataNewsMark.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataNewsXCollect.php b/app/data/model/DataNewsXCollect.php index 7bdf52d32..ff7e92839 100644 --- a/app/data/model/DataNewsXCollect.php +++ b/app/data/model/DataNewsXCollect.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUser.php b/app/data/model/DataUser.php index 977f087fb..2961ad160 100644 --- a/app/data/model/DataUser.php +++ b/app/data/model/DataUser.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserAddress.php b/app/data/model/DataUserAddress.php index 1702e0b5e..950a8a963 100644 --- a/app/data/model/DataUserAddress.php +++ b/app/data/model/DataUserAddress.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserBalance.php b/app/data/model/DataUserBalance.php index a8a781259..91adea75f 100644 --- a/app/data/model/DataUserBalance.php +++ b/app/data/model/DataUserBalance.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserMessage.php b/app/data/model/DataUserMessage.php index 57e33a842..cbb9efdc4 100644 --- a/app/data/model/DataUserMessage.php +++ b/app/data/model/DataUserMessage.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserPayment.php b/app/data/model/DataUserPayment.php index 156f9d7c8..1896e33b3 100644 --- a/app/data/model/DataUserPayment.php +++ b/app/data/model/DataUserPayment.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserRebate.php b/app/data/model/DataUserRebate.php index 85d09081f..80591eb38 100644 --- a/app/data/model/DataUserRebate.php +++ b/app/data/model/DataUserRebate.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserToken.php b/app/data/model/DataUserToken.php index 5bacf36ed..1766c69fa 100644 --- a/app/data/model/DataUserToken.php +++ b/app/data/model/DataUserToken.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/DataUserTransfer.php b/app/data/model/DataUserTransfer.php index e692624ad..47a013d67 100644 --- a/app/data/model/DataUserTransfer.php +++ b/app/data/model/DataUserTransfer.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopGoods.php b/app/data/model/ShopGoods.php index 0b414645e..b78c62be5 100644 --- a/app/data/model/ShopGoods.php +++ b/app/data/model/ShopGoods.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopGoodsCate.php b/app/data/model/ShopGoodsCate.php index eba66f718..1359431ed 100644 --- a/app/data/model/ShopGoodsCate.php +++ b/app/data/model/ShopGoodsCate.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\extend\DataExtend; diff --git a/app/data/model/ShopGoodsItem.php b/app/data/model/ShopGoodsItem.php index ff444309d..382dec187 100644 --- a/app/data/model/ShopGoodsItem.php +++ b/app/data/model/ShopGoodsItem.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopGoodsMark.php b/app/data/model/ShopGoodsMark.php index 8da4bf3df..ab539f190 100644 --- a/app/data/model/ShopGoodsMark.php +++ b/app/data/model/ShopGoodsMark.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopGoodsStock.php b/app/data/model/ShopGoodsStock.php index e09ed05a5..76798c499 100644 --- a/app/data/model/ShopGoodsStock.php +++ b/app/data/model/ShopGoodsStock.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopOrder.php b/app/data/model/ShopOrder.php index e2f348d0b..330a575b9 100644 --- a/app/data/model/ShopOrder.php +++ b/app/data/model/ShopOrder.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopOrderItem.php b/app/data/model/ShopOrderItem.php index d36115b37..6e4bb024d 100644 --- a/app/data/model/ShopOrderItem.php +++ b/app/data/model/ShopOrderItem.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/model/ShopOrderSend.php b/app/data/model/ShopOrderSend.php index 748576e09..4c093c4ea 100644 --- a/app/data/model/ShopOrderSend.php +++ b/app/data/model/ShopOrderSend.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\model; use think\admin\Model; diff --git a/app/data/readme.md b/app/data/readme.md index 234aa7825..42ff2cbb1 100644 --- a/app/data/readme.md +++ b/app/data/readme.md @@ -1,9 +1,7 @@ 【模块版权说明】 -注意：此模块开发中，存在大量测试代码，不建议直接使用！ +注意：此模块需要体验案例，存在大量测试代码，不建议直接商用！ ThinkAdmin 的 data 模块功能为会员专有功能，普通用户不得直接商用。 -ThinkAdmin 除 data 模块之外的 admin 和 wechat 模块属于 MIT 开源部分，不需要进行授权。 - -具体商务合作请联系官方客服，联系电话：18922374818 \ No newline at end of file +详情阅读：https://thinkadmin.top/vip-introduce \ No newline at end of file diff --git a/app/data/service/ExpressService.php b/app/data/service/ExpressService.php index 073d46d78..49a78ddb1 100644 --- a/app/data/service/ExpressService.php +++ b/app/data/service/ExpressService.php @@ -1,10 +1,22 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; -use app\data\model\BasePostageRegion; use app\data\model\BasePostageTemplate; -use think\admin\extend\DataExtend; use think\admin\Service; use think\admin\service\InterfaceService; @@ -62,21 +74,34 @@ class ExpressService extends Service /** * 配送区域树型数据 * @param integer $level 最大等级 - * @param null|integer $status 状态筛选 + * @param ?integer $status 状态筛选 * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public static function region(int $level = 3, ?int $status = null): array { - $query = BasePostageRegion::mk(); - if (is_numeric($level)) $query->where('level', '<=', $level); - if (is_numeric($status)) $query->where(['status' => $status]); - $items = DataExtend::arr2tree($query->column('id,pid,name,status', 'id'), 'id', 'pid', 'subs'); - // 排序子集为空的省份和城市 - foreach ($items as $ik => $item) { - foreach ($item['subs'] as $ck => $city) { - if (isset($city['subs']) && empty($city['subs'])) unset($items[$ik]['subs'][$ck]); + [$items, $ncodes] = [[], sysdata('data.NotRegion')]; + foreach (json_decode(file_get_contents(syspath('public/static/plugs/jquery/area/data.json')), true) as $prov) { + $pstat = intval(!in_array($prov['code'], $ncodes)); + if (is_null($status) || is_numeric($status) && $status === $pstat) { + $mprov = ['id' => $prov['code'], 'pid' => 0, 'name' => $prov['name'], 'status' => $pstat, 'subs' => []]; + if ($level > 1) foreach ($prov['list'] as $city) { + $cstat = intval(!in_array($city['code'], $ncodes)); + if (is_null($status) || is_numeric($status) && $status === $cstat) { + $mcity = ['id' => $city['code'], 'pid' => $prov['code'], 'name' => $city['name'], 'status' => $cstat, 'subs' => []]; + if ($level > 2) foreach ($city['list'] as $area) { + $astat = intval(!in_array($area['code'], $ncodes)); + if (is_null($status) || is_numeric($status) && $status === $astat) { + $mcity['subs'][] = ['id' => $area['code'], 'pid' => $city['code'], 'status' => $astat, 'name' => $area['name']]; + } + } + $mprov['subs'][] = $mcity; + } + } + $items[] = $mprov; } - if (isset($item['subs']) && empty($item['subs'])) unset($items[$ik]); } return $items; } diff --git a/app/data/service/GoodsService.php b/app/data/service/GoodsService.php index 3b0f0e554..9b14f30e3 100644 --- a/app/data/service/GoodsService.php +++ b/app/data/service/GoodsService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\ShopGoods; diff --git a/app/data/service/MessageService.php b/app/data/service/MessageService.php index d83b83a28..607a9e9f2 100644 --- a/app/data/service/MessageService.php +++ b/app/data/service/MessageService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUserMessage; diff --git a/app/data/service/NewsService.php b/app/data/service/NewsService.php index 83da1564b..b2b9349d8 100644 --- a/app/data/service/NewsService.php +++ b/app/data/service/NewsService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataNewsItem; diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php index 39aeb893e..6feaaa96f 100644 --- a/app/data/service/OrderService.php +++ b/app/data/service/OrderService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\BaseUserDiscount; diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index d0378fe20..a5745336f 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\BaseUserPayment; diff --git a/app/data/service/RebateService.php b/app/data/service/RebateService.php index c3361204d..33f3438df 100644 --- a/app/data/service/RebateService.php +++ b/app/data/service/RebateService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\BaseUserDiscount; diff --git a/app/data/service/UserAdminService.php b/app/data/service/UserAdminService.php index c5869a331..e547d90be 100644 --- a/app/data/service/UserAdminService.php +++ b/app/data/service/UserAdminService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUser; diff --git a/app/data/service/UserBalanceService.php b/app/data/service/UserBalanceService.php index 61af9bf17..c2fd6024b 100644 --- a/app/data/service/UserBalanceService.php +++ b/app/data/service/UserBalanceService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUser; diff --git a/app/data/service/UserRebateService.php b/app/data/service/UserRebateService.php index 68b26951f..db4e58471 100644 --- a/app/data/service/UserRebateService.php +++ b/app/data/service/UserRebateService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUser; @@ -19,6 +33,7 @@ class UserRebateService extends Service * 同步刷新用户返利 * @param integer $uuid * @return array [total, count, lock] + * @throws \think\db\exception\DbException */ public static function amount(int $uuid): array { diff --git a/app/data/service/UserTokenService.php b/app/data/service/UserTokenService.php index 1982a5ebd..812b255e6 100644 --- a/app/data/service/UserTokenService.php +++ b/app/data/service/UserTokenService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUserToken; diff --git a/app/data/service/UserTransferService.php b/app/data/service/UserTransferService.php index 6b5e24007..30bb07274 100644 --- a/app/data/service/UserTransferService.php +++ b/app/data/service/UserTransferService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\DataUserTransfer; diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php index 0bed86186..3a30a8db1 100644 --- a/app/data/service/UserUpgradeService.php +++ b/app/data/service/UserUpgradeService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service; use app\data\model\BaseUserUpgrade; diff --git a/app/data/service/payment/AlipayPaymentService.php b/app/data/service/payment/AlipayPaymentService.php index a9bd5a438..0d70d2dbf 100644 --- a/app/data/service/payment/AlipayPaymentService.php +++ b/app/data/service/payment/AlipayPaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use AliPay\App; diff --git a/app/data/service/payment/BalancePaymentService.php b/app/data/service/payment/BalancePaymentService.php index 1eb9f8dda..07df85386 100644 --- a/app/data/service/payment/BalancePaymentService.php +++ b/app/data/service/payment/BalancePaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use app\data\model\DataUserBalance; diff --git a/app/data/service/payment/EmptyPaymentService.php b/app/data/service/payment/EmptyPaymentService.php index 18a091556..be03efe25 100644 --- a/app/data/service/payment/EmptyPaymentService.php +++ b/app/data/service/payment/EmptyPaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use app\data\model\ShopOrder; diff --git a/app/data/service/payment/JoinpayPaymentService.php b/app/data/service/payment/JoinpayPaymentService.php index 6a8f364dc..e9c736069 100644 --- a/app/data/service/payment/JoinpayPaymentService.php +++ b/app/data/service/payment/JoinpayPaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use app\data\service\PaymentService; diff --git a/app/data/service/payment/VoucherPaymentService.php b/app/data/service/payment/VoucherPaymentService.php index 984cacd6d..ccd939343 100644 --- a/app/data/service/payment/VoucherPaymentService.php +++ b/app/data/service/payment/VoucherPaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use app\data\model\ShopOrder; diff --git a/app/data/service/payment/WechatPaymentService.php b/app/data/service/payment/WechatPaymentService.php index 457809d0f..b448a2be6 100644 --- a/app/data/service/payment/WechatPaymentService.php +++ b/app/data/service/payment/WechatPaymentService.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + namespace app\data\service\payment; use app\data\service\PaymentService; diff --git a/app/data/sys.php b/app/data/sys.php index 5b60f894d..c33610b2c 100644 --- a/app/data/sys.php +++ b/app/data/sys.php @@ -1,5 +1,19 @@ +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 免责声明 ( https://thinkadmin.top/disclaimer ) +// | 会员免费 ( https://thinkadmin.top/vip-introduce ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin +// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// +---------------------------------------------------------------------- + use app\data\command\OrderClean; use app\data\command\UserAgent; use app\data\command\UserAmount;