root/cxybn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
尖叫 2023-11-10 10:42:01 +08:00
parent 4272459118
commit 9bda049577
3 changed files with 416 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
.idea/workspace.xml generated
View File

@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/application/api/controller/Account.php" />
</component>
<component name="ChangeListManager">
<list default="true" id="4256ed8b-19a0-40ba-b9ef-b8e8a4c1f799" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/application/common/model/NoticeSetting.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/NoticeSetting.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/logic/UserLogic.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/logic/UserLogic.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/common/behavior/Notice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/behavior/Notice.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/common/server/WxMessageServer.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/server/WxMessageServer.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -19,10 +25,19 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<state relative-caret-position="462">
<caret line="123" column="27" lean-forward="true" selection-start-line="123" selection-start-column="27" selection-end-line="123" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="729">
<caret line="88" column="13" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
</state>
</provider>
</entry>
@ -30,8 +45,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/behavior/Notice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="62" column="57" lean-forward="true" selection-start-line="62" selection-start-column="57" selection-end-line="62" selection-end-column="57" />
<state relative-caret-position="654">
<caret line="82" column="60" selection-start-line="82" selection-start-column="60" selection-end-line="82" selection-end-column="60" />
</state>
</provider>
</entry>
@ -39,71 +54,35 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/logic/LoginLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="610" column="30" selection-start-line="610" selection-start-column="30" selection-end-line="610" selection-end-column="30" />
<state relative-caret-position="400">
<caret line="51" column="19" lean-forward="true" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="78" column="47" lean-forward="true" selection-start-line="78" selection-start-column="47" selection-end-line="78" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/logic/UserLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
<caret line="436" selection-start-line="436" selection-end-line="436" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/tags.php">
<entry file="file://$PROJECT_DIR$/application/common/logic/AccountLogLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="54" column="34" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="129" column="59" lean-forward="true" selection-start-line="129" selection-start-column="59" selection-end-line="129" selection-end-column="59" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/model/OrderLog.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/model/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4336">
<caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/common/model/NoticeSetting.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1150">
<caret line="90" column="31" lean-forward="true" selection-start-line="90" selection-start-column="31" selection-end-line="90" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/model/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="40" column="21" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="21" />
<state relative-caret-position="389">
<caret line="62" column="45" lean-forward="true" selection-start-line="62" selection-start-column="45" selection-end-line="62" selection-end-column="45" />
</state>
</provider>
</entry>
@ -121,6 +100,10 @@
<find>余额</find>
<find>support</find>
<find>余额支付</find>
<find>codeurl</find>
<find>小程序</find>
<find>authLogin</find>
<find>adjustaccount</find>
</findStrings>
<replaceStrings>
<replace />
@ -139,6 +122,9 @@
<option value="$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/application/common/model/NoticeSetting.php" />
<option value="$PROJECT_DIR$/application/common/behavior/Notice.php" />
<option value="$PROJECT_DIR$/application/admin/logic/UserLogic.php" />
<option value="$PROJECT_DIR$/application/common/server/WxMessageServer.php" />
</list>
</option>
</component>
@ -207,8 +193,8 @@
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="704" />
<option name="y" value="149" />
<option name="x" value="274" />
<option name="y" value="32" />
<option name="width" value="1400" />
<option name="height" value="1000" />
</component>
@ -234,14 +220,20 @@
<item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
<item name="cxybn" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
<item name="cxybn" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
<item name="cxybn" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="behavior" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -279,18 +271,19 @@
<option name="presentableId" value="Default" />
<updated>1698048469265</updated>
<workItem from="1698048470415" duration="2404000" />
<workItem from="1698909025553" duration="4065000" />
<workItem from="1698909025553" duration="7497000" />
<workItem from="1699340373352" duration="6798000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6469000" />
<option name="totallyTimeSpent" value="16699000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18017058" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20095949" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -392,13 +385,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/WeChat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="24" column="6" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Subscribe.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
@ -427,20 +413,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/Client_.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-261">
<caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/OfficialAccount/TemplateMessage/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="136" column="20" selection-start-line="136" selection-start-column="20" selection-end-line="136" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/tags.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -486,66 +458,136 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/logic/LoginLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="610" column="30" selection-start-line="610" selection-start-column="30" selection-end-line="610" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/behavior/Notice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="62" column="57" lean-forward="true" selection-start-line="62" selection-start-column="57" selection-end-line="62" selection-end-column="57" />
<state relative-caret-position="100">
<caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/OrderLog.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<state relative-caret-position="475">
<caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/Order.php">
<entry file="file://$PROJECT_DIR$/application/api/logic/WeChatLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4336">
<caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
<state relative-caret-position="500">
<caret line="41" column="31" selection-start-line="41" selection-start-column="31" selection-end-line="41" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/BasicService/Jssdk/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1725">
<caret line="79" column="20" selection-start-line="79" selection-start-column="20" selection-end-line="79" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<state relative-caret-position="575">
<caret line="40" column="21" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/application/api/controller/WeChat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<state relative-caret-position="475">
<caret line="35" column="28" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
<entry file="file://$PROJECT_DIR$/application/common/model/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="129" column="59" lean-forward="true" selection-start-line="129" selection-start-column="59" selection-end-line="129" selection-end-column="59" />
<state relative-caret-position="25">
<caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/OfficialAccount/TemplateMessage/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="136" column="20" selection-start-line="136" selection-start-column="20" selection-end-line="136" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Account.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="238" column="36" selection-start-line="238" selection-start-column="36" selection-end-line="238" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/MiniProgram/Auth/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="38" column="49" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/logic/LoginLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="51" column="19" lean-forward="true" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="78" column="47" lean-forward="true" selection-start-line="78" selection-start-column="47" selection-end-line="78" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/logic/AccountLogLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389">
<caret line="62" column="45" lean-forward="true" selection-start-line="62" selection-start-column="45" selection-end-line="62" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/NoticeSetting.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1150">
<caret line="90" column="31" lean-forward="true" selection-start-line="90" selection-start-column="31" selection-end-line="90" selection-end-column="31" />
<state relative-caret-position="-263">
<caret line="51" column="10" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/model/Client_.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="26" column="10" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/logic/UserLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="436" selection-start-line="436" selection-end-line="436" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="123" column="27" lean-forward="true" selection-start-line="123" selection-start-column="27" selection-end-line="123" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/behavior/Notice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="654">
<caret line="82" column="60" selection-start-line="82" selection-start-column="60" selection-end-line="82" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="729">
<caret line="88" column="13" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
</state>
</provider>
</entry>

40
application/admin/logic/UserLogic.php
View File

@ -23,6 +23,7 @@ use app\common\logic\AccountLogLogic;
use app\common\logic\LogicBase;
use app\common\logic\UserLevelLogic;
use app\common\model\AccountLog;
use app\common\model\NoticeSetting;
use app\common\model\Order;
use app\common\model\Pay;
use app\common\model\User;
@ -30,6 +31,7 @@ use app\common\model\UserLevel;
use app\common\server\UrlServer;
use think\Db;
use think\Exception;
use think\Hook;
class UserLogic extends LogicBase
{
@ -41,7 +43,8 @@ class UserLogic extends LogicBase
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public static function lists($get){
public static function lists($get)
{
$user = new User();
$where = [];
@ -221,7 +224,8 @@ class UserLogic extends LogicBase
* @param bool $expenditure 是否显示会员消费
* @return User|mixed
*/
public static function getUser($id,$getdata = false,$expenditure = false){
public static function getUser($id, $getdata = false, $expenditure = false)
{
$user = User::get($id);
$user->append(['level_name', 'group_name']);
if ($getdata) {
@ -274,10 +278,12 @@ class UserLogic extends LogicBase
}
return $user;
}
/*
* 批量设置会员分组
*/
public static function setGroup($post){
public static function setGroup($post)
{
return Db::name('user')->where(['id' => $post['user_ids']])->update(['group_id' => $post['group_id']]);
}
@ -323,7 +329,8 @@ class UserLogic extends LogicBase
/*
* 用户账户调整
*/
public static function adjustAccount($post_data){
public static function adjustAccount($post_data)
{
Db::startTrans();
try {
$update_data = [];
@ -416,6 +423,18 @@ class UserLogic extends LogicBase
UserLevelLogic::updateUserLevel($post_data['id']);
}
Db::commit();
//金额调整 发送推送
if ($post_data['type'] == 'money') {
Hook::listen('notice', [
'user_id' => $post_data['id'],
'type' => 1,
'scene' => NoticeSetting::MONEY_PAY_NOTICE,
'money' => $post_data['money'],
]);
}
return true;
} catch (Exception $e) {
Db::rollback();
@ -424,14 +443,17 @@ class UserLogic extends LogicBase
}
public static function adjustLevel($post_data){
public static function adjustLevel($post_data)
{
return Db::name('user')->where('id', $post_data['id'])->update(['level' => $post_data['level']]);
}
/*
* 获取分组
*/
public static function getGroupList(){
public static function getGroupList()
{
return Db::name('user_group')->where(['del' => 0])->field('id,name')->select();
}
@ -446,7 +468,8 @@ class UserLogic extends LogicBase
/*
* 编辑会员
*/
public static function edit($post){
public static function edit($post)
{
$user = User::get($post['id']);
if (!empty($post['password'])) {
//生成密码
@ -480,7 +503,8 @@ class UserLogic extends LogicBase
return $user->allowField(true)->save($post);
}
public static function getList($get){
public static function getList($get)
{
switch ($get['type']) {
case 0://下单明细
$order = new Order();

8
application/common/behavior/Notice.php
View File

@ -50,13 +50,12 @@ class Notice
}
/**
* Notes: 根据各个场景发送通知
* @param $user_id
* @param $params
* @author 段誉(2021/4/28 18:21)
* @throws Exception
* @author 段誉(2021/4/28 18:21)
*/
public function noticeByScene($user_id, $params)
{
@ -91,16 +90,14 @@ class Notice
}
/**
* Notes: 拼装额外参数
* @param $params
* @author 段誉(2021/4/28 18:21)
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @author 段誉(2021/4/28 18:21)
*/
public function mergeParams($params)
{
@ -130,6 +127,7 @@ class Notice
if (!empty($params['user_id'])) {
$user = Db::name('user')->where('id', $params['user_id'])->find();
$params['nickname'] = $user['nickname'];
$params['user_money'] = $user['user_money'];
}
//下级名称;(邀请人场景)