-
-
-
-
-
-
-
-
-
-
-
-- [Gitee](https://gitee.com/hg-code/apidoc-php) -> 
-
-
-## 🌐交流群
-
-
-
-
-
-## 💡鸣谢
-
-doctrine/annotations
-
-
-## 🔗链接
- ApiDoc UI
-
- ApiDoc Demo
-
-
diff --git a/vendor/hg/apidoc/composer.json b/vendor/hg/apidoc/composer.json
deleted file mode 100644
index fef0c0abd..000000000
--- a/vendor/hg/apidoc/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "hg/apidoc",
- "description": "根据注解生成API文档，兼容Laravel、ThinkPHP、Hyperf、Webman等框架；在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能",
- "keywords": [
- "apidoc",
- "api文档",
- "接口文档",
- "自动生成api",
- "注释生成",
- "php接口文档",
- "api文档",
- "Markdown",
- "注解"
- ],
- "require": {
- "php": "^7.1 || ^8.0",
- "doctrine/annotations": "^1 || ^2"
- },
- "license": "MIT",
- "authors": [
- {
- "name": "hg-code",
- "email": "376401263@qq.com"
- }
- ],
- "autoload": {
- "psr-4": {
- "hg\\apidoc\\": "src/"
- }
- },
- "extra": {
- "laravel": {
- "providers": [
- "hg\\apidoc\\providers\\LaravelService"
- ]
- },
- "think": {
- "services": [
- "hg\\apidoc\\providers\\ThinkPHPService"
- ],
- "config": {
- "apidoc": "src/config.php"
- }
- },
- "hyperf": {
- "config": "hg\\apidoc\\ConfigProvider"
- }
- },
- "minimum-stability": "dev"
-}
diff --git a/vendor/hg/apidoc/src/Auth.php b/vendor/hg/apidoc/src/Auth.php
deleted file mode 100644
index b86686a5f..000000000
--- a/vendor/hg/apidoc/src/Auth.php
+++ /dev/null
@@ -1,192 +0,0 @@
-authConfig = $authConfig;
- }
-
- /**
- * 验证密码是否正确
- * @param $password
- * @return false|string
- */
- public function verifyAuth(string $password, string $appKey)
- {
- $authConfig = $this->authConfig;
- if (!empty($appKey)) {
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApp = $currentAppConfig['appConfig'];
- if (!empty($currentApp) && !empty($currentApp['password'])) {
- // 应用密码
- if (md5($currentApp['password']) === $password) {
- return $this->createToken($currentApp['password'],$authConfig['expire']);
- }
- throw new ErrorException("password error");
- }
- }
- if ($authConfig['enable']) {
- // 密码验证
- if (md5($authConfig['password']) === $password) {
- return $this->createToken($authConfig['password'],$authConfig['expire']);
- }
- throw new ErrorException("password error");
- }
- return false;
- }
-
- /**
- * 验证token是否可用
- * @param $request
- * @return bool
- */
- public function checkAuth($params=[]): bool
- {
- $authConfig = $this->authConfig;
- $token = !empty($params['token'])?$params['token']:"";
- $appKey = !empty($params['appKey'])?$params['appKey']:"";
- if (!empty($appKey)) {
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApp = $currentAppConfig['appConfig'];
- if (!empty($currentApp) && !empty($currentApp['password'])) {
- if (empty($token)) {
- throw new ErrorException("token not found");
- }
- // 应用密码
- if ($this->checkToken($token, $currentApp['password'])) {
- return true;
- } else {
- throw new ErrorException("token error");
- }
- } else if (empty($authConfig['enable'])) {
- return true;
- }
- }
- if($authConfig['enable'] && empty($token)){
- throw new ErrorException("token not found");
- }else if (!empty($token) && !$this->checkToken($token, "") && $authConfig['enable']) {
- throw new ErrorException("token error");
- }
- return true;
- }
-
-
- /**
- * 获取tokencode
- * @param string $password
- * @return string
- */
- protected static function getTokenCode(string $password): string
- {
- return md5(md5($password));
- }
-
-
- /**
- * 创建token
- * @param string $password
- * @return string
- */
- public function createToken(string $password): string
- {
- $authConfig = $this->authConfig;
- $data = [
- 'key'=>static::getTokenCode($password),
- 'expire'=>time()+$authConfig['expire']
- ];
- $code = json_encode($data);
- return static::handleToken($code, "CE",$authConfig['secret_key']);
- }
-
- /**
- * 验证token是否可用
- * @param $token
- * @return bool
- */
- public function checkToken(string $token, string $password): bool
- {
- $authConfig = $this->authConfig;
- if (empty($password)){
- $password = $authConfig['password'];
- }
- $decode = static::handleToken($token, "DE",$authConfig['secret_key']);
- $deData = json_decode($decode,true);
-
- if (!empty($deData['key']) && $deData['key'] === static::getTokenCode($password) && !empty($deData['expire']) && $deData['expire']>time()){
- return true;
- }
-
- return false;
- }
-
-
-
- /**
- * 处理token
- * @param $string
- * @param string $operation
- * @param string $key
- * @param int $expiry
- * @return false|string
- */
- protected static function handleToken(string $string, string $operation = 'DE', string $key = '', int $expiry = 0):string
- {
- $ckey_length = 4;
- $key = md5($key);
- $keya = md5(substr($key, 0, 16));
- $keyb = md5(substr($key, 16, 16));
- $keyc = $ckey_length ? ($operation == 'DE' ? substr($string, 0, $ckey_length) : substr(md5(microtime()), -$ckey_length)) : '';
- $cryptkey = $keya . md5($keya . $keyc);
- $key_length = strlen($cryptkey);
- $string = $operation == 'DE' ? base64_decode(substr($string, $ckey_length)) : sprintf('%010d', $expiry ? $expiry + time() : 0) . substr(md5($string . $keyb), 0, 16) . $string;
- $string_length = strlen($string);
- $result = '';
- $box = range(0, 255);
- $rndkey = array();
- for ($i = 0; $i <= 255; $i++) {
- $rndkey[$i] = ord($cryptkey[$i % $key_length]);
- }
- for ($j = $i = 0; $i < 256; $i++) {
- $j = ($j + $box[$i] + $rndkey[$i]) % 256;
- $tmp = $box[$i];
- $box[$i] = $box[$j];
- $box[$j] = $tmp;
- }
- for ($a = $j = $i = 0; $i < $string_length; $i++) {
- $a = ($a + 1) % 256;
- $j = ($j + $box[$a]) % 256;
- $tmp = $box[$a];
- $box[$a] = $box[$j];
- $box[$j] = $tmp;
- $result .= chr(ord($string[$i]) ^ ($box[($box[$a] + $box[$j]) % 256]));
- }
- if ($operation == 'DE') {
- $subNumber = (int)substr($result, 0, 10);
- if (($subNumber == 0 || $subNumber - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26) . $keyb), 0, 16)) {
- return substr($result, 26);
- } else {
- return '';
- }
- } else {
- return $keyc . str_replace('=', '', base64_encode($result));
- }
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/ConfigProvider.php b/vendor/hg/apidoc/src/ConfigProvider.php
deleted file mode 100644
index f8f007c57..000000000
--- a/vendor/hg/apidoc/src/ConfigProvider.php
+++ /dev/null
@@ -1,24 +0,0 @@
- [],
- 'publish' => [
- [
- 'id' => 'config',
- 'description' => 'The config of apidoc.',
- 'source' => __DIR__ . '/config.php',
- 'destination' => BASE_PATH . '/config/autoload/apidoc.php',
- ],
- ],
- ];
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/Controller.php b/vendor/hg/apidoc/src/Controller.php
deleted file mode 100644
index 479f77339..000000000
--- a/vendor/hg/apidoc/src/Controller.php
+++ /dev/null
@@ -1,451 +0,0 @@
-config = ConfigProvider::get();
- if (isset($this->config['enable']) && $this->config['enable'] === false) {
- throw new ErrorException("apidoc close");
- }
- if (!empty($this->config['request_params'])) {
- $this->requestParams = $this->config['request_params'];
- } else {
- $this->requestParams = (new Request())->param();
- }
- if (!empty($this->requestParams['lang']) && !empty($this->config['lang_register_function'])) {
- $this->lang = $this->requestParams['lang'];
- $this->config['lang_register_function']($this->lang);
- }
- if ($checkAuth) {
- (new Auth($this->config))->checkAuth($this->requestParams);
- }
- }
-
- /**
- * 验证权限
- * @param $config
- * @param $params
- */
- protected function checkAuth()
- {
- $config = $this->config;
- $params = $this->requestParams;
- if (!empty($params['shareKey'])) {
- //分享
- $shareData = (new ApiShare())->checkShareAuth($config, $params);
- $appKey = !empty($params['appKey']) ? $params['appKey'] : "";
- if (!empty($shareData['appKeys']) && !in_array($appKey, $shareData['appKeys'])) {
- throw new ErrorException("share not exists");
- }
- return $shareData;
- } else {
- (new Auth($config))->checkAuth($params);
- }
- }
-
-
- /**
- * 获取配置
- * @return \think\response\Json
- */
- public function getConfig()
- {
- $this->init(false);
- $params = $this->requestParams;
- if (!empty($params['shareKey'])) {
- // 接口分享
- $shareData = (new ApiShare())->checkShareAuth($this->config, $params);
- if (!empty($shareData['appKeys'])) {
- $config = ConfigProvider::getFeConfig($shareData['appKeys']);
- } else {
- $config = ConfigProvider::getFeConfig();
- }
- } else {
- (new Auth($this->config))->checkAuth($params);
- $config = ConfigProvider::getFeConfig();
- }
- return Helper::showJson(0, "", $config);
- }
-
- /**
- * 验证密码
- */
- public function verifyAuth()
- {
- $this->init();
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['password'])) {
- throw new ErrorException("password not found");
- }
- $appKey = !empty($params['appKey']) ? $params['appKey'] : "";
- if (!empty($params['shareKey'])) {
- // 接口分享
- $shareData = (new ApiShare())->getShareDetailByKey($params['shareKey']);
- if (!empty($shareData['password']) && $params['password'] === md5($shareData['password'])) {
- $hasAuth = (new Auth($config))->createToken($params['password']);
- } else {
- throw new ErrorException("password error");
- }
- } else {
- if (!$appKey && !(!empty($config['auth']) && $config['auth']['enable'])) {
- throw new ErrorException("password error");
- }
- $hasAuth = (new Auth($config))->verifyAuth($params['password'], $appKey);
- }
- $res = [
- "token" => $hasAuth
- ];
- return Helper::showJson(0, "", $res);
- }
-
- /**
- * 获取api文档菜单
- */
- public function getApiMenus()
- {
- $this->init(false);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['appKey'])) {
- throw new ErrorException("appkey not found");
- }
- $appKey = $params['appKey'];
- $shareData = $this->checkAuth();
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApp = $currentAppConfig['appConfig'];
- $apiData = $this->getApiMenusByAppKey($appKey);
- $groups = !empty($currentApp['groups']) ? $currentApp['groups'] : [];
- if (!empty($params['shareKey']) && $shareData['type'] == 'api') {
- $apiData['data'] = Helper::filterTreeNodesByKeys($apiData['data'], $shareData['apiKeys'], 'menuKey');
- }
- $json = [
- 'data' => $apiData['data'],
- 'app' => $currentApp,
- 'groups' => $groups,
- 'tags' => $apiData['tags'],
- ];
- return Helper::showJson(0, "", $json);
- }
-
- protected function getApiMenusByAppKey($appKey)
- {
- $config = $this->config;
- if (!empty($config['cache']) && $config['cache']['enable']) {
- $cacheKey = Helper::getCacheKey('apiMenu', $appKey, $this->lang);
- $cacheData = (new Cache())->get($cacheKey);
- if ($cacheData && empty($params['reload'])) {
- $apiData = $cacheData;
- } else {
- // 生成数据并缓存
- $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey);
- (new Cache())->set($cacheKey, $apiData);
- }
- } else {
- // 生成数据
- $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey);
- }
- return $apiData;
- }
-
-
- /**
- * 获取所有api文档菜单
- */
- public function getAllApiMenus()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- $configApps = Helper::handleAppsConfig($config['apps'], false, $config);
- $data = ApiShare::getAppShareApis($config, $configApps, "", [], false);
- return Helper::showJson(0, "", $data);
- }
-
- /**
- * 获取接口明细
- * @return array
- */
- public function getApiDetail()
- {
- $this->init(false);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['path'])) {
- throw new ErrorException("path not found");
- }
- $appKey = !empty($params['appKey']) ? $params['appKey'] : "";
- $apiKey = urldecode($params['path']);
- $this->checkAuth();
- if (!empty($config['cache']) && $config['cache']['enable']) {
- $cacheKey = Helper::getCacheKey('apiDetail', $appKey, $this->lang, $params['path']);
- $cacheData = (new Cache())->get($cacheKey);
- if ($cacheData && empty($params['reload'])) {
- $res = $cacheData;
- } else {
- // 生成数据并缓存
- $res = (new ParseApiDetail($config))->renderApiDetail($appKey, $apiKey);
- (new Cache())->set($cacheKey, $res);
- }
- } else {
- // 生成数据
- $res = (new ParseApiDetail($config))->renderApiDetail($appKey, $apiKey);
- }
- $res['appKey'] = $appKey;
- return Helper::showJson(0, "", $res);
- }
-
-
- /**
- * 获取md菜单
- * @return array
- */
- public function getMdMenus()
- {
- $this->init(false);
- $config = $this->config;
- $params = $this->requestParams;
- $appKey = "";
- if (!empty($params['appKey'])) {
- // 获取指定应用
- $appKey = $params['appKey'];
- }
- $this->checkAuth();
- $docs = (new ParseMarkdown($config))->getDocsMenu($appKey, $this->lang);
- return Helper::showJson(0, "", $docs);
-
- }
-
- /**
- * 获取md文档内容
- * @return \think\response\Json
- */
- public function getMdDetail()
- {
- $this->init(false);
- $config = $this->config;
- $params = $this->requestParams;
- $this->checkAuth();
- try {
- if (empty($params['path'])) {
- throw new ErrorException("mdPath not found");
- }
- if (empty($params['appKey'])) {
- throw new ErrorException("appkey not found");
- }
-
- $path = urldecode($params['path']);
- $content = (new ParseMarkdown($config))->getContent($params['appKey'], $path, $this->lang);
- $res = [
- 'content' => $content,
- ];
- return Helper::showJson(0, "", $res);
-
- } catch (ErrorException $e) {
- return Helper::showJson($e->getCode(), $e->getMessage());
- }
- }
-
-
- /**
- * 创建代码生成器
- * @return array
- */
- public function createGenerator()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- $res = (new generator\Index($config))->create($params);
- return Helper::showJson(0, "", $res);
- }
-
- /**
- * 删除所有接口缓存
- * @return array
- */
- public function cancelAllCache()
- {
- $this->init(true);
- $config = $this->config;
- $path = APIDOC_STORAGE_PATH . $config['cache']['folder']. '/apis';
- $res = DirAndFile::deleteDir($path);
- return Helper::showJson(0, "", $path);
- }
-
- /**
- * 生成所有接口缓存
- * @return array
- */
- public function createAllCache()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- $apps = Helper::getAllApps($config['apps']);
- $cache = new Cache();
- DirAndFile::deleteDir(APIDOC_STORAGE_PATH . $config['cache']['folder'] . '/' . 'apis');
- if (!empty($apps) && count($apps)) {
- try {
- foreach ($apps as $app) {
- // 缓存菜单
- $appKey = $app['appKey'];
- $controllerData = (new ParseApiMenus($config))->renderApiMenus($appKey);
- if (!empty($controllerData['data']) && count($controllerData['data'])) {
- foreach ($controllerData['data'] as $controller) {
- if (!empty($controller['children']) && count($controller['children'])) {
- foreach ($controller['children'] as $item) {
- if (!empty($item['url']) && !empty($item['menuKey'])) {
- $apiDetail = (new ParseApiDetail($config))->renderApiDetail($appKey, urldecode($item['menuKey']));
- $apiDetailCacheKey = Helper::getCacheKey('apiDetail', $appKey, $this->lang, $item['menuKey']);
- $cache->set($apiDetailCacheKey, $apiDetail);
- }
- }
- }
- }
- }
- $cacheKey = Helper::getCacheKey('apiMenu', $appKey, $this->lang);
- $cache->set($cacheKey, $controllerData);
- }
- } catch (\ReflectionException $e) {
- DirAndFile::deleteDir(APIDOC_STORAGE_PATH . $config['cache']['folder'] . '/' . 'apis');
- throw new ErrorException($e->getMessage());
- }
- }
- return Helper::showJson(0, "", true);
- }
-
- /**
- * 生成代码模板内容
- * @return array
- */
- public function renderCodeTemplate()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- $code = (new ParseCodeTemplate($config))->renderCode($params);
- return Helper::showJson(0, "", [
- 'code' => $code
- ]);
-
- }
-
-
- /**
- * 添加接口分享
- * @return array
- */
- public function addApiShare()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['name'])) {
- throw new ErrorException('field not found', ['field' => 'name']);
- }
- if (empty($params['type'])) {
- throw new ErrorException('field not found', ['field' => 'type']);
- }
- if ($params['type'] == 'app' && empty($params['appKeys'])) {
- throw new ErrorException('field not found', ['field' => 'appKeys']);
- }
- if ($params['type'] == 'api' && empty($params['apiKeys'])) {
- throw new ErrorException('field not found', ['field' => 'apiKeys']);
- }
- $res = (new ApiShare())->addApiShare($params);
- return Helper::showJson(0, "", $res);
- }
-
- /**
- * 获取接口分享分页列表
- * @return array
- */
- public function getApiShareList()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- $pageIndex = !empty($params['pageIndex']) ? $params['pageIndex'] : 1;
- $pageSize = 5;
- $res = (new ApiShare())->getSharePageList($config, $pageIndex, $pageSize);
- return Helper::showJson(0, "", $res);
- }
-
- /**
- * 获取接口分享记录明细
- * @return array
- */
- public function getApiShareDetail()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['key'])) {
- throw new ErrorException('field not found', ['field' => 'key']);
- }
- $cacheData = (new ApiShare())->getShareDetailByKey($params['key']);
- return Helper::showJson(0, "", $cacheData);
- }
-
- /**
- * 删除接口分享记录
- * @return array
- */
- public function deleteApiShare()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['key'])) {
- throw new ErrorException('field not found', ['field' => 'key']);
- }
- $cacheKey = ApiShare::getShareCacheKey($params['key']);
- $res = (new Cache())->delete($cacheKey);
- return Helper::showJson(0, "", $res);
- }
-
- /**
- * 处理接口分享操作
- * @return array
- */
- public function handleApiShareAction()
- {
- $this->init(true);
- $config = $this->config;
- $params = $this->requestParams;
- if (empty($params['key'])) {
- throw new ErrorException('field not found', ['field' => 'key']);
- }
- if (!isset($params['index'])) {
- throw new ErrorException('field not found', ['field' => 'index']);
- }
- $res = (new ApiShare())->handleApiShareAction($config, $params['key'], $params['index']);
- return Helper::showJson(0, "", $res);
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/Install.php b/vendor/hg/apidoc/src/Install.php
deleted file mode 100644
index af693184c..000000000
--- a/vendor/hg/apidoc/src/Install.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 'config/plugin/hg/apidoc',
- );
-
- /**
- * Install
- * @return void
- */
- public static function install()
- {
- foreach (static::$configPath as $source => $dest) {
- if ($pos = strrpos($dest, '/')) {
- $parent_dir = base_path() . '/' . substr($dest, 0, $pos);
- if (!is_dir($parent_dir)) {
- mkdir($parent_dir, 0777, true);
- }
- }
- //symlink(__DIR__ . "/$source", base_path()."/$dest");
- copy_dir(__DIR__ . "/$source", base_path() . "/$dest");
- echo "Create $dest";
- }
- }
-
- /**
- * Uninstall
- * @return void
- */
- public static function uninstall()
- {
- foreach (static::$configPath as $source => $dest) {
- $path = base_path()."/$dest";
- if (!is_dir($path) && !is_file($path)) {
- continue;
- }
- echo "Remove $dest";
- if (is_file($path) || is_link($path)) {
- unlink($path);
- continue;
- }
- remove_dir($path);
- }
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/annotation/AddField.php b/vendor/hg/apidoc/src/annotation/AddField.php
deleted file mode 100644
index 2f4450de1..000000000
--- a/vendor/hg/apidoc/src/annotation/AddField.php
+++ /dev/null
@@ -1,84 +0,0 @@
- 'Apidoc',
- // （选配）文档描述，显示在首页
- 'desc' => '',
- // （必须）设置文档的应用/版本
- 'apps' => [
- [
- // （必须）标题
- 'title'=>'Api接口',
- // （必须）控制器目录地址
- 'path'=>'app\controller',
- // （必须）唯一的key
- 'key'=>'api',
- ]
- ],
-
- // （必须）指定通用注释定义的文件地址
- 'definitions' => "app\common\controller\Definitions",
- // （必须）自动生成url规则，当接口不添加@Apidoc\Url ("xxx")注解时，使用以下规则自动生成
- 'auto_url' => [
- // 字母规则，lcfirst=首字母小写；ucfirst=首字母大写；
- 'letter_rule' => "lcfirst",
- // url前缀
- 'prefix'=>"",
- ],
- // 是否自动注册路由
- 'auto_register_routes'=>false,
- // （必须）缓存配置
- 'cache' => [
- // 是否开启缓存
- 'enable' => false,
- ],
- // （必须）权限认证配置
- 'auth' => [
- // 是否启用密码验证
- 'enable' => false,
- // 全局访问密码
- 'password' => "123456",
- // 密码加密盐
- 'secret_key' => "apidoc#hg_code",
- // 授权访问后的有效期
- 'expire' => 24*60*60
- ],
- // 全局参数
- 'params'=>[
- // （选配）全局的请求Header
- 'header'=>[
- // name=字段名，type=字段类型，require=是否必须，default=默认值，desc=字段描述
- ['name'=>'Authorization','type'=>'string','require'=>true,'desc'=>'身份令牌Token'],
- ],
- // （选配）全局的请求Query
- 'query'=>[
- // 同上 header
- ],
- // （选配）全局的请求Body
- 'body'=>[
- // 同上 header
- ],
- ],
- // 全局响应体
- 'responses'=>[
- // 成功响应体
- 'success'=>[
- ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1],
- ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1],
- //参数同上 headers；main=true来指定接口Returned参数挂载节点
- ['name'=>'data','desc'=>'业务数据','main'=>true,'type'=>'object','require'=>1],
- ],
- // 异常响应体
- 'error'=>[
- ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1,'md'=>'/docs/HttpError.md'],
- ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1],
- ]
- ],
- // （选配）apidoc路由前缀,默认apidoc
- 'route_prefix'=>'/apidoc',
- //（选配）默认作者
- 'default_author'=>'',
- //（选配）默认请求类型
- 'default_method'=>'GET',
- //（选配）允许跨域访问
- 'allowCrossDomain'=>false,
- /**
- * （选配）解析时忽略带@注解的关键词，当注解中存在带@字符并且非Apidoc注解，如 @key test，此时Apidoc页面报类似以下错误时:
- * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation?
- */
- 'ignored_annitation'=>[],
-
- // （选配）数据库配置
- 'database'=>[],
- // （选配）Markdown文档
- 'docs' => [],
- // （选配）代码生成器配置 注意：是一个二维数组
- 'generator' =>[],
- // （选配）代码模板
- 'code_template'=>[],
- // （选配）接口分享功能
- 'share'=>[
- // 是否开启接口分享功能
- 'enable'=>false,
- // 自定义接口分享操作，二维数组，每个配置为一个按钮操作
- 'actions'=>[]
- ],
-];
diff --git a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php b/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php
deleted file mode 100644
index b9be3a7b0..000000000
--- a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php
+++ /dev/null
@@ -1,97 +0,0 @@
- true,
- 'apidoc' => [
- // （选配）文档标题，显示在左上角与首页
- 'title' => 'Apidoc',
- // （选配）文档描述，显示在首页
- 'desc' => '',
- // （必须）设置文档的应用/版本
- 'apps' => [
- [
- // （必须）标题
- 'title'=>'Api接口',
- // （必须）控制器目录地址
- 'path'=>'app\controller',
- // （必须）唯一的key
- 'key'=>'api',
- ]
- ],
- // （必须）指定通用注释定义的文件地址
- 'definitions' => "app\common\controller\Definitions",
- // （必须）自动生成url规则，当接口不添加@Apidoc\Url ("xxx")注解时，使用以下规则自动生成
- 'auto_url' => [
- // 字母规则，lcfirst=首字母小写；ucfirst=首字母大写；
- 'letter_rule' => "lcfirst",
- // url前缀
- 'prefix'=>"",
- ],
- // （选配）是否自动注册路由
- 'auto_register_routes'=>false,
- // （必须）缓存配置
- 'cache' => [
- // 是否开启缓存
- 'enable' => false,
- ],
- // （必须）权限认证配置
- 'auth' => [
- // 是否启用密码验证
- 'enable' => false,
- // 全局访问密码
- 'password' => "123456",
- // 密码加密盐
- 'secret_key' => "apidoc#hg_code",
- // 授权访问后的有效期
- 'expire' => 24*60*60
- ],
- // 全局参数
- 'params'=>[
- // （选配）全局的请求Header
- 'header'=>[
- // name=字段名，type=字段类型，require=是否必须，default=默认值，desc=字段描述
- ['name'=>'Authorization','type'=>'string','require'=>true,'desc'=>'身份令牌Token'],
- ],
- // （选配）全局的请求Query
- 'query'=>[
- // 同上 header
- ],
- // （选配）全局的请求Body
- 'body'=>[
- // 同上 header
- ],
- ],
- // 全局响应体
- 'responses'=>[
- // 成功响应体
- 'success'=>[
- ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1],
- ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1],
- //参数同上 headers；main=true来指定接口Returned参数挂载节点
- ['name'=>'data','desc'=>'业务数据','main'=>true,'type'=>'object','require'=>1],
- ],
- // 异常响应体
- 'error'=>[
- ['name'=>'code','desc'=>'业务代码','type'=>'int','require'=>1,'md'=>'/docs/HttpError.md'],
- ['name'=>'message','desc'=>'业务信息','type'=>'string','require'=>1],
- ]
- ],
- //（选配）默认作者
- 'default_author'=>'',
- //（选配）默认请求类型
- 'default_method'=>'GET',
- //（选配）Apidoc允许跨域访问
- 'allowCrossDomain'=>false,
- /**
- * （选配）解析时忽略带@注解的关键词，当注解中存在带@字符并且非Apidoc注解，如 @key test，此时Apidoc页面报类似以下错误时:
- * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation?
- */
- 'ignored_annitation'=>[],
-
- // （选配）数据库配置
- 'database'=>[],
- // （选配）Markdown文档
- 'docs' => [],
- // （选配）接口生成器配置 注意：是一个二维数组
- 'generator' =>[]
- ]
-];
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php b/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php
deleted file mode 100644
index 1b03a1f35..000000000
--- a/vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php
+++ /dev/null
@@ -1,3 +0,0 @@
- ['status'=>404,'code' => 4004, 'msg' => '文档已关闭'],
- 'password error' => ['status'=>402,'code' => 4002, 'msg' => '密码不正确，请重新输入'],
- 'password not found' => ['status'=>402,'code' => 4002, 'msg' => '密码不可为空'],
- 'token error' => ['status'=>401,'code' => 4001, 'msg' => '不合法的Token'],
- 'token not found' => ['status'=>401,'code' => 4001, 'msg' => '不存在Token'],
- 'appkey not found' => ['status'=>412,'code' => 4005, 'msg' => '缺少必要参数appKey'],
- 'mdPath not found' => ['status'=>412,'code' => 4006, 'msg' => '缺少必要参数path'],
- 'appKey error' => ['status'=>412,'code' => 4007, 'msg' => '不存在 key为${appKey}的apps配置'],
- 'template not found' => ['status'=>412,'code' => 4008, 'msg' => '${template}模板不存在'],
- 'path not found' => ['status'=>412,'code' => 4009, 'msg' => '${path}目录不存在'],
- 'classname error' => ['status'=>412,'code' => 4010, 'msg' => '${classname}文件名不合法'],
- 'apiKey not found' => ['status'=>412,'code' => 4011, 'msg' => '缺少必要参数apiKey'],
- 'no config apps' => ['status'=>412,'code' => 5000, 'msg' => 'apps配置不可为空'],
- 'unknown error' => ['status'=>501,'code' => 5000, 'msg' => '未知异常'],
- 'no debug' => ['status'=>412,'code' => 5001, 'msg' => '请在debug模式下，使用该功能'],
- 'no config crud' => ['status'=>412,'code' => 5002, 'msg' => 'crud未配置'],
- 'datatable crud error' => ['status'=>412,'code' => 5003, 'msg' => '数据表创建失败，请检查配置'],
- 'file already exists' => ['status'=>412,'code' => 5004, 'msg' => '${filepath}文件已存在'],
- 'file not exists' => ['status'=>412,'code' => 5005, 'msg' => '${filepath}文件不存在'],
- 'datatable already exists' => ['status'=>412,'code' => 5004, 'msg' => '数据表${table}已存在'],
- 'datatable not exists' => ['status'=>412,'code' => 5004, 'msg' => '数据表${table}不存在'],
- 'ref file not exists' => ['status'=>412,'code' => 5005, 'msg' => 'ref引入 ${path} 文件不存在'],
- 'ref method not exists' => ['status'=>412,'code' => 5005, 'msg' => 'ref引入${path} 中 ${method} 方法不存在'],
- 'datatable create error' => ['status'=>412,'code' => 5006, 'msg' => '数据表[${table}]创建失败,error:${message},sql:${sql}'],
- 'field not found' => ['status'=>412,'code' => 5006, 'msg' => '${field}字段不能为空'],
- 'share not exists' => ['status'=>404,'code' => 4004, 'msg' => '该分享不存在'],
- ];
-
- public function __construct(string $exceptionCode, array $data = [])
- {
- $config = ConfigProvider::get();
- $exception = $this->getException($exceptionCode);
- if ($exception){
- $msg = Helper::replaceTemplate($exception['msg'], $data);
- }else{
- $exception = $this->exceptions['unknown error'];
- $msg = $exceptionCode;
- }
- parent::__construct($exception['status'], $msg, null, [], $exception['code']);
-
- }
-
- public function getException($exceptionCode)
- {
- if (isset($this->exceptions[$exceptionCode])) {
- return $this->exceptions[$exceptionCode];
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/exception/HttpException.php b/vendor/hg/apidoc/src/exception/HttpException.php
deleted file mode 100644
index 9d29f371b..000000000
--- a/vendor/hg/apidoc/src/exception/HttpException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-statusCode = $statusCode;
- $this->headers = $headers;
-
- parent::__construct($message, $code, $previous);
- }
-
- public function getStatusCode()
- {
- return $this->statusCode;
- }
-
- public function getHeaders()
- {
- return $this->headers;
- }
-}
diff --git a/vendor/hg/apidoc/src/generator/Index.php b/vendor/hg/apidoc/src/generator/Index.php
deleted file mode 100644
index dbfc970eb..000000000
--- a/vendor/hg/apidoc/src/generator/Index.php
+++ /dev/null
@@ -1,358 +0,0 @@
- '',
- // 数据库编码，默认为utf8
- 'charset' => 'utf8',
- // 数据库引擎，默认为 InnoDB
- 'engine' => 'InnoDB',
- ];
-
- protected $systemDefaultValues = [
- 'CURRENT_TIMESTAMP'
- ];
-
- public function __construct($config)
- {
- $this->config = $config;
- if (!empty($config['database'])){
- if (!empty($config['database']['prefix'])){
- $this->databaseConfig['prefix'] = $config['database']['prefix'];
- }
- if (!empty($config['database']['charset'])){
- $this->databaseConfig['charset'] = $config['database']['charset'];
- }
- if (!empty($config['database']['engine'])){
- $this->databaseConfig['engine'] = $config['database']['engine'];
- }
- }
- }
-
- public function create($params){
- $appKey = $params['form']['appKey'];
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApps = $currentAppConfig['apps'];
- $currentApp = $currentAppConfig['appConfig'];
- $generatorItem = $this->config['generator'][$params['index']];
-
- $checkParams = $this->checkFilesAndHandleParams($generatorItem,$params,$currentApps);
- $tplParams = $checkParams['tplParams'];
- // 注册中间件并执行before
- if (!empty($generatorItem['middleware']) && count($generatorItem['middleware'])){
- foreach ($generatorItem['middleware'] as $middleware) {
- $instance = new $middleware;
- $this->middlewares[] = $instance;
- if (method_exists($instance, 'before')) {
- $middlewareRes = $instance->before($tplParams);
- if (!empty($middlewareRes)){
- $tplParams = $middlewareRes;
- }
- }
- }
- }
-
- $this->createModels($checkParams['createModels'],$tplParams);
- $this->createFiles($checkParams['createFiles'],$tplParams);
- //执行after
- if (count($this->middlewares)){
- foreach ($this->middlewares as $middleware) {
- if (method_exists($instance, 'after')) {
- $instance->after($tplParams);
- }
- }
- }
- return $tplParams;
- }
-
- /**
- * 验证文件及处理模板数据
- * @param $generatorItem
- * @param $params
- * @param $currentApps
- * @return array
- */
- protected function checkFilesAndHandleParams($generatorItem,$params,$currentApps){
- // 组成模板参数
- $tplParams=[
- 'form'=>$params['form'],
- 'tables'=>$params['tables'],
- 'app'=>$currentApps
- ];
- $createFiles = [];
- if (!empty($params['files']) && count($params['files'])>0) {
- $files = $params['files'];
- foreach ($files as $file) {
- $fileConfig = Helper::getArrayFind($generatorItem['files'], function ($item) use ($file) {
- if ($file['name'] === $item['name']) {
- return true;
- }
- return false;
- });
-
- $filePath = $file['path'];
- if (!empty($fileConfig['namespace'])) {
- $fileNamespace = Helper::replaceCurrentAppTemplate($fileConfig['namespace'], $currentApps);
- $fileNamespace = Helper::replaceTemplate($fileNamespace, $params['form'],"form.");
- } else {
- $fileNamespace = $filePath;
- }
- $fileNamespaceEndStr = substr($fileNamespace, -1);
- if ($fileNamespaceEndStr == '\\') {
- $fileNamespace = substr($fileNamespace, 0, strlen($fileNamespace) - 1);
- }
- $template = Helper::replaceCurrentAppTemplate($fileConfig['template'], $currentApps);
- $template = Helper::replaceTemplate($template, $params['form'],"form.");
- $tplParams[$file['name']] = [
- 'class_name' => $file['value'],
- 'path' => $filePath,
- 'namespace' => $fileNamespace,
- 'template' => $template
- ];
-
- // 验证模板是否存在
- $templatePath =DirAndFile::formatPath( APIDOC_ROOT_PATH . $template,"/");
- if (is_readable($templatePath) == false) {
- throw new ErrorException("template not found", [
- 'template' => $template
- ]);
- }
- // 验证是否已存在生成的文件
- $fileFullPath = DirAndFile::formatPath(APIDOC_ROOT_PATH . $filePath, "/");
- $type = "folder";
- if (strpos($fileFullPath, '.php') !== false) {
- // 路径为php文件，则验证文件是否存在
- if (is_readable($fileFullPath) == false) {
- throw new ErrorException("file not exists", [
- 'filepath' => $filePath
- ]);
- }
- $type = "file";
- } else {
- $fileName = !empty($file['value']) ? $file['value'] : "";
- $fileFullPath = $fileFullPath . "/" . $fileName . ".php";
- if (is_readable($fileFullPath)) {
- throw new ErrorException("file already exists",[
- 'filepath' => DirAndFile::formatPath($filePath) . $fileName . ".php"
- ]);
- }
- }
- $createFiles[] = [
- 'fileFullPath' => $fileFullPath,
- 'template' => $template,
- 'templatePath'=>$templatePath,
- 'type' => $type
- ];
- }
- }
-
- $createModels = $this->checkModels($generatorItem,$tplParams,$currentApps,$params);
- $tplParams['tables'] = $createModels['tables'];
- return [
- 'tplParams'=>$tplParams,
- 'createFiles'=>$createFiles,
- 'createModels' =>$createModels['createModels']
- ];
- }
-
- /**
- * 验证模型及表
- * @param $generatorItem
- * @param $tplParams
- * @return array
- */
- protected function checkModels($generatorItem,$tplParams,$currentApps,$params=[]){
- if (empty($this->config['database_query_function'])){
- throw new ErrorException("not datatable_query_function config");
- }
-
- $res="";
- $tabls = $tplParams['tables'];
- $newTables = [];
- $createModels = [];
- if (!empty($tabls) && count($tabls)){
- foreach ($tabls as $k=>$table) {
- $tableConfig = $generatorItem['table'];
- $fileFullPath="";
- if (!empty($table['model_name'])){
- $namespace = Helper::replaceCurrentAppTemplate($tableConfig['items'][$k]['namespace'], $currentApps);
- $namespace = Helper::replaceTemplate($namespace, $params['form'],"form.");
- $path = Helper::replaceCurrentAppTemplate($tableConfig['items'][$k]['path'], $currentApps);
- $path = Helper::replaceTemplate($path, $params['form'],"form.");
- $template = $tableConfig['items'][$k]['template'];
-
- // 验证模板是否存在
- $templatePath = DirAndFile::formatPath(APIDOC_ROOT_PATH . $template,"/");
- if (is_readable($templatePath) == false) {
- throw new ErrorException("template not found", [
- 'template' => $template
- ]);
- }
- $tplParams['tables'][$k]['class_name'] =$table['model_name'];
- // 验证模型是否已存在
- $fileName = $table['model_name'];
- $fileFullPath = DirAndFile::formatPath(APIDOC_ROOT_PATH.$path). "/" . $fileName . ".php";
- if (is_readable($fileFullPath)) {
- throw new ErrorException("file already exists", [
- 'filepath' => DirAndFile::formatPath($path) . "/" . $fileName . ".php"
- ]);
- }
- }
- // 验证表是否存在
- if ($table['table_name']){
- $table_name = $this->databaseConfig['prefix'].$table['table_name'];
- $isTable = $this->config['database_query_function']('SHOW TABLES LIKE '."'".$table_name."'");
- if ($isTable){
- throw new ErrorException("datatable already exists", [
- 'table' => $table_name
- ]);
- }
- }
- $table['namespace']=$namespace;
- $table['path']=$path;
- $table['model_path']=$path;
- $newTables[]=$table;
- $createModels[]=[
- 'namespace'=>$namespace,
- 'template'=>$template,
- 'path'=>$path,
- 'templatePath' =>$templatePath,
- 'table'=>$table,
- 'fileFullPath'=>$fileFullPath
- ];
- }
- }
- return ['createModels'=>$createModels,'tables'=>$newTables];
-
- }
-
- /**
- * 创建文件
- * @param $createFiles
- * @param $tplParams
- * @return mixed
- */
- protected function createFiles($createFiles,$tplParams){
-
- if (!empty($createFiles) && count($createFiles)>0){
- foreach ($createFiles as $fileItem) {
- $html = (new ParseTemplate())->compile($fileItem['templatePath'],$tplParams);
- if ($fileItem['type'] === "file"){
- // 路径为文件，则添加到该文件
- $pathFileContent = DirAndFile::getFileContent($fileItem['fileFullPath']);
- $content = $pathFileContent."\r\n".$html;
- DirAndFile::createFile($fileItem['fileFullPath'],$content);
- }else{
- DirAndFile::createFile($fileItem['fileFullPath'],$html);
- }
- }
- }
- return $tplParams;
- }
-
- /**
- * 创建模型文件
- * @param $createModels
- * @param $tplParams
- */
- protected function createModels($createModels,$tplParams){
- if (!empty($createModels) && count($createModels)>0){
- foreach ($createModels as $k=>$item) {
- $table = $item['table'];
- if (!empty($table['table_name'])){
- $res = $this->createTable($table);
- }
- if (!empty($table['model_name'])){
- $tplParams['tables'][$k]['class_name'] =$table['model_name'];
- $html = (new ParseTemplate())->compile($item['templatePath'],$tplParams);
- DirAndFile::createFile($item['fileFullPath'],$html);
- }
-
- }
- }
- }
-
- /**
- * 创建数据表
- * @return mixed
- */
- protected function createTable($table){
- $datas = $table['datas'];
- $comment= "";
- if (!empty($table['table_comment'])){
- $comment =$table['table_comment'];
- }
- $table_name = $this->databaseConfig['prefix'].$table['table_name'];
- $table_data = '';
- $main_keys = '';
- $defaultNullTypes = ['timestamp'];
- foreach ($datas as $k=>$item){
- if (!empty($item['not_table_field'])){
- continue;
- }
- $table_field="`".$item['field']."` ".$item['type'];
- if (!empty($item['length'])){
- $table_field.="(".$item['length'].")";
- }
-
- if (!empty($item['main_key'])){
- $main_keys.=$item['field'];
- $table_field.=" NOT NULL";
- }else if (!empty($item['not_null'])){
- $table_field.=" NOT NULL";
- }
- if (!empty($item['incremental']) && !empty($item['main_key'])){
- $table_field.=" AUTO_INCREMENT";
- }
- if (!empty($item['default']) || (isset($item['default']) && $item['default']=="0")){
- $defaultValue = "'".$item['default']."'";
- if (in_array($item['default'],$this->systemDefaultValues)){
- $defaultValue = $item['default'];
- }
- $table_field.=" DEFAULT ".$defaultValue."";
- }else if (!empty($item['main_key']) && !$item['not_null']){
- $table_field.=" DEFAULT NULL";
- }else if (in_array($item['type'],$defaultNullTypes) && empty($item['not_null'])){
- $table_field.=" NULL DEFAULT NULL";
- }
- $fh = $k < (count($datas)-1)?",":"";
- $table_field.=" COMMENT '".$item['desc']."'".$fh;
- $table_data.=$table_field;
- }
- $primaryKey = "";
- if (!empty($main_keys)){
- $table_data.=",";
- $primaryKey = "PRIMARY KEY (`$main_keys`)";
- }
-
- $charset = $this->databaseConfig['charset'];
- $engine = $this->databaseConfig['engine'];
- $sql = "CREATE TABLE IF NOT EXISTS `$table_name` (
- $table_data
- $primaryKey
- ) ENGINE=$engine DEFAULT CHARSET=$charset COMMENT='$comment' AUTO_INCREMENT=1 ;";
-
- try {
- $this->config['database_query_function']($sql);
- return true;
- } catch (\Exception $e) {
- throw new ErrorException("datatable create error", [
- 'table' => $table_name,
- 'message'=>$e->getMessage(),
- 'sql'=>$sql
- ]);
- }
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/generator/ParseTemplate.php b/vendor/hg/apidoc/src/generator/ParseTemplate.php
deleted file mode 100644
index 4839a3c34..000000000
--- a/vendor/hg/apidoc/src/generator/ParseTemplate.php
+++ /dev/null
@@ -1,341 +0,0 @@
-replaceForeach($tplContent,$params);
- $tplContent = $this->replaceParams($tplContent,$params);
- $tplContent = $this->replaceIf($tplContent,$params);
- $tplContent = preg_replace("/\s+\r\n/is", "\r\n", $tplContent);
- return $tplContent;
- }
-
- /**
- * 替换变量
- * @param $tplContent
- * @param $params
- * @return array|string|string[]|null
- */
- protected function replaceParams($tplContent,$params){
- $key = '{$%%}';
- $pattern = '#' . str_replace('%%', '(.+?)' , preg_quote($key, '#')) . '#';
- $tplContent = preg_replace_callback($pattern, function ($matches)use ($params){
- $k = $matches[1];
- if (strpos($k, '(') !== false){
- $tagArr = explode("(", $k);
- $fun = $tagArr[0];
- $k = str_replace(")", "",$tagArr[1] );
- $v = $this->getObjectValueByKeys($params,$k);
- if (empty($v)){
- return "";
- }
- if ($fun === "lower"){
- return Helper::lower($v);
- }else if ($fun === "snake"){
- return Helper::snake($v);
- }else if ($fun === "lcfirst"){
- return lcfirst($v);
- }else if ($fun === "ucfirst"){
- return ucfirst($v);
- }else if ($fun === "count"){
- return count($v);
- }
- }
- $value = $this->getObjectValueByKeys($params,$k);
- if (is_bool($value)){
- return $value==true?'true':'false';
- }else if (is_array($value)){
- return $k;
- }
- return $value;
- }, $tplContent);
- return $tplContent;
- }
-
- /**
- * 替换if内容
- * @param $tplContent
- * @param $params
- * @return array|mixed|string|string[]
- * @throws \Exception
- */
- protected function replaceIf($tplContent,$params){
- $res = [];
- $label = "if";
- $labelList = $this->parseLabel($tplContent,$label);
- if (!empty($labelList) && count($labelList)>0){
- foreach ($labelList as $item) {
- $itemStr =$item;
- $ifChildren= $this->parseLabel($itemStr,$label,"children");
-
- if (!empty($ifChildren) && count($ifChildren)>0){
- foreach ($ifChildren as $ifChild){
- $itemChildrenContent= $this->getIfContent($ifChild);
- $itemStr = str_replace($ifChild, $itemChildrenContent,$itemStr );
- }
- }
- $itemContent= $this->getIfContent($itemStr);
- $tplContent = str_replace($item, $itemContent,$tplContent );
- }
- }
-
- return $tplContent;
- }
- protected function parseForeach($str,$params){
- if (preg_match('#{foreach (.+?) as (.+?)=>(.+?)}#s', $str, $matches)){
- $complete = $matches[0];
- $condition = $matches[1];
- $keyField = str_replace("$", "",$matches[2] );
- $itemField = str_replace("$", "",$matches[3] );
- $conditionKey = str_replace("$", "",$condition );
- $forListData = $this->getObjectValueByKeys($params,$conditionKey);
- $contentStr = str_replace($complete, "",$str);
- $contentStr = substr($contentStr,0,-10);
- return [
- 'list'=>$forListData,
- 'keyField'=>$keyField,
- 'itemField'=>$itemField,
- 'content'=>$contentStr
- ];
- }
- return [];
- }
-
- /**
- * 获取所有foreach标签
- * @param $str
- * @return array
- * @throws \Exception
- */
- protected function getAllForeachLabel($str){
- $tree = [];
- $label = "foreach";
- $labelList = $this->parseLabel($str,$label);
- if (!empty($labelList) && count($labelList)>0){
- foreach ($labelList as $itemLabel) {
- $labelChildrenList = $this->parseLabel($itemLabel,$label,"children");
- if (!empty($labelChildrenList) && count($labelChildrenList)>0){
- $childrenList = [];
- foreach ($labelChildrenList as $item) {
- $childrenList[]=[
- 'str'=>$item,
- 'children' => []
- ];
- }
- $tree[]=[
- 'str'=>$itemLabel,
- 'children' => $childrenList
- ];
- }else{
- $tree[]=[
- 'str'=>$itemLabel,
- 'children' => []
- ];
- }
- }
- }
- return $tree;
- }
- // 解析foreach
- protected function replaceForeach($html,$params,$level=""){
- $allLabelData= $this->getAllForeachLabel($html);
- $res = [];
- if (count($allLabelData)>0){
- // 遍历每个foreach标签
- foreach ($allLabelData as $labelItem) {
- $itemStr = $labelItem['str'];
- $forOption = $this->parseForeach($labelItem['str'],$params);
- $itemContent="";
- if (!empty($forOption['list']) && count($forOption['list'])>0){
- // 处理每行数据
- foreach ($forOption['list'] as $rowKey=>$row) {
- $rowData = [$forOption['itemField']=>$row,$forOption['keyField']=>$rowKey];
- $rowParams = array_merge($params,$rowData);
- // 存在子标签，处理子标签
- if (!empty($labelItem['children']) && count($labelItem['children'])>0){
- $itemStrContent = "";
- foreach ($labelItem['children'] as $childLabel){
- $childContents = "";
- $childStr = $childLabel['str'];
- $childDataList = $this->parseForeach($childLabel['str'],$rowParams);
- // 处理子标签数据
- if (!empty($childDataList['list']) && count($childDataList['list'])>0){
- foreach ($childDataList['list'] as $childDataKey=>$childDataItem) {
- // 子标签每行数据
- $childDataItemData = [$childDataList['itemField']=>$childDataItem,$childDataList['keyField']=>$childDataKey,];
- $contentsStr= $this->getForContent($childDataList['content'],array_merge($rowParams,$childDataItemData));
- $contentsStr =ltrim($contentsStr,"\r\n");
- if (!empty(Helper::trimEmpty($contentsStr))){
- $childContents.= $contentsStr;
- }
- }
- }
- $itemStrContent.= str_replace($childLabel['str'], $childContents,$forOption['content']);
- }
- $rowContent=$this->replaceParams($itemStrContent,$rowParams);
- $itemContentStr=$this->replaceIf($rowContent,$rowParams);
- if (!empty(Helper::trimEmpty($itemContentStr))){
- $itemContent.= $itemContentStr;
- }
- }else{
- $rowContent=$this->getForContent($forOption['content'],$rowParams);
- if (empty(Helper::trimEmpty($rowContent))){
- $rowContent= "";
- }
- $itemContent.= $rowContent;
- }
- $itemContent =trim($itemContent,"\r\n");
- }
- }
- $html = str_replace($labelItem['str'], $itemContent,$html );
- }
- }
- return $html;
-
- }
-
- /**
- * 获取foreach内容
- * @param $str
- * @param $params
- * @return array|mixed|string|string[]
- * @throws \Exception
- */
- protected function getForContent($str,$params){
- $content = $str;
- if (!empty($params)){
- $content = $this->replaceParams($content,$params);
- $content = $this->replaceIf($content,$params);
- }
- return $content;
- }
-
-
- /**
- * 获取if条件的内容
- * @param $str
- * @return mixed|string
- */
- protected function getIfContent($str){
- if (preg_match('#{if (.+?)}(.*?){/if}#s', $str, $matches)){
- if (eval("return $matches[1];")){
- // 条件成立
- return $matches[2];
- }
- }
- return "";
- }
-
-
- /**
- * 解析指定标签
- * @param $str
- * @param $label
- * @param string $level
- * @return array
- * @throws \Exception
- */
- protected function parseLabel($str,$label,$level=""){
- // 后面的 flag 表示记录偏移量
- preg_match_all('!({/?'.$label.' ?}?)!', $str, $matches, PREG_OFFSET_CAPTURE);
- // 用数组来模拟栈
- $stack = [];
- $top = null;
- $result = [];
- foreach ($matches[0] as $k=>[$match, $offset]) {
- // 当取标签内容时，排除第一个和最后一个标签
- if ($level === 'children' && ($k==0 || $k>=count($matches[0])-1)){
- continue;
- }
- // 判断匹配到的如果是 开始标签
- if ($match === '{'.$label.' ') {
- $stack[] = $offset;
- // 记录开始的位置
- if ($top === null) {
- $top = $offset;
- }
- // 如果不是
- } else {
- // 从栈底部拿一个出来
- $pop = array_pop($stack);
- // 如果取出来的是 null 就说明存在多余的 标签
- if ($pop === null) {
- throw new \Exception('语法错误，存在多余的 {/'.$label.'} 标签');
- }
- // 如果取完后栈空了
- if (empty($stack)) {
- // offset 是匹配到的开始标签(前面)位置，加上内容的长度
- $newOffset = $offset + strlen($match)-$top;
- // 从顶部到当前的偏移就是这个标签里的内容
- $result[] = substr($str, $top, $newOffset);
- // 重置 top 开始下一轮
- $top = null;
- }
- }
- }
- // 如果运行完了，栈里面还有东西，那就说明缺少闭合标签。
- if (!empty($stack)) {
- throw new \Exception('语法错误，存在未闭合的 {/'.$label.'} 标签');
- }
- return $result;
- }
-
- /**
- * 根据keys获取对象中的值
- * @param $array
- * @param $keyStr
- * @param string $delimiter
- * @return mixed|null
- */
- public function getObjectValueByKeys($array, $keyStr, $delimiter = '.')
- {
- $keys = explode($delimiter, $keyStr);
- if (preg_match_all('#\[(.+?)]#s', $keyStr, $matches)){
- $value = $array;
- if (!empty($matches[1])){
- $matchesIndex=0;
- foreach ($keys as $keyItem) {
- if (strpos($keyItem, '[') !== false) {
- $tagArr = explode("[", $keyItem);
- if (!empty($value[$tagArr[0]]) && !empty($value[$tagArr[0]][$matches[1][$matchesIndex]])){
- $value =$value[$tagArr[0]][$matches[1][$matchesIndex]];
- }else{
- $value =null;
- break;
- }
- $matchesIndex=$matchesIndex+1;
- }else{
- $value =$value[$keyItem];
- }
- }
- }
- return $value;
- }else if (sizeof($keys) > 1) {
- $value = $array;
- foreach ($keys as $key){
- if (!empty($value[$key])){
- $value = $value[$key];
- }else{
- $value =null;
- break;
- }
- }
- return $value;
- } else {
- return $array[$keyStr] ?? null;
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php b/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php
deleted file mode 100644
index 95623726a..000000000
--- a/vendor/hg/apidoc/src/middleware/HyperfMiddleware.php
+++ /dev/null
@@ -1,81 +0,0 @@
-initConfig();
-
- if ($request->getMethod() == "GET"){
- $params = $request->getQueryParams();
- }else{
- $params = $request->getParsedBody();
- }
- $config = ConfigProvider::get();
- $config['request_params'] = $params;
- ConfigProvider::set($config);
- return $handler->handle($request);
- }
-
- static function getApidocConfig()
- {
- $config = config("apidoc");
- if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){
- $config['auto_url']['filter_keys'] = ['App','Controller'];
- }
- $config['app_frame'] = "hyperf";
- return $config;
- }
-
- static function registerRoute($route)
- {
- // TODO: Implement registerRoute() method.
- }
-
- static function databaseQuery($sql)
- {
- return Db::select($sql);
- }
-
- static function getRootPath()
- {
- return BASE_PATH."/";
- }
-
- static function getRuntimePath()
- {
- return BASE_PATH."/runtime/";
- }
-
- static function setLang($locale)
- {
- static::$langLocale = $locale;
- }
-
- static function getLang($lang): string
- {
- return trans($lang);
- }
-
- static function handleResponseJson($res)
- {
- return $res;
- }
-
- static function getTablePrefix(){
- return config('databases.default.prefix','');
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php b/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php
deleted file mode 100644
index b6ec3b958..000000000
--- a/vendor/hg/apidoc/src/middleware/LaravelMiddleware.php
+++ /dev/null
@@ -1,17 +0,0 @@
-all();
- $config = ConfigProvider::get();
- $config['request_params'] = $params;
- ConfigProvider::set($config);
- return $next($request);
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php b/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php
deleted file mode 100644
index 58e6c56c8..000000000
--- a/vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php
+++ /dev/null
@@ -1,17 +0,0 @@
-param();
- $config = ConfigProvider::get();
- $config['request_params'] = $params;
- ConfigProvider::set($config);
- return $next($request);
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php b/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php
deleted file mode 100644
index 9eefcb4ee..000000000
--- a/vendor/hg/apidoc/src/middleware/WebmanMiddleware.php
+++ /dev/null
@@ -1,88 +0,0 @@
-initConfig();
- $params = $request->all();
- $config = ConfigProvider::get();
- $config['request_params'] = $params;
- ConfigProvider::set($config);
-
- $response = $request->method() == 'OPTIONS' ? response('') : $handler($request);
- if (!empty($config['allowCrossDomain'])){
- // 给响应添加跨域相关的http头
- $response->withHeaders([
- 'Access-Control-Allow-Credentials' => 'true',
- 'Access-Control-Allow-Origin' => $request->header('origin', '*'),
- 'Access-Control-Allow-Methods' => $request->header('access-control-request-method', '*'),
- 'Access-Control-Allow-Headers' => $request->header('access-control-request-headers', '*'),
- ]);
- }
-
- return $response;
- }
-
- static function getApidocConfig()
- {
- $config = config('plugin.hg.apidoc.app.apidoc');
- if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){
- $config['auto_url']['filter_keys'] = ['app','controller'];
- }
- $config['app_frame'] = "webman";
- return $config;
- }
-
- static function registerRoute($route)
- {
- return "";
- }
-
- static function databaseQuery($sql)
- {
- return Db::select($sql);
- }
-
- static function getRootPath()
- {
- return BASE_PATH."/";
- }
-
- static function getRuntimePath()
- {
- return BASE_PATH."/runtime/";
- }
-
- static function setLang($locale)
- {
- locale($locale);
- }
-
- static function getLang($lang): string
- {
- return $lang;
- }
-
- static function handleResponseJson($res)
- {
- return json($res);
- }
-
- static function getTablePrefix(){
- $driver = config('database.default');
- $table_prefix=config('database.connections.'.$driver.'.prefix');
- return $table_prefix;
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseAnnotation.php b/vendor/hg/apidoc/src/parses/ParseAnnotation.php
deleted file mode 100644
index 0a6e8fadf..000000000
--- a/vendor/hg/apidoc/src/parses/ParseAnnotation.php
+++ /dev/null
@@ -1,218 +0,0 @@
-parser = new AnnotationReader();
- if (!empty($config['ignored_annitation'])){
- foreach ($config['ignored_annitation'] as $item) {
- AnnotationReader::addGlobalIgnoredName($item);
- }
- }
- }
- /**
- * 解析非@注解的文本注释
- * @param $refMethod
- * @param $isAll bool 是否获取全部，true则将带@开头的注释也包含
- * @return array|false
- */
- public static function parseTextAnnotation($refMethod,$isAll=false): array
- {
- $annotation = $refMethod->getDocComment();
- if (empty($annotation)) {
- return [];
- }
- if (preg_match('#^/\*\*(.*)\*/#s', $annotation, $comment) === false)
- return [];
- $comment = trim($comment [1]);
- if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false)
- return [];
- $data = [];
- foreach ($lines[1] as $line) {
- $line = trim($line);
- if (!empty ($line) && ($isAll===true || ($isAll===false && strpos($line, '@') !== 0))) {
- $data[] = $line;
- }
- }
- return $data;
- }
-
- /**
- * 根据路径获取类名
- * @param $path
- * @return string
- */
- protected function getClassName($path){
- $NameArr = explode("\\", $path);
- $name = lcfirst($NameArr[count($NameArr) - 1]);
- return $name;
- }
-
- /**
- * 获取并处理注解参数
- * @param $attrList
- * @return array
- */
- protected function getParameters($attrList){
- $attrs = [];
- foreach ($attrList as $item) {
- $value = "";
- if ($item instanceof ReflectionAttribute) {
- $name = $this->getClassName($item->getName());
- $params = $item->getArguments();
- if (!empty($params)){
- if (is_array($params) && !empty($params[0]) && is_string($params[0]) && count($params)===1){
- $value = $params[0];
- }else{
- if (!empty($params[0])){
- $paramObj = [];
- foreach ($params as $k=>$value) {
- $key = $k===0?'name':$k;
- $paramObj[$key]=$value;
- }
- }else{
- $paramObj = $params;
- }
- $value = $paramObj;
- }
- }
- }else{
- $name = $this->getClassName(get_class($item));
- $valueObj = Helper::objectToArray($item);
- if (array_key_exists('name',$valueObj) && count($valueObj)===1){
- $value = $valueObj['name']===null?true: $valueObj['name'];
- }else{
- $value = $valueObj;
- }
- }
- if (!empty($attrs[$name]) && is_array($attrs[$name]) && Helper::arrayKeyFirst($attrs[$name])===0){
- $attrs[$name][]=$value;
- }else if(!empty($attrs[$name])){
- $attrs[$name] = [$attrs[$name],$value];
- }else{
- $attrs[$name]=$value;
- }
- }
- return $attrs;
- }
-
- /**
- * 获取类的注解参数
- * @param ReflectionMethod $refMethod
- * @return array
- */
- public function getClassAnnotation($refClass){
- if (method_exists($refClass,'getAttributes')){
- $attributes = $refClass->getAttributes();
- }else{
- $attributes = [];
- }
- $readerAttributes = $this->parser->getClassAnnotations($refClass);
- return $this->getParameters(array_merge($attributes,$readerAttributes));
- }
-
- /**
- * 获取方法的注解参数
- * @param ReflectionMethod $refMethod
- * @return array
- */
- public function getMethodAnnotation(ReflectionMethod $refMethod){
- if (method_exists($refMethod,'getAttributes')){
- $attributes = $refMethod->getAttributes();
- }else{
- $attributes = [];
- }
- $readerAttributes = $this->parser->getMethodAnnotations($refMethod);
- return $this->getParameters(array_merge($attributes,$readerAttributes));
- }
-
- /**
- * 获取属性的注解参数
- * @param $property
- * @return array
- */
- public function getPropertyAnnotation($property){
- if (method_exists($property,'getAttributes')){
- $attributes = $property->getAttributes();
- }else{
- $attributes = [];
- }
- $readerAttributes = $this->parser->getPropertyAnnotations($property);
- return $this->getParameters(array_merge($attributes,$readerAttributes));
- }
-
- /**
- * 解析类的属性文本注释的var
- * @param $propertyTextAnnotations
- * @return array
- */
- protected static function parsesPropertyTextAnnotation($propertyTextAnnotations){
- $varLine = "";
- foreach ($propertyTextAnnotations as $item) {
- if (strpos($item, '@var') !== false){
- $varLine = $item;
- break;
- }
- }
- $type = "";
- $desc = "";
- if ($varLine){
- $varLineArr = preg_split('/\\s+/', $varLine);
- $type = !empty($varLineArr[1])?$varLineArr[1]:"";
- $desc = !empty($varLineArr[2])?$varLineArr[2]:"";
- }
- if (empty($desc) && strpos($propertyTextAnnotations[0], '@var') === false){
- $desc = $propertyTextAnnotations[0];
- }
- return [
- 'type'=>$type,
- 'desc'=>$desc,
- ];
- }
-
- /**
- * 获取类的属性参数
- * @param $classReflect
- * @return array
- */
- public function getClassPropertiesy($classReflect){
- $publicProperties = $classReflect->getProperties(\ReflectionProperty::IS_PUBLIC);
- $arr=[];
- foreach ($publicProperties as $property) {
- $propertyAnnotations = $this->getPropertyAnnotation($property);
- $item = [];
- if (!empty($propertyAnnotations['property'])){
- // 有apidoc注解
- $arr[] = $propertyAnnotations['property'];
- continue;
- }
- $propertyTextAnnotations = self::parseTextAnnotation($property,true);
- if (empty($propertyTextAnnotations)){
- // 无注释
- continue;
- }
- $textAnnotationsParams=static::parsesPropertyTextAnnotation($propertyTextAnnotations);
- $textAnnotationsParams['name'] =$property->getName();
- $arr[]=$textAnnotationsParams;
- }
- return $arr;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseApiDetail.php b/vendor/hg/apidoc/src/parses/ParseApiDetail.php
deleted file mode 100644
index bb602e3f7..000000000
--- a/vendor/hg/apidoc/src/parses/ParseApiDetail.php
+++ /dev/null
@@ -1,743 +0,0 @@
-config = $config;
- }
-
- /**
- * 生成api接口数据
- * @param string $appKey
- * @param string $apiKey
- * @return array
- */
- public function renderApiDetail(string $appKey,string $apiKey)
- {
-
- $this->appKey = $appKey;
- $pathArr = explode("@", $apiKey);
- $classPath = $pathArr[0];
- $methodName = $pathArr[1];
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $this->currentApp = $currentAppConfig['appConfig'];
-
- try {
- $refClass = new ReflectionClass($classPath);
- $refMethod= $refClass->getMethod($methodName);
- $methodItem = $this->parseApiMethod($refClass,$refMethod);
- return $methodItem;
- } catch (\ReflectionException $e) {
- throw new ErrorException($e->getMessage());
- }
- }
-
-
- public function parseApiMethod($refClass,$refMethod,$currentAppData = null){
- $config = $this->config;
- if (!empty($currentAppData)){
- $currentApp = $currentAppData;
- $this->currentApp = $currentAppData;
- $this->appKey = $currentAppData['appKey'];
- }else{
- $currentApp = $this->currentApp;
-
- }
- if (empty($refMethod->name)) {
- return [];
- }
- $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass);
- $classAnnotations = (new ParseAnnotation($config))->getClassAnnotation($refClass);
-
- $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod);
- // 标注不解析的方法
- if (in_array("NotParse", $textAnnotations)) {
- return [];
- }
- $methodAnnotations = $this->getMethodAnnotation($refMethod);
- $methodAnnotations = self::handleApiBaseInfo($methodAnnotations,$refClass->name,$refMethod->name,$textAnnotations,$config);
- // 是否开启debug
- if (
- in_array("NotDebug", $textAnnotations) ||
- (isset($config['notDebug']) && $config['notDebug']===true) ||
- (isset($currentApp['notDebug']) && $currentApp['notDebug']===true) ||
- isset($methodAnnotations['notDebug']) ||
- in_array("NotDebug", $classTextAnnotations) ||
- isset($classAnnotations['notDebug'])
- ) {
- $methodAnnotations['notDebug'] = true;
- }
-
- if(!empty($methodAnnotations['md'])){
- $methodAnnotations['md'] = $this->getFieldMarkdownContent($methodAnnotations['md']);
- }
- if(!empty($methodAnnotations['responseSuccessMd'])){
- $methodAnnotations['responseSuccessMd'] = $this->getFieldMarkdownContent($methodAnnotations['responseSuccessMd']);
- }
- if(!empty($methodAnnotations['responseErrorMd'])){
- $methodAnnotations['responseErrorMd'] = $this->getFieldMarkdownContent($methodAnnotations['responseErrorMd']);
- }
-
- // 合并全局请求参数-header
- if (
- (
- (!empty($config['params']) && !empty($config['params']['header'])) ||
- (!empty($currentApp['params']) && !empty($currentApp['params']['header']))
- ) &&
- !in_array("NotHeaders", $textAnnotations) &&
- !isset($methodAnnotations['notHeaders'])
- )
- {
- $headers = !empty($methodAnnotations['header'])?$methodAnnotations['header']:[];
- $methodAnnotations['header'] = $this->mergeGlobalOrAppParams($headers,'header');
- }
-
- // 合并全局请求参数-query
- if (
- (
- (!empty($config['params']) && !empty($config['params']['query'])) ||
- (!empty($this->currentApp['params']) && !empty($this->currentApp['params']['query']))
- ) &&
- !in_array("NotQuerys", $textAnnotations) &&
- !isset($methodAnnotations['notQuerys'])
- )
- {
- $querys = !empty($methodAnnotations['query'])?$methodAnnotations['query']:[];
- $methodAnnotations['query'] = $this->mergeGlobalOrAppParams($querys,'query');
- }
-
- // 合并全局请求参数-body
- if (
- (
- (!empty($config['params']) && !empty($config['params']['body'])) ||
- (!empty($this->currentApp['params']) && !empty($this->currentApp['params']['body']))
- ) &&
- !in_array("NotParams", $textAnnotations) &&
- !isset($methodAnnotations['notParams'])
- )
- {
- $params = !empty($methodAnnotations['param'])?$methodAnnotations['param']:[];
- $methodAnnotations['param'] = $this->mergeGlobalOrAppParams($params,'body');
- }
-
- //添加成功响应体
- $methodAnnotations['responseSuccess'] = $this->handleApiResponseSuccess($methodAnnotations,$textAnnotations);
- //添加异常响应体
- $methodAnnotations['responseError'] = $this->handleApiResponseError($methodAnnotations,$textAnnotations);
-
- // 合并全局事件after
- if (
- (
- (!empty($config['debug_events']) && !empty($config['debug_events']['after'])) ||
- (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events']['after']))
- ) &&
- !in_array("NotEvent", $textAnnotations))
- {
- $debugAfterEvents = !empty($methodAnnotations['after'])?$methodAnnotations['after']:[];
- $methodAnnotations['after'] = $this->mergeGlobalOrAppEvents($debugAfterEvents,'after');
- }
-
- // 合并全局事件before
- if (
- (
- (!empty($config['debug_events']) && !empty($config['debug_events']['before'])) ||
- (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events']['before']))
- ) &&
- !in_array("NotEvent", $textAnnotations))
- {
- $debugBeforeEvents = !empty($methodAnnotations['before'])?$methodAnnotations['before']:[];
- $methodAnnotations['before'] = $this->mergeGlobalOrAppEvents($debugBeforeEvents,'before');
- }
-
- return $methodAnnotations;
- }
-
- /**
- * 获取md注解内容
- * @param $mdAnnotations
- * @return mixed|string
- */
- protected function getFieldMarkdownContent($mdAnnotations){
- if(!empty($mdAnnotations['name'])){
- return $mdAnnotations['name'];
- }else if(!empty($mdAnnotations['ref'])){
- return ParseMarkdown::getContent($this->appKey,$mdAnnotations['ref']);
- }
- return $mdAnnotations;
- }
-
- /**
- * 获取方法的注解，并处理参数
- * @param $refMethod
- * @param string $refField ref时指定处理的参数
- * @return array
- */
- protected function getMethodAnnotation($refMethod,$refField=""){
- $annotations = (new ParseAnnotation($this->config))->getMethodAnnotation($refMethod);
- // 需要处理的注解字段
- if (!empty($refField)){
- $handleFields = [$refField];
- }else{
- $handleFields = ["header","query","param","routeParam","returned","before","after","responseSuccess","responseError"];
- }
- foreach ($handleFields as $field) {
- if (!empty($annotations[$field])){
- $annotations[$field]=$this->handleMethodParams($annotations[$field],$field);
- }
- }
- return $annotations;
- }
-
-
- protected function mergeGlobalOrAppParams($params,$paramType='param'){
- $config = $this->config;
- $currentApp = $this->currentApp;
- $globalParams = [];
- if (!empty($currentApp['params']) && !empty($currentApp['params'][$paramType])){
- // 不合并global的处理方式
- $globalParams = $currentApp['params'][$paramType];
- // 合并global的处理方式
- // $globalHeaders = Helper::arrayMergeAndUnique("name", $globalHeaders, $this->currentApp['params'][$paramType]);
- }else if(!empty($config['params']) && !empty($config['params'][$paramType])){
- $globalParams = $config['params'][$paramType];
- }
-
- if (!empty($params) && count($params) && count($globalParams)) {
- return Helper::arrayMergeAndUnique("name", $globalParams, $params);
- }
- return $globalParams;
- }
-
- protected function mergeGlobalOrAppEvents($events,$eventType='after'){
- $config = $this->config;
- $globalEvents = [];
- if (!empty($this->currentApp['debug_events']) && !empty($this->currentApp['debug_events'][$eventType])){
- $globalEvents = $this->currentApp['debug_events'][$eventType];
- }else if(!empty($config['debug_events']) && !empty($config['debug_events'][$eventType])){
- $globalEvents = $config['debug_events'][$eventType];
- }
- $mergeEvents = [];
- foreach ($globalEvents as $item){
- if (!empty($item['desc'])){
- $item['desc'] = Lang::getLang($item['desc']);
- }
- $mergeEvents[] = $item;
- }
- if (!empty($events) && count($events)){
- foreach ($events as $event) {
- $mergeEvents[] = $event;
- }
- }
- return $mergeEvents;
- }
-
- /**
- * 处理接口成功响应参数
- * @param $methodAnnotations
- * @param $textAnnotations
- * @return array|mixed
- */
- protected function handleApiResponseSuccess($methodAnnotations,$textAnnotations){
- $returned = !empty($methodAnnotations['returned'])?$methodAnnotations['returned']:"";
- $currentApp = $this->currentApp;
- $config = $this->config;
- $mergeParams = [];
- $paramType='success';
- if (
- in_array("NotResponses", $textAnnotations) ||
- in_array("NotResponseSuccess", $textAnnotations) ||
- isset($methodAnnotations['notResponses']) ||
- isset($methodAnnotations['notResponseSuccess'])
- ) {
- // 注解了不使用全局响应
- $mergeParams = [];
- }else if (!empty($currentApp['responses']) && !empty($currentApp['responses'][$paramType])){
- $mergeParams = $currentApp['params'][$paramType];
- }else if(!empty($config['responses']) && !empty($config['responses'][$paramType])){
- $mergeParams = $config['responses'][$paramType];
- }
-
- if (!empty($methodAnnotations['responseSuccess'])){
- if (!is_int(Helper::arrayKeyFirst($methodAnnotations['responseSuccess']))){
- $methodResponseSuccess = [$methodAnnotations['responseSuccess']];
- }else{
- $methodResponseSuccess = $methodAnnotations['responseSuccess'];
- }
- $mergeParams = Helper::arrayMergeAndUnique("name", $mergeParams,$methodResponseSuccess);
- }
-
- return $this->mergeResponseSuccessParam($mergeParams,$returned);
-
- }
-
- protected function mergeResponseSuccessParam($mergeParams,$returned){
- if (!empty($mergeParams) && count($mergeParams)){
- $resData = [];
- foreach ($mergeParams as $item) {
- if (!empty($item['main']) && $item['main'] === true){
- $item['children'] = $returned;
- }
- //支持到二级的挂载
- if (isset($item['children']) && !empty($item['children'])) {
- $item['children'] = $this->mergeResponseSuccessParam($item['children'],$returned);
- }
- if (!empty($item['desc'])){
- $item['desc'] = Lang::getLang($item['desc']);
- }
- if (!empty($item['md'])){
- $item['md'] = ParseMarkdown::getContent($this->appKey,$item['md']);
- }
- $resData[]=$item;
- }
- return $resData;
- }
- return $returned;
- }
-
- /**
- * 处理接口异常响应参数
- * @param $methodAnnotations
- * @param $textAnnotations
- * @return array|mixed|void
- */
- protected function handleApiResponseError($methodAnnotations,$textAnnotations){
- $config = $this->config;
- $currentApp = $this->currentApp;
- $responseErrors = [];
- $paramType = "error";
- $mergeParams = [];
- if (
- in_array("NotResponses", $textAnnotations) ||
- in_array("NotResponseError", $textAnnotations) ||
- isset($methodAnnotations['notResponses']) ||
- isset($methodAnnotations['notResponseError'])
- ) {
- // 注解了不使用全局响应
- $mergeParams = [];
- }else if (!empty($currentApp['responses']) && !empty($currentApp['responses'][$paramType])){
- $mergeParams = $currentApp['params'][$paramType];
- }else if(!empty($config['responses']) && !empty($config['responses'][$paramType])){
- $mergeParams = $config['responses'][$paramType];
- }
-
- if (!empty($methodAnnotations['responseError'])){
- if (!is_int(Helper::arrayKeyFirst($methodAnnotations['responseError']))){
- $methodResponseError = [$methodAnnotations['responseError']];
- }else{
- $methodResponseError = $methodAnnotations['responseError'];
- }
- $mergeParams = Helper::arrayMergeAndUnique("name", $mergeParams,$methodResponseError);
- }
-
- if (!empty($mergeParams) && count($mergeParams)){
- $resData = [];
- foreach ($mergeParams as $item) {
- $item['desc'] = Lang::getLang($item['desc']);
- if (!empty($item['md'])){
- $item['md'] = ParseMarkdown::getContent($this->appKey,$item['md']);
- }
- $resData[]=$item;
- }
- return $resData;
- }
- return [];
- }
-
-
-
- public static function handleApiBaseInfo($methodInfo,$className,$methodName,$textAnnotations,$config){
- // 无标题，且有文本注释
- if (empty($methodInfo['title']) && !empty($textAnnotations) && count($textAnnotations) > 0) {
- $methodInfo['title'] = Lang::getLang($textAnnotations[0]);
- }else if (!empty($methodInfo['title'])){
- $methodInfo['title'] = Lang::getLang($methodInfo['title']);
- }
-
- // 默认method
- if (!empty($methodInfo['method'])) {
- $apiMethods = Helper::handleApiMethod($methodInfo['method']);
- $methodInfo['method'] = count($apiMethods)==1?$apiMethods[0]:$apiMethods;
- }else{
- $methodInfo['method'] = !empty($config['default_method']) ? strtoupper($config['default_method']) : '*';
- }
-
- // 默认default_author
- if (
- empty($methodInfo['author']) &&
- !empty($config['default_author']) &&
- !in_array("NotDefaultAuthor", $textAnnotations) &&
- !isset($methodInfo['notDefaultAuthor'])
- ) {
- $methodInfo['author'] = $config['default_author'];
- }
-
- if (!empty($methodInfo['tag'])){
- $methodInfo['tag'] = static::handleTags($methodInfo['tag']);
- }
- // 无url,自动生成
- if (empty($methodInfo['url'])) {
- $methodInfo['url'] = static::autoCreateUrl($className,$methodName,$config);
- } else if (!empty($methodInfo['url']) && is_string($methodInfo['url']) && substr($methodInfo['url'], 0, 1) != "/") {
- $methodInfo['url'] = "/" . $methodInfo['url'];
- }
- $methodInfo['name'] = $methodName;
- $methodInfo['menuKey'] = Helper::createApiKey($className,$methodName);
- return $methodInfo;
- }
-
- /**
- * 处理方法的注解参数
- * @param $params array 注解参数
- * @param $field string 指定处理的参数字段名
- * @return array
- */
- protected function handleMethodParams($params,$field){
- // 不处理合并的注解字段
- $notMergeNameFields=['before','after'];
- $data=[];
- if (!empty($params)){
- // 处理单个注解为对象的参数
- if (!is_int(Helper::arrayKeyFirst($params))){
- $params = [$params];
- }
- foreach ($params as $param) {
- $item=$this->handleAnnotationsParamItem($param,$field);
- if (!empty($item) && is_int(Helper::arrayKeyFirst($item))){
- if (in_array($field,$notMergeNameFields)){
- $data = $item;
- }else{
- $data = Helper::arrayMergeAndUnique("name",$data,$item);
- }
- }else if ($item!==false){
- $data[]=$item;
- }
- }
- }
- return $data;
- }
-
-
- /**
- * 处理注解某一参数
- * @param $param array 参数
- * @param $field string 处理的字段名
- * @return array|array[]|mixed
- */
- protected function handleAnnotationsParamItem($param,$field){
- // 事件字段，不处理ref的数据过滤
- $eventFields=['before','after'];
- $data = [];
- if (!empty($param['ref'])){
- $refParams = $this->renderRef($param['ref'],$field);
- if (!empty($refParams[$field])){
- if (in_array($field,$eventFields)){
- $data=$refParams[$field];
- }else{
- $data = $this->handleRefData($param,$refParams[$field],$field);
- }
- }else{
- return false;
- }
- }else if(!empty($param['table'])){
- $tableParams = (new ParseModel($this->config))->getTableDocument($param['table'],[]);
- $data = $this->handleRefData($param,$tableParams,$field);
- } else{
- $data = $param;
- }
- if (!empty($data['desc'])){
- $data['desc'] = Lang::getLang($data['desc']);
- }
- if (!empty($data['md'])){
- $data['md'] = ParseMarkdown::getContent($this->appKey,$data['md']);
- }
- if (!empty($data['children']) && is_array($data['children'])){
- $childrenData = [];
- foreach ($data['children'] as $child) {
- $paramItem=$this->handleAnnotationsParamItem($child,$field);
-
- if ($paramItem!==false){
- if (!empty($paramItem) && is_array($paramItem) && Helper::arrayKeyFirst($paramItem)===0){
- $childrenData = Helper::arrayMergeAndUnique("name",$childrenData,$paramItem);
- }else{
- $childrenData[] = $paramItem;
- }
- }
- }
- $data['children'] = $childrenData;
- }
- if (!empty($data['type']) && $data['type'] === 'tree' ) {
- // 类型为tree的
- $data['children'][] = [
- 'children' => $data['children'],
- 'name' =>!empty($data['childrenField']) ?$data['childrenField']:'children',
- 'type' => 'array',
- 'desc' => !empty($data['childrenDesc'])?Lang::getLang($data['childrenDesc']):"",
- ];
- }
-
- // 自定义解析
- if (!empty($this->config['parsesAnnotation'])){
- $callback = $this->config['parsesAnnotation']($data);
- if (!empty($callback)){
- $data = $callback;
- }
- }
- return $data;
- }
-
- public static function handleTags($tagStr){
- if (!empty($tagStr)) {
- $tagStr = Lang::getLang($tagStr);
- $tagList = [];
- if (is_string($tagStr) && strpos($tagStr, ',') !== false) {
- $tagArr = explode(",", $tagStr);
- foreach ($tagArr as $tag) {
- $tagList[]=Lang::getLang($tag);
- }
- } else {
- $tagList = [Lang::getLang($tagStr)];
- }
- return $tagList;
- }
- return $tagStr;
- }
-
- /**
- * 自动生成url
- * @param $method
- * @return string
- */
- public static function autoCreateUrl($className,$methodName,$config): string
- {
-
- $pathArr = explode("\\", $className);
- $filterPathNames = !empty($config['auto_url']) && !empty($config['auto_url']['filter_keys'])?$config['auto_url']['filter_keys']:[];
- $classUrlArr = [];
- foreach ($pathArr as $item) {
- if (!in_array($item, $filterPathNames)) {
- if (!empty($config['auto_url'])){
- $key = $item;
- if (!empty($config['auto_url']['letter_rule'])){
- switch ($config['auto_url']['letter_rule']) {
- case 'lcfirst':
- $key = lcfirst($item);
- break;
- case 'ucfirst':
- $key = ucfirst($item);
- break;
- default:
- $key = $item;
- }
- }
- if (!empty($config['auto_url']['handle_key'])){
- $classUrlArr[] = $config['auto_url']['handle_key']($key);
- }else{
- $classUrlArr[] = $key;
- }
- }else{
- $classUrlArr[] = $item;
- }
- }
- }
- $classUrl = implode('/', $classUrlArr);
- $prefix = !empty($config['auto_url']) && !empty($config['auto_url']['prefix'])?$config['auto_url']['prefix']:"";
- $url = $prefix . '/' . $classUrl . '/' . $methodName;
- if (!empty($config['auto_url']) && !empty($config['auto_url']['custom']) && is_callable($config['auto_url']['custom'])){
- return $config['auto_url']['custom']($className,$methodName,$url);
- }
- return $url;
- }
-
- /**
- * ref引用
- */
- public function renderRef($refPath,$field): array
- {
- $res = ['type' => 'model'];
- $config = $this->config;
- $methodName ="";
- if (is_string($refPath)){
- if (strpos($refPath, '\\') === false) {
- // 引入通用注解
- $classPath = $config['definitions'];
- $methodName = $refPath;
- }else if (class_exists($refPath)) {
- // use类
- $classPath = $refPath;
- }else if (strpos($refPath, '@') !== false){
- // 带@指定方法
- $pathArr = explode("@", $refPath);
- $classPath = $pathArr[0];
- $methodName = $pathArr[1];
- }else{
- // 直接指定方法
- $pathArr = explode("\\", $refPath);
- $methodName = $pathArr[count($pathArr) - 1];
- unset($pathArr[count($pathArr) - 1]);
- $classPath = implode("\\", $pathArr);
- }
- }else if(is_array($refPath)){
- $classPath = $refPath[0];
- $methodName = !empty($refPath[1])?$refPath[1]:"";
- }else{
- // 未知ref
- }
- try {
- $modelClass = ParseModel::getModelClass($classPath);
- $classReflect = new \ReflectionClass($classPath);
- if (!empty($modelClass)){
- // 模型解析
- $modelParams = (new ParseModel($config))->parseModelTable($modelClass,$classReflect,$methodName);
- return [$field=>$modelParams];
- }else{
- // 类ref引用
- if (!empty($methodName)){
- // 指定引入类的方法注解
- $methodName = trim($methodName);
- $refMethod = $classReflect->getMethod($methodName);
- $res = $this->getMethodAnnotation($refMethod,$field);
- return $res;
- }else{
- // 类的参数property
- $private_properties = (new ParseAnnotation($config))->getClassPropertiesy($classReflect);
- return [$field=>$private_properties];
- }
- }
-
- } catch (\ReflectionException $e) {
- throw new ErrorException($e->getMessage());
- }
- }
-
-
-
- public function handleRefData($annotation,$refParams, string $field): array
- {
- // 过滤field
- if (!empty($annotation['field'])) {
- $refParams = static::filterParamsField($refParams, $annotation['field'], 'field');
- }
- // 过滤withoutField
- if (!empty($annotation['withoutField'])) {
- $refParams = static::filterParamsField($refParams, $annotation['withoutField'], 'withoutField');
- }
-
- if (!empty($annotation['name'])) {
- if (!empty($annotation['children'])) {
- $annotation['children'] = Helper::arrayMergeAndUnique("name",$refParams,$annotation['children']);
- }else{
- $annotation['children'] = $refParams;
- }
- return $annotation;
- }
-// else{
-// if (!empty($annotation[$field])) {
-// $annotation[$field] = Helper::arrayMergeAndUnique("name",$refParams,$annotation[$field]);
-// }
-// }
- return $refParams;
- }
-
-
-
-
-
- public function handleEventAnnotation($annotation,$type){
- $config = $this->config;
- if (!empty($annotation->ref)){
- if (strpos($annotation->ref, '\\') === false && !empty($config['definitions']) ) {
- $refPath = $config['definitions'] . '\\' . $annotation->ref;
- $data = $this->renderService($refPath);
- if (!empty($data[$type])){
- return $data[$type];
- }
- return [];
- }
- }
- if (!empty($annotation->value) && is_array($annotation->value)){
- $beforeInfo = Helper::objectToArray($annotation);
- $valueList = [];
- foreach ($annotation->value as $valueItem){
- $valueItemInfo = Helper::objectToArray($valueItem);
- if ($valueItem instanceof Before){
- $valueItemInfo['type'] = "before";
- }else if ($valueItem instanceof After){
- $valueItemInfo['type'] = "after";
- }
- $valueList[] = $valueItemInfo;
- }
- $beforeInfo['value'] = $valueList;
- return [$beforeInfo];
- }
- else if (!empty($annotation->value) && is_object($annotation->value)){
- $valueItemInfo = Helper::objectToArray($annotation->value);
- if ($annotation->value instanceof Before){
- $valueItemInfo['type'] = "before";
- }else if ($annotation->value instanceof After){
- $valueItemInfo['type'] = "after";
- }
- $annotation->value = [$valueItemInfo];
- return [$annotation];
- }else{
- return [$annotation];
- }
- }
-
-
-
- /**
- * 过滤指定字段、或只取指定字段
- * @param $data 参数
- * @param $fields 指定字段
- * @param string $type 处理类型
- * @return array
- */
- public static function filterParamsField(array $data, $fields, string $type = "field"): array
- {
- if (!empty($fields) && is_string($fields)){
- if (strpos($fields, ',') !== false){
- $fieldArr = explode(',', $fields);
- }else{
- $fieldArr = [$fields];
- }
- }else if (!empty($fields) && is_array($fields)){
- if (Helper::arrayKeyFirst($fields)=="name"){
- $fieldArr = $fields['name'];
- }else{
- $fieldArr = $fields;
- }
- }else{
- return $data;
- }
- $dataList = [];
- foreach ($data as $item) {
- $has = !empty($item['name']) && in_array($item['name'], $fieldArr);
- if ($has && $type === 'field') {
- $dataList[] = $item;
- } else if (!($has) && $type == "withoutField") {
- $dataList[] = $item;
- }
- }
- return $dataList;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseApiMenus.php b/vendor/hg/apidoc/src/parses/ParseApiMenus.php
deleted file mode 100644
index 6be17ab11..000000000
--- a/vendor/hg/apidoc/src/parses/ParseApiMenus.php
+++ /dev/null
@@ -1,318 +0,0 @@
-config = $config;
- }
-
- /**
- * 生成api接口数据
- * @param string $appKey
- * @param bool $isParseDetail 是否解析接口明细
- * @return array
- */
- public function renderApiMenus(string $appKey,bool $isParseDetail=false): array
- {
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApp = $currentAppConfig['appConfig'];
- $this->currentApp = $currentApp;
-
- $controllers = [];
- if (!empty($currentApp['controllers']) && count($currentApp['controllers']) > 0) {
- // 配置的控制器列表
- $controllers = $this->getConfigControllers($currentApp['path'],$currentApp['controllers']);
- }else if(!empty($currentApp['path']) && is_array($currentApp['path']) && count($currentApp['path'])){
- // 读取paths的
- foreach ($currentApp['path'] as $path) {
- $controllersList = $this->getDirControllers($path);
- $controllers = array_merge($controllers,$controllersList);
- }
- } else if(!empty($currentApp['path']) && is_string($currentApp['path'])){
- // 默认读取path下所有的
- $controllers = $this->getDirControllers($currentApp['path']);
- }
- $apiData = [];
- if (!empty($controllers) && count($controllers) > 0) {
- foreach ($controllers as $class) {
- $classData = $this->parseController($class,$isParseDetail);
- if ($classData !== false) {
- $apiData[] = $classData;
- }
- }
- }
- // 排序
- $apiList = Helper::arraySortByKey($apiData);
-
- // 接口分组
- if (!empty($currentApp['groups'])){
- $apiList = ParseApiMenus::mergeApiGroup($apiList,$currentApp['groups']);
- }
-
- $json = array(
- "data" => $apiList,
- "tags" => $this->tags,
- "groups" => $this->groups,
- );
- return $json;
- }
-
- /**
- * 获取生成文档的控制器列表
- * @param string $path
- * @return array
- */
- public function getConfigControllers(string $path,$appControllers): array
- {
- $controllers = [];
- if (!empty($appControllers) && count($appControllers) > 0) {
- foreach ($appControllers as $item) {
- $classPath = $path."\\".$item;
- if ( class_exists($classPath)) {
- $controllers[] = $classPath;
- }
- }
- }
- return $controllers;
- }
-
- /**
- * 获取目录下的控制器列表
- * @param string $path
- * @return array
- */
- public function getDirControllers(string $path): array
- {
-
- if ($path) {
- if (strpos(APIDOC_ROOT_PATH, '/') !== false) {
- $pathStr = str_replace("\\", "/", $path);
- } else {
- $pathStr = $path;
- }
- $dir = APIDOC_ROOT_PATH . $pathStr;
- } else {
- $dir = APIDOC_ROOT_PATH . $this->controller_layer;
- }
- $controllers = [];
- if (is_dir($dir)) {
- $controllers = $this->scanDir($dir, $path);
- }
- return $controllers;
- }
-
-
-
- protected function scanDir($dir) {
-
- $classList= DirAndFile::getClassList($dir);
- $list=[];
-
- $configFilterController = !empty($this->config['filter_controllers']) ? $this->config['filter_controllers'] : [];
- $currentAppFilterController = !empty($this->currentApp['filter_controllers']) ? $this->currentApp['filter_controllers'] : [];
- $filterControllers = array_merge($configFilterController,$currentAppFilterController);
-
- $configFilterDir = !empty($this->config['filter_dirs']) ? $this->config['filter_dirs'] : [];
- $currentAppFilterDir = !empty($this->currentApp['filter_dirs']) ? $this->currentApp['filter_dirs'] : [];
- $filterDirList = array_merge($configFilterDir,$currentAppFilterDir);
- $filterDirs=[];
- foreach ($filterDirList as $dirItem) {
- $dirItemPath = DirAndFile::formatPath($dirItem,"/");
- $filterDirs[]=$dirItemPath;
- }
-
- foreach ($classList as $item) {
- $classNamespace = $item['name'];
-
- $isFilterDir = false;
- foreach ($filterDirs as $dirItem) {
- if (strpos($item['path'], $dirItem) !== false){
- $isFilterDir=true;
- }
- }
- if ($isFilterDir){
- continue;
- }else if (
- !in_array($classNamespace, $filterControllers) &&
- $this->config['definitions'] != $classNamespace
-
- ) {
- $list[] = $classNamespace;
- }
- }
-
- return $list;
- }
-
- public function parseController($class,$isParseDetail=false)
- {
-
- $refClass = new ReflectionClass($class);
- $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass);
- $data = (new ParseAnnotation($this->config))->getClassAnnotation($refClass);
- if (in_array("NotParse", $classTextAnnotations) || isset($data['notParse'])) {
- return false;
- }
- $controllersName = $refClass->getShortName();
- $data['controller'] = $controllersName;
- $data['path'] = $class;
- if (!empty($data['group']) && !in_array($data['group'], $this->groups)) {
- $this->groups[] = $data['group'];
- }
-
- if (empty($data['title'])) {
- if (!empty($classTextAnnotations) && count($classTextAnnotations) > 0) {
- $data['title'] = $classTextAnnotations[0];
- } else {
- $data['title'] = $controllersName;
- }
- }
- $data['title'] = Lang::getLang($data['title']);
- $methodList = [];
- $data['menuKey'] = Helper::createRandKey($data['controller']);
- $isNotDebug = in_array("NotDebug", $classTextAnnotations) || isset($data['notDebug']);
- $parseApiDetail = new ParseApiDetail($this->config);
- foreach ($refClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) {
- if ($isParseDetail){
- $methodItem = $parseApiDetail->parseApiMethod($refClass,$refMethod,$this->currentApp);
- }else{
- $methodItem = $this->parseApiMethod($refClass,$refMethod);
- }
- if ($methodItem===false){
- continue;
- }
- if ($isNotDebug) {
- $methodItem['notDebug'] = true;
- }
- $methodList[] = $methodItem;
- }
- $data['children'] = $methodList;
- if (count($methodList)===0){
- return false;
- }
- return $data;
- }
-
-
- protected function parseApiMethod($refClass,$refMethod){
- $config = $this->config;
- if (empty($refMethod->name)) {
- return false;
- }
-
- try {
- $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod);
-
- $methodInfo = (new ParseAnnotation($this->config))->getMethodAnnotation($refMethod);
- // 标注不解析的方法
- if (in_array("NotParse", $textAnnotations) || isset($methodInfo['notParse']) || empty($methodInfo)) {
- return false;
- }
- $methodInfo = ParseApiDetail::handleApiBaseInfo($methodInfo,$refClass->name,$refMethod->name,$textAnnotations,$config);
- $methodInfo['appKey'] = !empty($this->currentApp['appKey'])?$this->currentApp['appKey']:"";
- return Helper::getArrayValuesByKeys($methodInfo,['title','method','url','author','tag','name','menuKey','appKey']);
- }catch (AnnotationException $e) {
- throw new ErrorException($e->getMessage());
- }
-
- }
-
-
-
- /**
- * 对象分组到tree
- * @param $tree
- * @param $objectData
- * @param string $childrenField
- * @return array
- */
- public static function objtctGroupByTree($tree,$objectData,$childrenField='children'){
- $data = [];
- foreach ($tree as $node){
- if (!empty($node[$childrenField])){
- $node[$childrenField] = static::objtctGroupByTree($node[$childrenField],$objectData);
- }else if (!empty($objectData[$node['name']])){
- $node[$childrenField] = $objectData[$node['name']];
- }
- $node['menuKey'] = Helper::createRandKey( $node['name']);
- $data[] = $node;
- }
- return $data;
- }
-
- protected static function getAppGroupNames($groups){
- $groupNames = [];
- foreach ($groups as $item) {
- if (!empty($item['name'])){
- $groupNames[]=$item['name'];
- }
- if (!empty($item['children']) && count($item['children'])){
- $childrenNames = self::getAppGroupNames($item['children']);
- foreach ($childrenNames as $childrenName) {
- $groupNames[]=$childrenName;
- }
- }
- }
- return $groupNames;
- }
-
- /**
- * 合并接口到应用分组
- * @param $apiData
- * @param $groups
- * @return array
- */
- public static function mergeApiGroup($apiData,$groups){
- if (empty($groups) || count($apiData)<1){
- return $apiData;
- }
- $groupNames = static::getAppGroupNames($groups);
- $apiObject = [];
- foreach ($apiData as $controller){
- if (!empty($controller['group']) && in_array($controller['group'],$groupNames)){
- if (!empty($apiObject[$controller['group']])){
- $apiObject[$controller['group']][] = $controller;
- }else{
- $apiObject[$controller['group']] = [$controller];
- }
- }else{
- if (!empty($apiObject['notGroup'])){
- $apiObject['notGroup'][] = $controller;
- }else{
- $apiObject['notGroup'] = [$controller];
- }
- }
- }
- if (!empty($apiObject['notGroup'])){
- array_unshift($groups,['title'=>'未分组','name'=>'notGroup']);
- }
- $res = static::objtctGroupByTree($groups,$apiObject);
- return $res;
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php b/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php
deleted file mode 100644
index 720abae27..000000000
--- a/vendor/hg/apidoc/src/parses/ParseCodeTemplate.php
+++ /dev/null
@@ -1,100 +0,0 @@
-config = $config;
- }
-
- public function renderCode($params)
- {
- $appKey = $params['appKey'];
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApp = $currentAppConfig['appConfig'];
- $this->currentApp = $currentApp;
-
- $codeTemplate = $params['template'];
-
- //验证参数
-
- //验证模板文件是否存在
-
- //解析接口数据
- $tplData = [];
- if ($codeTemplate['select_mode'] == 'controller'){
- $parseApiMenusService = new ParseApiMenus($this->config);
- $controllers = $params['selected'];
- if (!empty($controllers) && count($controllers) > 0) {
- $controllerList = [];
- foreach ($controllers as $class) {
- $classData = $parseApiMenusService->parseController($class);
- if ($classData !== false) {
- $controllerList[] = $classData;
- }
- }
- if (empty($codeTemplate['multiple'])){
- $tplData = $controllerList[0];
- }else{
- $tplData = $controllerList;
- }
- }
- }else{
- // api
- $apis = $params['selected'];
- if (!empty($apis) && count($apis) > 0) {
- $parseApiDetailService = new ParseApiDetail($this->config);
- $apiList = [];
- foreach ($apis as $key) {
- $apiKey = urldecode($key);
- $apiDetail = $parseApiDetailService->renderApiDetail($appKey,$apiKey);
- if ($apiDetail !== false) {
- $apiList[] = $apiDetail;
- }
- }
- if (empty($codeTemplate['multiple'])){
- $tplData = $apiList[0];
- }else{
- $tplData = $apiList;
- }
- }
- }
-
-
- // 读取模板
- $templatePath =DirAndFile::formatPath( APIDOC_ROOT_PATH . $codeTemplate['template'],"/");
- if (is_readable($templatePath) == false) {
- throw new ErrorException("template not found", [
- 'template' => $template
- ]);
- }
- $tplParams = [
- 'form'=> $params['form'],
- 'data'=>$tplData
- ];
- $html = (new ParseTemplate())->compile($templatePath,$tplParams);
-
-
-
- return $html;
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseMarkdown.php b/vendor/hg/apidoc/src/parses/ParseMarkdown.php
deleted file mode 100644
index cd9a4a0b9..000000000
--- a/vendor/hg/apidoc/src/parses/ParseMarkdown.php
+++ /dev/null
@@ -1,139 +0,0 @@
-config = $config;
- }
-
- /**
- * 获取md文档菜单
- * @return array
- */
- public function getDocsMenu($appKey,string $lang): array
- {
- $config = $this->config;
- $docData = [];
- if (!empty($config['docs']) && count($config['docs']) > 0) {
- $docData = $this->handleDocsMenuData($config['docs'],$appKey,$lang);
- }
- return $docData;
- }
-
- /**
- * 处理md文档菜单数据
- * @param array $menus
- * @return array
- */
- protected function handleDocsMenuData(array $menus,$appKey,string $lang): array
- {
- $list = [];
- foreach ($menus as $item) {
- $item['title'] = Lang::getLang($item['title']);
- if (!empty($item['appKey']) && $item['appKey'] != $appKey){
- continue;
- }
-
- if (!empty($item['children']) && count($item['children']) > 0) {
- $item['children'] = $this->handleDocsMenuData($item['children'],$appKey,$lang);
- $item['menuKey'] = Helper::createRandKey("md_group");
- } else {
- $filePath = static::getFilePath($appKey,$item['path'],$lang);
- if (!file_exists($filePath['filePath'])) {
- continue;
- }
-
- if(!empty($item['path'])){
- $item['path'] = Helper::replaceTemplate($item['path'],['lang'=>$lang]);
- }
- $item['type'] = 'md';
- $item['menuKey'] = Helper::createApiKey($item['path']);
- }
- $list[] = $item;
- }
- return $list;
- }
-
- public static function getFilePath(string $appKey, string $path,$lang=""){
- if (!empty($appKey)){
- $currentAppConfig = Helper::getCurrentAppConfig($appKey);
- $currentApps = $currentAppConfig['apps'];
- $fullPath = Helper::replaceCurrentAppTemplate($path, $currentApps);
- }else{
- $fullPath = $path;
- }
- $fullPath = Helper::replaceTemplate($fullPath,[
- 'lang'=>$lang
- ]);
-
- if (strpos($fullPath, '#') !== false) {
- $mdPathArr = explode("#", $fullPath);
- $mdPath=$mdPathArr[0];
- $mdAnchor =$mdPathArr[1];
- } else {
- $mdPath = $fullPath;
- $mdAnchor="";
- }
- $fileSuffix = "";
- if (strpos($fullPath, '.md') === false) {
- $fileSuffix = ".md";
- }
- $filePath = APIDOC_ROOT_PATH . $mdPath . $fileSuffix;
- return [
- 'filePath'=>$filePath,
- 'anchor'=>$mdAnchor
- ];
- }
-
-
- /**
- * 获取md文档内容
- * @param string $appKey
- * @param string $path
- * @return string
- */
- public static function getContent(string $appKey, string $path,$lang="")
- {
- $filePathArr = static::getFilePath($appKey,$path,$lang);
- $mdAnchor = $filePathArr['anchor'];
- $filePath = $filePathArr['filePath'];
- if (!file_exists($filePath)) {
- return $path;
- }
- $contents = DirAndFile::getFileContent($filePath);
- // 获取指定h2标签内容
- if (!empty($mdAnchor)){
- if (strpos($contents, '## ') !== false) {
- $contentArr = explode("\r\n", $contents);
- $contentText = "";
- foreach ($contentArr as $line){
- $contentText.="\r\n".trim($line);
- }
- $contentArr = explode("\r\n## ", $contentText);
- $content="";
- foreach ($contentArr as $item){
- $itemArr = explode("\r\n", $item);
- if (!empty($itemArr) && $itemArr[0] && $mdAnchor===$itemArr[0]){
- $content = str_replace($itemArr[0]."\r\n", '', $item);
- break;
- }
- }
- return $content;
- }
- }
- return $contents;
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/parses/ParseModel.php b/vendor/hg/apidoc/src/parses/ParseModel.php
deleted file mode 100644
index dbe81e374..000000000
--- a/vendor/hg/apidoc/src/parses/ParseModel.php
+++ /dev/null
@@ -1,162 +0,0 @@
-config = $config;
- }
-
- public function parseModelTable($model, $classReflect, $methodName = "")
- {
- if (!is_callable(array($model, 'getTable'))) {
- return false;
- }
- $config = $this->config;
- try {
- // 获取所有模型属性
- $propertys = $classReflect->getDefaultProperties();
- $tableName = $model->getTable();
- $configTablePrefix = !empty($config['database']) && !empty($config['database']['prefix']) ? $config['database']['prefix'] : "";
- if (!empty($configTablePrefix) && strpos($tableName, $configTablePrefix) === false) {
- $tableName = $configTablePrefix . $model->getTable();
- }
- $table = $this->getTableDocument($tableName, $propertys, $model);
- if (empty($methodName)) {
- return $table;
- }
-
- $methodReflect = $classReflect->getMethod($methodName);
- $annotations = (new ParseAnnotation($config))->getMethodAnnotation($methodReflect);
- if (!empty($annotations['field'])) {
- $table = ParseApiDetail::filterParamsField($table, $annotations['field'], 'field');
- }
- if (!empty($annotations['withoutField'])) {
- $table = ParseApiDetail::filterParamsField($table, $annotations['withoutField'], 'withoutField');
- }
- if (!empty($annotations['addField'])) {
- $addFieldData = [];
- if (is_int(Helper::arrayKeyFirst($annotations['addField']))) {
- $addFieldData = $annotations['addField'];
- } else {
- $addFieldData = [$annotations['addField']];
- }
- $addFieldList = [];
- $parseApiDetail = new ParseApiDetail($config);
- $field = 'param';
- foreach ($addFieldData as $fieldItem) {
- if (!empty($fieldItem['ref'])) {
- $refParams = $parseApiDetail->renderRef($fieldItem['ref'], $field);
- if (!empty($refParams[$field])) {
- $fieldItem = $parseApiDetail->handleRefData($fieldItem, $refParams[$field], $field);
- }
- }
- if (!empty($fieldItem['md'])) {
- $fieldItem['md'] = ParseMarkdown::getContent("", $fieldItem['md']);
- }
- // 自定义解析
- if (!empty($config['parsesAnnotation'])) {
- $callback = $config['parsesAnnotation']($fieldItem);
- if (!empty($callback)) {
- $fieldItem = $callback;
- }
- }
- $addFieldList[] = $fieldItem;
- }
- $table = Helper::arrayMergeAndUnique("name", $table, $addFieldList);
- }
- return $table;
- } catch (\ReflectionException $e) {
- throw new ErrorException('Class ' . get_class($model) . ' ' . $e->getMessage());
- }
-
- }
-
- /**
- * 获取模型实例
- * @param $method
- * @return mixed|null
- */
- public static function getModelClass($namespaceName)
- {
- if (!empty($namespaceName) && class_exists($namespaceName)) {
- $modelInstance = new $namespaceName();
- if (is_callable(array($modelInstance, 'getTable'))) {
- return $modelInstance;
- }
- }
- return null;
- }
-
-
- /**
- * 获取模型注解数据
- * @param $tableName
- * @param $propertys
- * @return array
- */
- public function getTableDocument($tableName, array $propertys, $model = null): array
- {
- $config = $this->config;
- $fieldComment = [];
- if (empty($config['database_query_function'])) {
- throw new ErrorException("not datatable_query_function config");
- }
- $tableColumns = $config['database_query_function']("SHOW FULL COLUMNS FROM `" . $tableName . "`");
- foreach ($tableColumns as $columns) {
- $columns = Helper::objectToArray($columns);
- $name = $columns['Field'];
- $desc = $columns['Comment'];
- $mock = "";
- $md = "";
- if (isset($propertys['convertNameToCamel']) && $propertys['convertNameToCamel'] === true) {
- $name = Helper::camel($name);
- }
- if (!empty($desc)) {
- // 存在字段注释
- $desc = Lang::getLang($desc);
- if (strpos($desc, 'mock(') !== false) {
- // 存在mock
- preg_match('#mock\((.*)\)#s', $desc, $mocks);
- if (!empty($mocks[1])) {
- $mock = $mocks[1];
- $desc = str_replace($mocks[0], "", $desc);
- }
- }
- if (strpos($desc, 'md="') !== false) {
- // 存在md
- preg_match('#md="(.*)"#s', $desc, $mdRefs);
- if (!empty($mdRefs[1])) {
- $md = ParseMarkdown::getContent("", $mdRefs[1]);
- $desc = str_replace($mdRefs[0], "", $desc);
- }
- }
- }
- $fieldComment[] = [
- "name" => $name,
- "type" => $columns['Type'],
- "desc" => $desc,
- "default" => $columns['Default'],
- "require" => $columns['Null'] != "YES",
- "mock" => $mock,
- "md" => $md,
- ];
- }
- return $fieldComment;
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/BaseService.php b/vendor/hg/apidoc/src/providers/BaseService.php
deleted file mode 100644
index 91303aa8f..000000000
--- a/vendor/hg/apidoc/src/providers/BaseService.php
+++ /dev/null
@@ -1,172 +0,0 @@
-'config','route'=>'getConfig'],
- ['rule'=>'apiMenus','route'=>'getApiMenus'],
- ['rule'=>'apiDetail','route'=>'getApiDetail'],
- ['rule'=>'docMenus','route'=>'getMdMenus'],
- ['rule'=>'docDetail','route'=>'getMdDetail'],
- ['rule'=>'verifyAuth','route'=>'verifyAuth'],
- ['rule'=>'generator','route'=>'createGenerator'],
- ['rule'=>'cancelAllCache','route'=>'cancelAllCache'],
- ['rule'=>'createAllCache','route'=>'createAllCache'],
- ['rule'=>'renderCodeTemplate','route'=>'renderCodeTemplate'],
- ['rule'=>'allApiMenus','route'=>'getAllApiMenus'],
- ['rule'=>'addApiShare','route'=>'addApiShare'],
- ['rule'=>'getApiShareList','route'=>'getApiShareList'],
- ['rule'=>'getApiShareDetail','route'=>'getApiShareDetail'],
- ['rule'=>'deleteApiShare','route'=>'deleteApiShare'],
- ['rule'=>'handleApiShareAction','route'=>'handleApiShareAction'],
- ];
-
-
-
- /**
- * 获取apidoc配置
- * @return array 返回apidoc配置
- */
- abstract static function getApidocConfig();
-
-
- /**
- * 注册apidoc路由
- * @param $route 路由参数
- * @return mixed
- */
- abstract static function registerRoute($route);
-
- /**
- * 执行Sql语句
- * @return mixed
- */
- abstract static function databaseQuery($sql);
-
- /**
- * 获取项目根目录
- * @return string 返回项目根目录
- */
- abstract static function getRootPath();
-
- /**
- * 获取缓存目录
- * @return string 返回项目缓存目录
- */
- abstract static function getRuntimePath();
-
-
- /**
- * 设置当前语言
- * @param $locale 语言标识
- * @return mixed
- */
- abstract static function setLang($locale);
-
- /**
- * 获取语言定义
- * @param $lang
- * @return string
- */
- abstract static function getLang($lang);
-
-
- /**
- * 处理apidoc接口响应的数据
- * @return mixed
- */
- abstract static function handleResponseJson($res);
-
- abstract static function getTablePrefix();
-
- // 自动注册api路由
- static public function autoRegisterRoutes($routeFun,$config=""){
- if (empty($config)){
- $config = self::getApidocConfig();
- }
- if (isset($config['auto_register_routes']) && $config['auto_register_routes']===true) {
- $cacheKey = "apis/autoRegisterRoutes";
- if (!empty($config['cache']) && $config['cache']['enable']) {
- $cacheData = (new Cache())->get($cacheKey);
- if (!empty($cacheData)) {
- $autoRegisterApis = $cacheData;
- } else {
- $autoRegisterApis = (new AutoRegisterRouts($config))->getAppsApis();
- (new Cache())->set($cacheKey, $autoRegisterApis);
- }
- } else {
- $autoRegisterApis = (new AutoRegisterRouts($config))->getAppsApis();
- }
- $routeFun($autoRegisterApis);
- }
- }
-
- public function initConfig(){
- ! defined('APIDOC_ROOT_PATH') && define('APIDOC_ROOT_PATH', $this->getRootPath());
- ! defined('APIDOC_STORAGE_PATH') && define('APIDOC_STORAGE_PATH', $this->getRuntimePath());
- $config = self::getApidocConfig();
- if (empty($config['database_query_function'])){
- $config['database_query_function'] = function ($sql){
- return self::databaseQuery($sql);
- };
- }
- if (empty($config['lang_register_function'])){
- $config['lang_register_function'] = function ($sql){
- return self::setLang($sql);
- };
- }
- if (empty($config['lang_get_function'])){
- $config['lang_get_function'] = function ($lang){
- return self::getLang($lang);
- };
- }
- $config['handle_response_json'] = function ($res){
- return self::handleResponseJson($res);
- };
- $table_prefix = self::getTablePrefix();
- if (!empty($config['database'])){
- if (empty($config['prefix'])){
- $config['database']['prefix'] = $table_prefix;
- }
- }else{
- $config['database']=[
- 'prefix'=>$table_prefix
- ];
- }
- ConfigProvider::set($config);
- }
-
- /**
- * @param null $routeFun
- */
- static public function registerApidocRoutes($routeFun=null){
- $routes = static::$routes;
- $controller_namespace = '\hg\apidoc\Controller@';
- $route_prefix = "/apidoc";
- $config = self::getApidocConfig();
- if (!empty($config) && !empty($config['route_prefix'])){
- $route_prefix = $config['route_prefix'];
- }
- foreach ($routes as $item) {
- $route = [
- 'uri'=>$route_prefix."/".$item['rule'],
- 'callback'=>$controller_namespace.$item['route'],
- 'route'=>$item['route'],
- ];
- if (!empty($routeFun)){
- $routeFun($route);
- }else{
- self::registerRoute($route);
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/CommonService.php b/vendor/hg/apidoc/src/providers/CommonService.php
deleted file mode 100644
index 0fc5cbe2d..000000000
--- a/vendor/hg/apidoc/src/providers/CommonService.php
+++ /dev/null
@@ -1,56 +0,0 @@
- [HyperfMiddleware::class]]);
- });
-
- // 自动注册路由
- CommonService::autoRegisterRoutes(function ($routeData){
- foreach ($routeData as $controller) {
- if (count($controller['methods'])){
- $methods= $controller['methods'];
- $routeCallback = function ()use ($methods){
- foreach ($methods as $method) {
- $apiMethods = Helper::handleApiMethod($method['method']);
- $options = [];
- if (!empty($method['middleware'])){
- $options['middleware']= $method['middleware'];
- }
- Router::addRoute([...$apiMethods,'OPTIONS'],$method['url'], $method['controller']."@".$method['name'],$options);
- }
- };
- $groupOptions = [];
- if (!empty($controller['middleware'])){
- $groupOptions['middleware'] = $controller['middleware'];
- }
- Router::addGroup("",$routeCallback,$groupOptions);
- }
- }
- }, HyperfMiddleware::getApidocConfig());
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/LaravelService.php b/vendor/hg/apidoc/src/providers/LaravelService.php
deleted file mode 100644
index 7a5fa94ef..000000000
--- a/vendor/hg/apidoc/src/providers/LaravelService.php
+++ /dev/null
@@ -1,110 +0,0 @@
-publishes([
- __DIR__.'/../config.php' => config_path('apidoc.php'),
- ]);
- }
-
- public function register()
- {
- $config = static::getApidocConfig();
- $this->initConfig();
- self::registerApidocRoutes();
-
- // 自动注册路由
- self::autoRegisterRoutes(function ($routeData){
- foreach ($routeData as $controller) {
- if (count($controller['methods'])){
- $methods= $controller['methods'];
- $routeCallback = function ()use ($methods){
- foreach ($methods as $method) {
- $apiMethods = Helper::handleApiMethod($method['method']);
- $route = Route::match($apiMethods + ['OPTIONS'],$method['url'], "\\".$method['controller']."@".$method['name']);
- if (!empty($method['middleware'])){
- $route->middleware($method['middleware']);
- }
- }
- };
- $routeGroup = Route::prefix("");
- if (!empty($controller['middleware'])){
- $routeGroup->middleware($controller['middleware']);
- }
- $routeGroup->group($routeCallback);
- }
- }
- });
-
- }
-
- static function getApidocConfig()
- {
- $config = config("apidoc");
- if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){
- $config['auto_url']['filter_keys'] = ['App','Http','Controllers'];
- }
- $config['app_frame'] = "laravel";
- return $config;
- }
-
- static function registerRoute($route){
- $config = self::getApidocConfig();
- $registerRoute = Route::any($route['uri'], $route['callback']);
- $registerRoute->middleware([LaravelMiddleware::class]);
- if (!empty($config['allowCrossDomain'])) {
- $registerRoute->middleware([ApiCrossDomain::class]);
- }
- }
-
- static function databaseQuery($sql){
- return DB::select($sql);
- }
-
- static function getTablePrefix(){
- $driver = config('database.default');
- $table_prefix=config('database.connections.'.$driver.'.prefix');
- return $table_prefix;
- }
-
- static function getRootPath()
- {
- return base_path()."/";
- }
-
- static function getRuntimePath()
- {
- return storage_path()."/";
- }
-
- static function setLang($locale){
- Lang::setLocale($locale);
- }
-
- static function getLang($lang){
- return trans($lang);
- }
-
- static function handleResponseJson($res){
- return $res;
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php b/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php
deleted file mode 100644
index c301ba041..000000000
--- a/vendor/hg/apidoc/src/providers/ThinkPHP5Service.php
+++ /dev/null
@@ -1,94 +0,0 @@
-initConfig();
- self::registerApidocRoutes();
- // 自动注册路由
- self::autoRegisterRoutes(function ($routeData){
- $appRoute = app('route');
- $routeGroup = $appRoute->getGroup();
- foreach ($routeData as $controller) {
- $routeGroup = $appRoute->getGroup();
- if (!empty($controller['middleware'])){
- $routeGroup->middleware($controller['middleware']);
- }
- if (count($controller['methods'])){
- foreach ($controller['methods'] as $method) {
- $apiMethods = Helper::handleApiMethod($method['method']);
- $apiMethods = implode("|",$apiMethods);
- $route = $routeGroup->addRule($method['url'],$method['controller']."@".$method['name'],$apiMethods);
- if (!empty($method['middleware'])){
- $route->middleware($method['middleware']);
- }
- }
- }
- }
- });
- }
-
- static function getApidocConfig()
- {
- $config = config("apidoc.");
- if (!(!empty($config['auto_url']) && !empty($config['auto_url']['filter_keys']))){
- $config['auto_url']['filter_keys'] = ['app','controller'];
- }
- $config['app_frame'] = "thinkphp5";
- return $config;
- }
-
- static function registerRoute($route){
- $config = self::getApidocConfig();
- $registerRoute = Route::rule($route['uri'], $route['callback'],"*");
- if (!empty($config['allowCrossDomain'])) {
- $registerRoute->allowCrossDomain();
- }
- }
-
- static function databaseQuery($sql){
- return Db::query($sql);
- }
-
- static function getTablePrefix(){
- $driver = config('database.default');
- $table_prefix=config('database.connections.'.$driver.'.prefix');
- return $table_prefix;
- }
-
- static function getRootPath()
- {
- return App::getRootPath();
- }
-
- static function getRuntimePath()
- {
- return App::getRuntimePath();
- }
-
- static function setLang($locale){
- Lang::setLangCookieVar($locale);
- }
-
- static function getLang($lang){
- return Lang::get($lang);
- }
-
- static function handleResponseJson($res){
- return json($res);
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/ThinkPHPService.php b/vendor/hg/apidoc/src/providers/ThinkPHPService.php
deleted file mode 100644
index 767699e7a..000000000
--- a/vendor/hg/apidoc/src/providers/ThinkPHPService.php
+++ /dev/null
@@ -1,107 +0,0 @@
-initConfig();
-
- $this->registerRoutes(function () use($config){
- //注册apidoc所需路由
- self::registerApidocRoutes(function ($route)use ($config){
- $registerRoute = Route::any($route['uri'], $route['callback']);
- $registerRoute->middleware([ThinkPHPMiddleware::class]);
- if (!empty($config['allowCrossDomain'])) {
- $registerRoute->allowCrossDomain();
- }
- });
-
- // 自动注册路由
- self::autoRegisterRoutes(function ($routeData){
- $appRoute = $this->app->route;
- $appName = $this->app->http->getName();
- foreach ($routeData as $controller) {
- $routeGroup = $appRoute->getGroup();
- if (!empty($controller['middleware'])){
- $routeGroup->middleware($controller['middleware']);
- }
- if (count($controller['methods'])){
- foreach ($controller['methods'] as $method) {
- if (!empty($appName)){
- $method['url'] = str_replace("/".$appName,'',$method['url']);
- }
- $apiMethods = Helper::handleApiMethod($method['method']);
- $apiMethods = implode("|",$apiMethods);
- $route = $routeGroup->addRule($method['url'],$method['controller']."@".$method['name'],$apiMethods);
- if (!empty($method['middleware'])){
- $route->middleware($method['middleware']);
- }
- }
- }
- }
- });
- });
- }
-
- static function registerRoute($route){
- $registerRoute = Route::any($route['uri'], $route['callback']);
- }
-
- static function databaseQuery($sql){
- return Db::query($sql);
- }
-
- static function getTablePrefix(){
- $driver = config('database.default');
- $table_prefix=config('database.connections.'.$driver.'.prefix');
- return $table_prefix;
- }
-
- static function getRootPath()
- {
- return App::getRootPath();
- }
-
- static function getRuntimePath()
- {
- return App::getRuntimePath();
- }
-
- static function setLang($locale){
- \think\facade\App::loadLangPack($locale);
- Lang::setLangSet($locale);
- }
-
- static function getLang($lang){
- return Lang::get($lang);
- }
-
- static function handleResponseJson($res){
- return json($res);
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/providers/WebmanService.php b/vendor/hg/apidoc/src/providers/WebmanService.php
deleted file mode 100644
index 63aa3baa9..000000000
--- a/vendor/hg/apidoc/src/providers/WebmanService.php
+++ /dev/null
@@ -1,43 +0,0 @@
-middleware([WebmanMiddleware::class]);
- });
-
- // 自动注册路由
- CommonService::autoRegisterRoutes(function ($routeData){
- foreach ($routeData as $controller) {
- if (count($controller['methods'])){
- $methods= $controller['methods'];
- $routeCallback = function ()use ($methods){
- foreach ($methods as $method) {
- $apiMethods = Helper::handleApiMethod($method['method']);
- $route = Route::add([...$apiMethods,'OPTIONS'],$method['url'], $method['controller']."@".$method['name']);
- if (!empty($method['middleware'])){
- $route->middleware($method['middleware']);
- }
- }
- };
- $routeGroup = Route::group("",$routeCallback);
- if (!empty($controller['middleware'])){
- $routeGroup->middleware($controller['middleware']);
- }
- }
- }
- }, WebmanMiddleware::getApidocConfig());
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/AbstractAnnotation.php b/vendor/hg/apidoc/src/utils/AbstractAnnotation.php
deleted file mode 100644
index 8ed02b1f3..000000000
--- a/vendor/hg/apidoc/src/utils/AbstractAnnotation.php
+++ /dev/null
@@ -1,36 +0,0 @@
-formatParams($value);
- foreach ($formattedValue as $key => $val) {
- if ($key=="value" && !property_exists($this, $key)){
- $this->name = $val;
- }else{
- $this->{$key} = $val;
- }
- }
- }
-
- protected function formatParams($value): array
- {
- if (isset($value[0])) {
- $value = $value[0];
- }
- if (!is_array($value)) {
- $value = ['name' => $value];
- }
- return $value;
- }
-}
diff --git a/vendor/hg/apidoc/src/utils/ApiCrossDomain.php b/vendor/hg/apidoc/src/utils/ApiCrossDomain.php
deleted file mode 100644
index e09b7204b..000000000
--- a/vendor/hg/apidoc/src/utils/ApiCrossDomain.php
+++ /dev/null
@@ -1,22 +0,0 @@
-server('HTTP_ORIGIN') ? $request->server('HTTP_ORIGIN') : '';
- $response->header('Access-Control-Allow-Origin', $origin);
- $response->header('Access-Control-Allow-Headers', 'Origin, Content-Type, Cookie, X-CSRF-TOKEN, Accept, Authorization, X-XSRF-TOKEN');
- $response->header('Access-Control-Expose-Headers', 'Authorization, authenticated');
- $response->header('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, OPTIONS');
- $response->header('Access-Control-Allow-Credentials', 'true');
- return $response;
-
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/ApiShare.php b/vendor/hg/apidoc/src/utils/ApiShare.php
deleted file mode 100644
index 05c8a4f48..000000000
--- a/vendor/hg/apidoc/src/utils/ApiShare.php
+++ /dev/null
@@ -1,165 +0,0 @@
- $params['name'],
- 'type' => $params['type'],
- ];
- if (!empty($params['appKeys'])) {
- $data['appKeys'] = $params['appKeys'];
- }
- if (!empty($params['apiKeys'])) {
- $data['apiKeys'] = $params['apiKeys'];
- }
- if (!empty($params['password'])) {
- $data['password'] = $params['password'];
- }
- $data['create_at'] = date('Y-m-d h:i:s');
- $data['create_time'] = time();
- $res = (new Cache())->set($cacheKey, $data);
- return $res;
- }
-
- public function getSharePageList($config,$pageIndex,$pageSize){
- $path = APIDOC_STORAGE_PATH . $config['cache']['folder'] . "/share";
-
- $list = DirAndFile::getFileList($path);
- $data = [];
- $cache = new Cache();
-
- foreach ($list as $item) {
- $fileNameArr = explode("_", $item['name']);
- $cacheKey = "share/" . $fileNameArr[0] . "_" . $fileNameArr[1];
- $cacheData = $cache->get($cacheKey);
- $itemData = [
- 'key' => $fileNameArr[1],
- 'name' => $cacheData['name'],
- 'type' => $cacheData['type'],
- 'create_time' => $cacheData['create_time'],
- 'create_at' => $cacheData['create_at'],
- ];
- $data[] = $itemData;
- }
- $data = Helper::arraySortByKey($data, 'create_time', SORT_DESC);
- $page = $pageIndex-1;
- $res = array_slice($data,$page*$pageSize,$pageSize);
- return [
- 'total'=>count($data),
- 'data'=>$res
- ];
- }
-
-
- public function getShareDetailByKey($shareKey)
- {
- if (empty($shareKey)) {
- throw new ErrorException('field not found', ['field' => 'shareKey']);
- }
- $cache = new Cache();
- $cacheKey = static::getShareCacheKey($shareKey);
- $cacheData = $cache->get($cacheKey);
- if (empty($cacheData)) {
- throw new ErrorException("share not exists");
- }
- return $cacheData;
- }
-
- public function checkShareAuth($config, $params)
- {
- if (empty($params['shareKey'])) {
- throw new ErrorException('field not found', ['field' => 'shareKey']);
- }
- $cacheData = $this->getShareDetailByKey($params['shareKey']);
-
- if (!empty($cacheData['password'])) {
- //验证密码
- if (empty($params['token'])) {
- throw new ErrorException("token not found");
- }
- $password = md5($cacheData['password']);
- $cacheData['pass'] = $password;
- $checkAuth = (new Auth($config))->checkToken($params['token'], $password);
- if (!$checkAuth) {
- throw new ErrorException("token error");
- }
- }
- return $cacheData;
- }
-
- public static function getAppShareApis(array $config, array $apps, $parentKey = "", $filterAppKeys = [], $isParseDetail = false)
- {
- $appList = [];
- $separ = !empty($parentKey) ? ',' : '';
- foreach ($apps as $app) {
- $appKey = $parentKey . $separ . $app['key'];
- if (!empty($app['items']) && count($app['items'])) {
- $items = static::getAppShareApis($config, $app['items'], $appKey, $filterAppKeys, $isParseDetail);
- $app['children'] = $items;
- } else {
- $app['appKey'] = $appKey;
- $apiData = (new ParseApiMenus($config))->renderApiMenus($appKey, $isParseDetail);
- $app['children'] = $apiData['data'];
- }
- if (!empty($filterAppKeys) && count($filterAppKeys) && !in_array($appKey, $filterAppKeys) && empty($app['items'])) {
- continue;
- }
- $app['menuKey'] = $appKey;
- $appList[] = $app;
- }
-
- return $appList;
- }
-
- public function getShareData($config, $key)
- {
- $shareData = $this->getShareDetailByKey($key);
- $filterAppKeys = !empty($shareData['appKeys']) ? $shareData['appKeys'] : [];
- $configApps = Helper::handleAppsConfig($config['apps'], false, $config);
- $appList = static::getAppShareApis($config, $configApps, "", $filterAppKeys, true);
- if ($shareData['type'] == 'api') {
- $appList = Helper::filterTreeNodesByKeys($appList, $shareData['apiKeys'], 'menuKey');
- }
- return [
- 'shareData' => $shareData,
- 'apiData' => $appList,
- ];
- }
-
- public function handleApiShareAction($config, $key, $index)
- {
-
- $actionConfig = $config['share']['actions'][$index];
- if (!empty($actionConfig['click'])) {
- $data = $this->getShareData($config, $key);
- $res = $actionConfig['click']($data['shareData'], $data['apiData']);
- return $res;
- }
- return false;
-
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php b/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php
deleted file mode 100644
index b54e53711..000000000
--- a/vendor/hg/apidoc/src/utils/AutoRegisterRouts.php
+++ /dev/null
@@ -1,154 +0,0 @@
-config = $config;
- }
-
- /**
- * 解析所有应用的api
- * @return array
- */
- public function getAppsApis(){
- $apps = Helper::getAllApps($this->config['apps']);
- $apiList = [];
- if (!empty($apps) && count($apps)){
- foreach ($apps as $app) {
- $apis = $this->getAppApis($app);
- $apiList=array_merge($apiList,$apis);
- }
- }
- return $apiList;
-
- }
-
- /**
- * 生成api接口数据
- * @param array $app
- * @return array
- */
- public function getAppApis($app)
- {
- $controllers = [];
- if (!empty($app['controllers']) && count($app['controllers']) > 0) {
- // 配置的控制器列表
- $controllers = (new ParseApiMenus($this->config))->getConfigControllers($app['path'],$app['controllers']);
- }else if(!empty($app['path']) && is_array($app['path']) && count($app['path'])){
- $parseApiMenus = new ParseApiMenus($this->config);
- foreach ($app['path'] as $path) {
- $controllersList = $parseApiMenus->getDirControllers($path);
- $controllers = array_merge($controllers,$controllersList);
- }
- } else if(!empty($app['path']) && is_string($app['path'])) {
- // 默认读取所有的
- $controllers = (new ParseApiMenus($this->config))->getDirControllers($app['path']);
- }
-
- $routeData = [];
- if (!empty($controllers) && count($controllers) > 0) {
- foreach ($controllers as $class) {
- $classData = $this->parseController($class);
- if ($classData !== false) {
- $routeData[] = $classData;
- }
- }
- }
- return $routeData;
- }
-
-
- public function parseController($class)
- {
- $refClass = new ReflectionClass($class);
- $classTextAnnotations = ParseAnnotation::parseTextAnnotation($refClass);
- $classAnnotations = (new ParseAnnotation($this->config))->getClassAnnotation($refClass);
- if (in_array("NotParse", $classTextAnnotations) || isset($classAnnotations['notParse'])) {
- return false;
- }
-
-
- $methodList = [];
- foreach ($refClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) {
- $methodItem = $this->parseApiMethod($refClass,$refMethod);
- if ($methodItem===false){
- continue;
- }
- $methodList[] = $methodItem;
- }
- if (count($methodList)===0){
- return false;
- }
- $data = [
- 'name'=>$refClass->name,
- 'methods'=>$methodList,
- ];
-
- //控制器中间件
- if (!empty($classAnnotations['routeMiddleware']) && !empty($classAnnotations['routeMiddleware'])) {
- $data['middleware'] = $classAnnotations['routeMiddleware'];
- }
- return $data;
- }
-
-
- protected function parseApiMethod($refClass,$refMethod){
- if (empty($refMethod->name) || in_array($refMethod->name,$this->filterMethods)) {
- return false;
- }
- $config = $this->config;
- $textAnnotations = ParseAnnotation::parseTextAnnotation($refMethod);
- $methodAnnotation = (new ParseAnnotation($config))->getMethodAnnotation($refMethod);
- if (in_array("NotParse", $textAnnotations) || isset($methodAnnotation['notParse'])) {
- return false;
- }
-
- if (empty($methodAnnotation['method'])) {
- $method = !empty($config['default_method']) ? strtoupper($config['default_method']) : '*';
- }else{
- $method = $methodAnnotation['method'];
- }
- if (empty($methodAnnotation['url'])) {
- $url = ParseApiDetail::autoCreateUrl($refClass->name,$refMethod->name,$config);
- }else{
- $url = $methodAnnotation['url'];
- }
- if (!empty($url) && substr($url, 0, 1) != "/") {
- $url = "/" . $url;
- }
- $data = [
- 'url'=>$url,
- 'method'=>$method,
- 'name'=>$refMethod->name,
- 'controller'=>$refClass->name,
- ];
- if (!empty($methodAnnotation['routeMiddleware']) && !empty($methodAnnotation['routeMiddleware'])) {
- $data['middleware'] = $methodAnnotation['routeMiddleware'];
- }
- return $data;
-
- }
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/Cache.php b/vendor/hg/apidoc/src/utils/Cache.php
deleted file mode 100644
index 51b19020a..000000000
--- a/vendor/hg/apidoc/src/utils/Cache.php
+++ /dev/null
@@ -1,298 +0,0 @@
- 0,
- 'cache_subdir' => true,
- 'prefix' => '',
- 'path' => '',
- 'hash_type' => 'md5',
- 'data_compress' => false,
- 'serialize' => [],
- ];
-
- /**
- * 架构函数
- * @param array $options 参数
- */
- public function __construct( array $options = [])
- {
- if (!empty($options)) {
- $this->options = array_merge($this->options, $options);
- }
-
- if (empty($this->options['path'])) {
- $this->options['path'] = APIDOC_STORAGE_PATH .'/'. 'apidoc';
- }
-
- if (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
- $this->options['path'] .= DIRECTORY_SEPARATOR;
- }
- }
-
- /**
- * 取得变量的存储文件名
- * @access public
- * @param string $name 缓存变量名
- * @return string
- */
- public function getCacheKey(string $name): string
- {
- $name = $name."_".hash($this->options['hash_type'], $name);
-
- if ($this->options['prefix']) {
- $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
- }
-
- return $this->options['path'] . $name . '.php';
- }
-
- /**
- * 序列化数据
- * @access protected
- * @param mixed $data 缓存数据
- * @return string
- */
- protected function serialize($data): string
- {
- if (is_numeric($data)) {
- return (string) $data;
- }
-
- $serialize = $this->options['serialize'][0] ?? "serialize";
-
- return $serialize($data);
- }
-
-
- /**
- * 反序列化数据
- * @access protected
- * @param string $data 缓存数据
- * @return mixed
- */
- protected function unserialize($data)
- {
- if (is_numeric($data)) {
- return $data;
- }
-
- $unserialize = $this->options['serialize'][1] ?? "unserialize";
-
- return $unserialize($data);
- }
-
-
- /**
- * 获取有效期
- * @access protected
- * @param integer|DateTimeInterface|DateInterval $expire 有效期
- * @return int
- */
- protected function getExpireTime($expire): int
- {
- if ($expire instanceof DateTimeInterface) {
- $expire = $expire->getTimestamp() - time();
- } elseif ($expire instanceof DateInterval) {
- $expire = DateTime::createFromFormat('U', (string) time())
- ->add($expire)
- ->format('U') - time();
- }
-
- return (int) $expire;
- }
-
- /**
- * 获取缓存数据
- * @param string $name 缓存标识名
- * @return array|null
- */
- protected function getRaw(string $name)
- {
- $filename = $this->getCacheKey($name);
-
- if (!is_file($filename)) {
- return;
- }
-
- $content = @file_get_contents($filename);
-
- if (false !== $content) {
- $expire = (int) substr($content, 8, 12);
- $createTime = filemtime($filename);
- if (0 != $expire && time() - $expire > $createTime) {
- //缓存过期删除缓存文件
- DirAndFile::unlink($item->getPathname());
- return;
- }
-
- $content = substr($content, 32);
-
- if ($this->options['data_compress'] && function_exists('gzcompress')) {
- //启用数据压缩
- $content = gzuncompress($content);
- }
-
- return is_string($content) ? ['content' => $content, 'expire' => $expire,'create_time'=>$createTime] : null;
- }
- }
-
- /**
- * 判断缓存是否存在
- * @access public
- * @param string $name 缓存变量名
- * @return bool
- */
- public function has($name): bool
- {
- return $this->getRaw($name) !== null;
- }
-
- /**
- * 读取缓存
- * @access public
- * @param string $name 缓存变量名
- * @param mixed $default 默认值
- * @return mixed
- */
- public function get($name, $default = null)
- {
- $this->readTimes++;
-
- $raw = $this->getRaw($name);
-
- return is_null($raw) ? $default : $this->unserialize($raw['content']);
- }
-
- /**
- * 写入缓存
- * @access public
- * @param string $name 缓存变量名
- * @param mixed $value 存储数据
- * @param int|\DateTime $expire 有效时间 0为永久
- * @return bool
- */
- public function set($name, $value, $expire = null): bool
- {
- $this->writeTimes++;
-
- if (is_null($expire)) {
- $expire = $this->options['expire'];
- }
-
- $expire = $this->getExpireTime($expire);
- $filename = $this->getCacheKey($name);
-
- $dir = dirname($filename);
-
- if (!is_dir($dir)) {
- try {
- mkdir($dir, 0755, true);
- } catch (\Exception $e) {
- // 创建失败
- }
- }
-
- $data = $this->serialize($value);
-
- if ($this->options['data_compress'] && function_exists('gzcompress')) {
- //数据压缩
- $data = gzcompress($data, 3);
- }
-
- $data = "\n" . $data;
- $result = file_put_contents($filename, $data);
-
- if ($result) {
- clearstatcache();
- return true;
- }
-
- return false;
- }
-
-
-
- /**
- * 删除缓存
- * @access public
- * @param string $name 缓存变量名
- * @return bool
- */
- public function delete($name): bool
- {
- $this->writeTimes++;
-
- return DirAndFile::unlink($this->getCacheKey($name));
- }
-
- /**
- * 清除缓存
- * @access public
- * @return bool
- */
- public function clear(): bool
- {
- $this->writeTimes++;
-
- $dirname = $this->options['path'] . $this->options['prefix'];
-
- $this->rmdir($dirname);
-
- return true;
- }
-
-
- /**
- * 删除文件夹
- * @param $dirname
- * @return bool
- */
- private function rmdir($dirname)
- {
- if (!is_dir($dirname)) {
- return false;
- }
-
- $items = new FilesystemIterator($dirname);
-
- foreach ($items as $item) {
- if ($item->isDir() && !$item->isLink()) {
- $this->rmdir($item->getPathname());
- } else {
- DirAndFile::unlink($item->getPathname());
- }
- }
-
- @rmdir($dirname);
-
- return true;
- }
-
-}
diff --git a/vendor/hg/apidoc/src/utils/ConfigProvider.php b/vendor/hg/apidoc/src/utils/ConfigProvider.php
deleted file mode 100644
index 07e2342a6..000000000
--- a/vendor/hg/apidoc/src/utils/ConfigProvider.php
+++ /dev/null
@@ -1,99 +0,0 @@
-[
- 'folder'=>'apidoc'
- ]
- ];
- protected static $config = [];
-
-
- public static function get($field=""){
-
- if (!empty(static::$config)) {
- $config = static::$config;
- }else{
- throw new ErrorException('ConfigProvider get error');
- }
-
- return Helper::getObjectFindByField($config,$field);
- }
-
- public static function set($config){
- if (!(!empty($config['cache']) && !empty($config['cache']['folder']))){
- if (!empty($config['cache'])){
- $config['cache']['folder'] =static::$defaultConfig['cache']['folder'];
- }
- }
- $config = static::handleConfig($config);
- static::$config = $config;
- }
-
- public static function handleConfig($config){
- if (!empty($config['params'])){
- if (!empty($config['params']['header'])){
- $config['params']['header'] = Helper::handleArrayParams($config['params']['header'],"desc",$config);
- }
- if (!empty($config['params']['query'])){
- $config['params']['query'] = Helper::handleArrayParams($config['params']['query'],"desc",$config);
- }
- if (!empty($config['params']['body'])){
- $config['params']['body'] = Helper::handleArrayParams($config['params']['body'],"desc",$config);
- }
- }
- if (!empty($config['responses'])){
- if (!empty($config['responses']['success'])){
- $config['responses']['success'] = Helper::handleArrayParams($config['responses']['success'],"desc",$config);
- }
- if (!empty($config['responses']['error'])){
- $config['responses']['error'] = Helper::handleArrayParams($config['responses']['error'],"desc",$config);
- }
- }
- return $config;
- }
-
- public static function getFeConfig($filterAppKeys=[]){
- $config = static::$config;
-
- $feConfig = [
- 'title' =>!empty($config['title'])?Lang::getLang($config['title'] ):'',
- 'desc' =>!empty($config['title'])?Lang::getLang($config['desc']):'',
- 'apps'=>!empty($config['apps'])?$config['apps']:[],
- 'cache'=>!empty($config['cache'])?$config['cache']:[],
- 'params'=>!empty($config['params'])?$config['params']:[],
- 'responses'=>!empty($config['responses'])?$config['responses']:[],
- 'generator'=>!empty($config['generator'])?$config['generator']:[],
- 'code_template'=>!empty($config['code_template'])?$config['code_template']:[],
- 'share'=>!empty($config['share'])?$config['share']:[],
- ];
- if (!empty($feConfig['apps']) && count($feConfig['apps'])){
- // 清除apps配置中的password
- $feConfig['apps'] = Helper::handleAppsConfig($feConfig['apps'],true,"","",$filterAppKeys);
- }
-
- if (!empty($feConfig['generator'])){
- $generatorList = [];
- $generators= Helper::handleArrayParams($feConfig['generator'],"title");
- foreach ($generators as $item) {
- if (isset($item['enable']) && $item['enable'] === false){
- continue;
- }
- if (!empty($item['form']) && !empty($item['form']['items']) && count($item['form']['items'])){
- $item['form']['items'] = Helper::handleArrayParams( $item['form']['items'],"title");
- }
- $generatorList[]=$item;
- }
- $feConfig['generator'] = $generatorList;
- }
- return $feConfig;
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/DirAndFile.php b/vendor/hg/apidoc/src/utils/DirAndFile.php
deleted file mode 100644
index e97ba0f57..000000000
--- a/vendor/hg/apidoc/src/utils/DirAndFile.php
+++ /dev/null
@@ -1,258 +0,0 @@
-$value,
- 'path'=>$sub_path,
- ];
- $children = static::getDirTree($sub_path);
- if (count($children)){
- $item['children'] = $children;
- }
- $arr[] = $item;
- }
- }
- }
- return $arr;
- }
-
- public static function getClassList($dir){
- if ($handle = opendir($dir)) {
- $file_list=[];
- while (false !== ($file = readdir($handle))) {
- if($file=='..' || $file=='.') continue;
- $filePath = static::formatPath($dir.'/'.$file,"/");
- if(is_file($filePath)) {
- if ('php' !== pathinfo($filePath, \PATHINFO_EXTENSION)) {
- continue;
- }
- $classes = self::findClasses($filePath);
- if (!empty($classes) && count($classes)){
- $file_list[] = [
- 'name'=>$classes[0],
- 'path'=>$filePath
- ];
- }else{
- $file_list=[];
- }
- continue;
- }
- $file_list[$file] = static::getClassList($filePath);
- foreach($file_list[$file] as $infile) {
- $file_list[] = $infile;
- }
- unset($file_list[$file]);
- }
- closedir($handle);
- return $file_list;
- }
- return [];
- }
- public static function getFileList($path){
- if(is_dir($path)) {
- $dirList = scandir($path);
- $list = [];
- foreach ($dirList as $dir) {
- if ($dir == '.' || $dir == '..') {
- continue;
- }
- $sub_path = DirAndFile::formatPath($path . '/' . $dir, "/");
- if (is_file($sub_path)){
- $list[]=[
- 'name'=>$dir,
- 'path'=>$sub_path
- ];;
- }
- }
- return $list;
- }
- return [];
- }
-
- public static function formatPath($path,$type="/"){
- if ($type==="/"){
- $path = str_replace("\\","/",$path);
- }else{
- $path = str_replace("/","\\",$path);
- $path = str_replace("\\\\","\\",$path);
- $endStr = substr($path, -1);
- if ($endStr=='\\'){
- $path = substr($path,0,strlen($path)-1);
- }
- }
- return $path;
- }
-
- private static function findClasses($path)
- {
- $contents = file_get_contents($path);
- $tokens = token_get_all($contents);
-
- $nsTokens = [\T_STRING => true, \T_NS_SEPARATOR => true];
- if (\defined('T_NAME_QUALIFIED')) {
- $nsTokens[T_NAME_QUALIFIED] = true;
- }
-
- $classes = [];
-
- $namespace = '';
- for ($i = 0; isset($tokens[$i]); ++$i) {
- $token = $tokens[$i];
-
- if (!isset($token[1])) {
- continue;
- }
-
- $class = '';
-
- switch ($token[0]) {
- case \T_NAMESPACE:
- $namespace = '';
- // If there is a namespace, extract it
- while (isset($tokens[++$i][1])) {
- if (isset($nsTokens[$tokens[$i][0]])) {
- $namespace .= $tokens[$i][1];
- }
- }
- $namespace .= '\\';
- break;
- case \T_CLASS:
- case \T_INTERFACE:
- case \T_TRAIT:
- // Skip usage of ::class constant
- $isClassConstant = false;
- for ($j = $i - 1; $j > 0; --$j) {
- if (!isset($tokens[$j][1])) {
- break;
- }
-
- if (\T_DOUBLE_COLON === $tokens[$j][0]) {
- $isClassConstant = true;
- break;
- } elseif (!\in_array($tokens[$j][0], [\T_WHITESPACE, \T_DOC_COMMENT, \T_COMMENT])) {
- break;
- }
- }
-
- if ($isClassConstant) {
- break;
- }
-
- // Find the classname
- while (isset($tokens[++$i][1])) {
- $t = $tokens[$i];
- if (\T_STRING === $t[0]) {
- $class .= $t[1];
- } elseif ('' !== $class && \T_WHITESPACE === $t[0]) {
- break;
- }
- }
-
- $classes[] = ltrim($namespace.$class, '\\');
- break;
- default:
- break;
- }
- }
-
- return $classes;
- }
-
-
- /**
- * 读取文件内容
- * @param $fileName
- * @return false|string
- */
- public static function getFileContent(string $fileName): string
- {
- $content = "";
- if (file_exists($fileName)) {
- $handle = fopen($fileName, "r");
- $content = fread($handle, filesize($fileName));
- fclose($handle);
- }
- return $content;
- }
-
- /**
- * 保存文件
- * @param $path
- * @param $str_tmp
- * @return bool
- */
- public static function createFile(string $path, string $str_tmp): bool
- {
- $pathArr = explode("/", $path);
- unset($pathArr[count($pathArr) - 1]);
- $dir = implode("/", $pathArr);
- if (!file_exists($dir)) {
- mkdir($dir, 0775, true);
- }
- $fp = fopen($path, "w") or die("Unable to open file!");
- fwrite($fp, $str_tmp); //存入内容
- fclose($fp);
- return true;
- }
-
- /**
- * 判断文件是否存在后，删除
- * @access private
- * @param string $path
- * @return bool
- */
- public static function unlink(string $path): bool
- {
- try {
- return is_file($path) && unlink($path);
- } catch (\Exception $e) {
- return false;
- }
- }
-
- public static function checkFileExist(string $path)
- {
- try {
- return $path;
- } catch (\Exception $e) {
- return $e;
- }
- }
-
- public static function deleteDir($path) {
- if (!is_dir($path)) {
- return false;
- }
- $open = opendir($path);
- if (!$open) {
- return false;
- }
- while (($v = readdir($open)) !== false) {
- if ('.' == $v || '..' == $v) {
- continue;
- }
- $item = $path . '/' . $v;
- if (is_file($item)) {
- unlink($item);
- continue;
- }
- static::deleteDir($item);
- }
- closedir($open);
- return rmdir($path);
- }
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/Helper.php b/vendor/hg/apidoc/src/utils/Helper.php
deleted file mode 100644
index ba4d7bf9d..000000000
--- a/vendor/hg/apidoc/src/utils/Helper.php
+++ /dev/null
@@ -1,578 +0,0 @@
- $code,
- 'message' => $msg,
- 'data' => $data,
- ];
- $handle_response_json = ConfigProvider::get("handle_response_json");
- if (!empty($handle_response_json) && is_callable($handle_response_json)){
- return $handle_response_json($res);
- }
- return $res;
- }
-
-
-
- /**
- * 将tree树形数据转成list数据
- * @param array $tree tree数据
- * @param string $childName 子节点名称
- * @return array 转换后的list数据
- */
- public static function treeToList(array $tree, string $childName = 'children',string $key = "id",string $parentField = "parent")
- {
- $array = array();
- foreach ($tree as $val) {
- $array[] = $val;
- if (isset($val[$childName])) {
- $children = static::treeToList($val[$childName], $childName);
- if ($children) {
- $newChildren = [];
- foreach ($children as $item) {
- $item[$parentField] = $val[$key];
- $newChildren[] = $item;
- }
- $array = array_merge($array, $newChildren);
- }
- }
- }
- return $array;
- }
-
-
-
- /**
- * 根据一组keys获取所有关联节点
- * @param $tree
- * @param $keys
- */
- public static function getTreeNodesByKeys(array $tree, array $keys, string $field = "id", string $childrenField = "children")
- {
- $list = static::TreeToList($tree, $childrenField, "key");
- $data = [];
- foreach ($keys as $k => $v) {
- $parent = !$k ? "" : $keys[$k - 1];
- foreach ($list as $item) {
- if (((!empty($item['parent']) && $item['parent'] === $parent) || empty($item['parent'])) && $item[$field] == $v) {
- $data[] = $item;
- break;
- }
- }
- }
- return $data;
-
- }
-
- /**
- * 根据一组keys过滤树形数据
- * @param $tree
- * @param $keys
- */
- public static function filterTreeNodesByKeys(array $tree, array $keys, string $field = "id", string $childrenField = "children")
- {
- $data=[];
- foreach ($tree as $k => $item) {
- if (!empty($item[$childrenField])){
- $childrenList = static::filterTreeNodesByKeys($item[$childrenField],$keys,$field,$childrenField);
- if (!empty($childrenList) && count($childrenList)){
- $item[$childrenField] = $childrenList;
- $data[]=$item;
- }
- }else if(!empty($item[$field]) && in_array($item[$field],$keys)){
- $data[]=$item;
- }
- }
- return $data;
- }
-
- /**
- * 替换模板变量
- * @param $temp
- * @param $data
- * @param $prefix
- * @return string|string[]
- */
- public static function replaceTemplate(string $temp, array $data, string $prefix = ""):string
- {
- $str = $temp;
- foreach ($data as $k => $v) {
- $key = '${'. $prefix . $k . '}';
- if (strpos($str, $key) !== false) {
- $str = str_replace($key, $v, $str);
- }
- }
- return $str;
- }
-
- /**
- * 替换当前所选应用/版本的变量
- * @param $temp
- * @param $currentApps
- * @return string|string[]
- */
- public static function replaceCurrentAppTemplate(string $temp,array $currentApps):string
- {
- $str = $temp;
- if (!empty($currentApps) && count($currentApps) > 0) {
- $data = [];
- for ($i = 0; $i <= 3; $i++) {
- if (isset($currentApps[$i])) {
- $appItem = $currentApps[$i];
- foreach ($appItem as $k => $v) {
- $key = 'app[' . $i . '].' . $k;
- $data[$key] = $v;
- }
- } else {
- $appItem = $currentApps[0];
- foreach ($appItem as $k => $v) {
- $key = 'app[' . $i . '].' . $k;
- $data[$key] = "";
- }
- }
- }
- $str = static::replaceTemplate($str, $data);
- }
- return $str;
- }
-
- /**
- * 根据条件获取数组中的值
- * @param array $array
- * @param $query
- * @return mixed|null
- */
- public static function getArrayFind(array $array, $query)
- {
- $res = null;
- if (is_array($array)) {
- foreach ($array as $item) {
- if ($query($item)) {
- $res = $item;
- break;
- }
- }
- }
- return $res;
- }
-
- /**
- * 根据条件获取数组中的index
- * @param array $array
- * @param $query
- * @return mixed|null
- */
- public static function getArrayFindIndex(array $array, $query)
- {
- $res = null;
- if (is_array($array)) {
- foreach ($array as $k=>$item) {
- if ($query($item)) {
- $res = $k;
- break;
- }
- }
- }
- return $res;
- }
-
- /**
- * 查询符合条件的数组
- * @param array $array
- * @param $query
- * @return array
- */
- public static function getArraybyQuery(array $array, $query)
- {
- $res = [];
- if (is_array($array)) {
- foreach ($array as $item) {
- if ($query($item)) {
- $res[] = $item;
- }
- }
- }
- return $res;
- }
-
- /**
- * 对象转为数组
- * @param $object
- * @return mixed
- */
- public static function objectToArray($object) {
- $object = json_decode( json_encode($object),true);
- return $object;
- }
-
- /**
- * 合并对象数组并根据key去重
- * @param string $key
- * @param mixed ...$array
- * @return array
- */
- public static function arrayMergeAndUnique(string $key = "name", ...$array):array
- {
- $arrayByKey = [];
- foreach ($array as $k => $arr) {
- if (!empty($arr) && count($arr)){
- foreach ($arr as $item) {
- if (!empty($item[$key])){
- $arrayByKey[$item[$key]] = $item;
- }
- }
- }
- }
- $newArray = [];
- foreach ($arrayByKey as $item) {
- $newArray[]=$item;
- }
- return $newArray;
- }
-
- /**
- * 初始化当前所选的应用/版本数据
- * @param $appKey
- */
- public static function getCurrentAppConfig(string $appKey,$config=""):array
- {
- if (empty($config)){
- $config = ConfigProvider::get();
- }
- $config['apps'] = static::handleAppsConfig($config['apps'],false,$config);
- if (!(!empty($config['apps']) && count($config['apps']) > 0)) {
- throw new ErrorException("no config apps");
- }
- if (strpos($appKey, ',') !== false) {
- $keyArr = explode(",", $appKey);
- } else {
- $keyArr = [$appKey];
- }
- $currentApps = static::getTreeNodesByKeys($config['apps'], $keyArr, 'key', 'items');
- if (!$currentApps) {
- throw new ErrorException("appKey error", [
- 'appKey' => $appKey
- ]);
- }
- return [
- 'appConfig'=>$currentApps[count($currentApps) - 1],
- 'apps'=>$currentApps
- ];
-
- }
-
- public static function getCacheKey($type,$appKey,$lang="",$key="",$folder="apis"){
- return $folder."/".$type."_".$appKey."_".$lang."_".$key;
- }
-
- /**
- * 处理apps配置参数
- * @param array $apps
- * @return array
- */
- public static function handleAppsConfig(array $apps,$isHandlePassword=false,$config="", $parentKey = "",$filterAppKeys=[]):array
- {
- $appsConfig = [];
- $separ = !empty($parentKey) ? ',' : '';
- foreach ($apps as $app) {
- if (!empty($app['key'])){
- $appKey = $parentKey . $separ . $app['key'];
- $app['appKey'] = $appKey;
- }
- if (!empty($app['password']) && $isHandlePassword===true) {
- unset($app['password']);
- $app['hasPassword'] = true;
- }
- if (!empty($app['title'])){
- $app['title'] = Lang::getLang($app['title'],$config);
- }
- if (!empty($app['items']) && count($app['items']) > 0) {
- $app['items'] = static::handleAppsConfig($app['items'],$isHandlePassword,$config,$appKey,$filterAppKeys);
- }else if (!empty($filterAppKeys) && count($filterAppKeys) && !in_array($appKey,$filterAppKeys)){
- continue;
- }
- if (!empty($app['groups']) && count($app['groups']) > 0){
- $app['groups'] = static::handleGroupsConfig($app['groups']);
- }
- if (!empty($app['params'])){
- if (!empty($app['params']['header']) && count($app['params']['header']) > 0){
- $app['params']['header'] = static::handleArrayParams($app['params']['header'],"desc");
- }
- if (!empty($app['params']['query']) && count($app['params']['query']) > 0){
- $app['params']['query'] = static::handleArrayParams($app['params']['query'],"desc");
- }
- if (!empty($app['params']['body']) && count($app['params']['body']) > 0){
- $app['params']['body'] = static::handleArrayParams($app['params']['body'],"desc");
- }
- }
- $appsConfig[] = $app;
- }
- return $appsConfig;
- }
-
- public static function handleArrayParams($array,$field,$config=""){
- $data = [];
- if (!empty($array) && is_array($array)){
- foreach ($array as $item){
- $item[$field] = Lang::getLang($item[$field],$config);
- if (!empty($item['md'])){
- $item['md'] = ParseMarkdown::getContent("",$item['md']);
- }
- $data[]=$item;
- }
- }
- return $data;
- }
-
- public static function getAllApps(array $apps,$parentKey=""){
- $appList = [];
- $separ = !empty($parentKey)?',':'';
- foreach ($apps as $app) {
- $appKey = $parentKey.$separ.$app['key'];
- if (!empty($app['items']) && count($app['items'])){
- $items = static::getAllApps($app['items'],$appKey);
- $appList = array_merge($appList,$items);
- }else{
- $app['appKey'] = $appKey;
- $appList[]=$app;
- }
- }
- return $appList;
- }
-
- /**
- * 处理groups配置参数
- * @param array $groups
- * @return array
- */
- public static function handleGroupsConfig(array $groups):array
- {
- $groupConfig = [];
- foreach ($groups as $group) {
- if (!empty($group['title'])){
- $group['title'] = Lang::getLang($group['title']);
- }
- if (!empty($group['children']) && count($group['children']) > 0) {
- $group['children'] = static::handleAppsConfig($group['children']);
- }
- $groupConfig[] = $group;
- }
- return $groupConfig;
- }
-
- /**
- * 驼峰转下划线
- *
- * @param string $value
- * @param string $delimiter
- * @return string
- */
- public static function snake(string $value, string $delimiter = '_'): string
- {
- $key = $value;
-
- if (isset(static::$snakeCache[$key][$delimiter])) {
- return static::$snakeCache[$key][$delimiter];
- }
-
- if (!ctype_lower($value)) {
- $value = preg_replace('/\s+/u', '', $value);
-
- $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value));
- }
-
- return static::$snakeCache[$key][$delimiter] = $value;
- }
-
- /**
- * 下划线转驼峰(首字母小写)
- *
- * @param string $value
- * @return string
- */
- public static function camel(string $value): string
- {
- return lcfirst(static::studly($value));
- }
-
-
- /**
- * 下划线转驼峰(首字母大写)
- *
- * @param string $value
- * @return string
- */
- public static function studly(string $value): string
- {
- $value = ucwords(str_replace(['-', '_'], ' ', $value));
- return str_replace(' ', '', $value);
- }
-
- /**
- * 字符串转小写
- *
- * @param string $value
- * @return string
- */
- public static function lower(string $value): string
- {
- return mb_strtolower($value, 'UTF-8');
- }
-
- /**
- * 创建随机key
- * @param string $prefix
- * @return string
- */
- public static function createRandKey(string $prefix=""): string{
- return uniqid($prefix);
- }
-
- /**
- * 创建api的key
- * @param string $path
- * @param string $name
- * @return string
- */
- public static function createApiKey(string $path,string $name=""): string{
- if ($name){
- $key = $path."@".$name;
- }else{
- $key = $path;
- }
- $res = urlencode($key);
- return $res;
- }
-
-
- /**
- * 二维数组根据key排序
- * @param $array
- * @param string $field
- * @param int $order
- * @return mixed
- */
- public static function arraySortByKey($array, $field="sort",$order=SORT_ASC){
- $sorts = [];
- foreach ($array as $key => $row) {
- $sorts[$key] = isset($row[$field])?$row[$field]:"";
- }
- array_multisort($sorts, $order, $array);
- return $array;
- }
-
-
- /**
- * 过滤所有空格换行符
- * @param $str
- * @return array|string|string[]
- */
- public static function trimEmpty($str){
- $search = array(" "," ","\n","\r","\t");
- $replace = array("","","","","");
- return str_replace($search, $replace, $str);
- }
-
-
- public static function getObjectFindByField(array $data,string $name = null)
- {
- // 无参数时获取所有
- if (empty($name)) {
- return $data;
- }
- if (false === strpos($name, '.')) {
- $name = strtolower($name);
- return $data[$name] ?? [];
- }
- $name = explode('.', $name);
- $name[0] = strtolower($name[0]);
- $result = $data;
- // 按.拆分成多维数组进行判断
- foreach ($name as $val) {
- if (isset($result[$val])) {
- $result = $result[$val];
- } else {
- return [];
- }
- }
- return $result;
- }
-
-
- public static function inArrayBuyKeyword(array $arr,string $keyword):bool{
- $is = false;
- foreach ($arr as $item) {
- if (strpos($item, $keyword) !== false){
- $is=true;
- break;
- }
- }
- return $is;
- }
-
- /**
- * 处理接口请求类型为数组
- * @param $method
- * @return array|false|string[]
- */
- public static function handleApiMethod($method){
- if (is_array($method)){
- return $method;
- }else if (strpos($method, ',') !== false){
- return explode(",", strtoupper($method));
- }else {
- return [strtoupper($method)];
- }
- }
-
-
- /**
- * 获取数组中指定keys的值为新数组
- * @param array $array
- * @param array $keys
- * @return array
- */
- public static function getArrayValuesByKeys(array $array,array $keys){
- $data = [];
- foreach ($keys as $key) {
- if (isset($array[$key])){
- $data[$key]=$array[$key];
- }else{
- $data[$key]="";
- }
- }
- return $data;
- }
- public static function arrayKeyFirst($array){
- if (function_exists('array_key_first')) {
- return array_key_first($array);
- }else{
- foreach($array as $key => $unused) {
- return $key;
- }
- return NULL;
- }
- }
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/Lang.php b/vendor/hg/apidoc/src/utils/Lang.php
deleted file mode 100644
index d765b30d4..000000000
--- a/vendor/hg/apidoc/src/utils/Lang.php
+++ /dev/null
@@ -1,59 +0,0 @@
-1 ? trim($key[1]):"";
- if (!empty($langKey)){
- return $langGetFunction($langKey);
- }
- }
- }
- return $string;
- }
-
- /**
- * 二维数组设置指定字段的多语言
- * @param $array
- * @param $field
- * @return array
- */
- public static function getArrayLang($array,$field,$config=[]){
- $data = [];
- if (!empty($array) && is_array($array)){
- foreach ($array as $item){
- $item[$field] = static::getLang($item[$field],$config);
- $data[]=$item;
- }
- }
- return $data;
- }
-
-
-}
\ No newline at end of file
diff --git a/vendor/hg/apidoc/src/utils/Request.php b/vendor/hg/apidoc/src/utils/Request.php
deleted file mode 100644
index bd22bf9cc..000000000
--- a/vendor/hg/apidoc/src/utils/Request.php
+++ /dev/null
@@ -1,46 +0,0 @@
-get = $_GET;
- $this->post = $_POST;
- $this->method = !empty($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:"";
- }
-
- public function get(){
- return $this->get;
- }
-
- public function post(){
- return $this->post;
- }
-
- public function input(){
- $input = file_get_contents('php://input');
- $inputObj = json_decode($input);
- return Helper::objectToArray($inputObj);
- }
-
- public function param(){
- $config = ConfigProvider::get();
- if (!empty($config['request_params'])){
- return $config['request_params'];
- }
- $method = !empty($this->method)?$this->method:"GET";
- if ($method == "GET"){
- return $this->get;
- }
- return $this->input();
- }
-
-}
\ No newline at end of file
From 39b3e124cd829c845c05925938c12df6af4f8c68 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 14 Jun 2024 15:56:33 +0800
Subject: [PATCH 016/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0'=E6=9D=91'?=
=?UTF-8?q?=E5=92=8C'=E5=A4=A7=E9=98=9F'=E5=88=B0=E4=B8=8D=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E7=99=BB=E5=BD=95=E7=9A=84API=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/IndexController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 8dd609b2b..2f10d4441 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -22,7 +22,7 @@ use Webman\RedisQueue\Redis;
class IndexController extends BaseApiController
{
- public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street'];
+ public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street','village','brigade'];
public function index()
{
From 218bbdfe4b7ad1fafd7f50c4e284d134ceab2c08 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 14 Jun 2024 16:05:48 +0800
Subject: [PATCH 017/145] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/logic/user/UserLogic.php | 16 +++++++++++++++-
app/common/lists/user/UserShipLists.php | 7 +++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 353b97607..ebc8d3013 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -16,6 +16,7 @@ namespace app\admin\logic\user;
use app\common\enum\user\UserTerminalEnum;
use app\common\logic\BaseLogic;
use app\common\model\user\User;
+use app\common\model\user\UserAddress;
use think\facade\Db;
use app\common\service\FileService;
use Webman\Config;
@@ -73,7 +74,7 @@ class UserLogic extends BaseLogic
Db::startTrans();
try {
- $res=User::create([
+ $data=[
'avatar' => $avatar,
'real_name' =>'',
'nickname' => '用户'.time(),
@@ -81,6 +82,19 @@ class UserLogic extends BaseLogic
'password' => $password,
'mobile' => $params['mobile'],
'user_money' => $params['user_money']
+ ];
+ $res=User::create($data);
+ UserAddress::create([
+ 'uid' => $res['id'],
+ 'real_name' => $data['nickname'],
+ 'mobile' => $params['mobile'],
+ 'province' => $params['province'],
+ 'city' => $params['city'],
+ 'district' => $params['district'],
+ 'street' => $params['street'],
+ 'village' => $params['village'],
+ 'brigade' => $params['brigade'],
+ 'is_default' => 1,
]);
Db::commit();
diff --git a/app/common/lists/user/UserShipLists.php b/app/common/lists/user/UserShipLists.php
index c33e1f700..4a603a351 100644
--- a/app/common/lists/user/UserShipLists.php
+++ b/app/common/lists/user/UserShipLists.php
@@ -38,12 +38,15 @@ class UserShipLists extends BaseAdminDataLists
{
$field = "id,title";
+ $arr[]=['id'=>0,'title'=>'普通会员'];
+
$lists = UserShip::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->field($field)
->order('sort desc')
- ->select()->toArray();
- return $lists;
+ ->select()
+ ->toArray();
+ return array_merge($arr,$lists);
}
From 0a0fba85dfda7bd4e7558a28a34915787f760c75 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 16:16:42 +0800
Subject: [PATCH 018/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../finance/FinancialTransfersController.php | 3 +-
.../FinancialTransfersLists.php | 65 +++++++++++++++++++
2 files changed, 66 insertions(+), 2 deletions(-)
create mode 100644 app/store/lists/financial_transfers/FinancialTransfersLists.php
diff --git a/app/store/controller/finance/FinancialTransfersController.php b/app/store/controller/finance/FinancialTransfersController.php
index 850222a6a..af30a569c 100644
--- a/app/store/controller/finance/FinancialTransfersController.php
+++ b/app/store/controller/finance/FinancialTransfersController.php
@@ -3,7 +3,7 @@
namespace app\store\controller\finance;
-use app\admin\lists\financial_transfers\FinancialTransfersLists;
+use app\store\lists\financial_transfers\FinancialTransfersLists;
use app\admin\logic\financial_transfers\FinancialTransfersLogic;
use app\admin\validate\financial_transfers\FinancialTransfersValidate;
use app\common\controller\Definitions;
@@ -13,7 +13,6 @@ use hg\apidoc\annotation as ApiDoc;
#[ApiDoc\title('提现列表')]
class FinancialTransfersController extends BaseAdminController
{
-// public $notNeedLogin = ['confirmation', 'app_update', 'test'];
#[
ApiDoc\Title('财务流水'),
ApiDoc\url('/store/finance/financialTransfers/lists'),
diff --git a/app/store/lists/financial_transfers/FinancialTransfersLists.php b/app/store/lists/financial_transfers/FinancialTransfersLists.php
new file mode 100644
index 000000000..7c5f68a21
--- /dev/null
+++ b/app/store/lists/financial_transfers/FinancialTransfersLists.php
@@ -0,0 +1,65 @@
+ [ 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'],
+ ];
+ }
+
+
+ /**
+ * @notes 获取列表
+ * @return array
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @author admin
+ * @date 2024/06/14 10:10
+ */
+ public function lists(): array
+ {
+ $this->searchWhere[] = ['store_id','=',$this->adminInfo['store_id']];
+ return FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere)
+ ->limit($this->limitOffset, $this->limitLength)
+ ->order(['id' => 'desc'])
+ ->select()
+ ->toArray();
+ }
+
+
+ /**
+ * @notes 获取数量
+ * @return int
+ * @author admin
+ * @date 2024/06/14 10:10
+ */
+ public function count(): int
+ {
+ return FinancialTransfers::where($this->searchWhere)->count();
+ }
+
+}
\ No newline at end of file
From 5de9a7f264bbb03428be726099c7b0af2a39b05a Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 16:37:05 +0800
Subject: [PATCH 019/145] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FinancialTransfersLists.php | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/admin/lists/financial_transfers/FinancialTransfersLists.php b/app/admin/lists/financial_transfers/FinancialTransfersLists.php
index a9a3b9a0a..8c989e285 100644
--- a/app/admin/lists/financial_transfers/FinancialTransfersLists.php
+++ b/app/admin/lists/financial_transfers/FinancialTransfersLists.php
@@ -26,7 +26,8 @@ class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchI
public function setSearch(): array
{
return [
- '=' => ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'],
+ '=' => ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time','create_time'],
+ 'between_time' => 'create_time',
];
}
@@ -42,12 +43,23 @@ class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchI
*/
public function lists(): array
{
- return FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere)
-// ->field(['id', 'store_id', 'admin_id', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time'])
+ $data = FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
+ foreach ($data as &$value){
+ if($value['initiation_time']){
+ $value['initiation_time'] = date('Y-m-d H:i:s',$value['initiation_time']);
+ }
+
+ if($value['confirmation_time']){
+ $value['confirmation_time'] = date('Y-m-d H:i:s',$value['confirmation_time']);
+
+ }
+
+ }
+ return $data;
}
From b18561b28cd01e11cdde731fb9b742af7b5c607d Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 16:39:35 +0800
Subject: [PATCH 020/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/store/controller/finance/FinancialTransfersController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/store/controller/finance/FinancialTransfersController.php b/app/store/controller/finance/FinancialTransfersController.php
index af30a569c..0f103d94f 100644
--- a/app/store/controller/finance/FinancialTransfersController.php
+++ b/app/store/controller/finance/FinancialTransfersController.php
@@ -62,7 +62,7 @@ class FinancialTransfersController extends BaseAdminController
$result = FinancialTransfersLogic::dealchange($data,$params['id']);
if (true === $result) {
- return $this->success('操作成功' );
+ return $this->success('操作成功',[],1,1 );
}
return $this->fail(FinancialTransfersLogic::getError());
From e8ee8531d0e4910462e42c55ddf61386f08ff16e Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 14 Jun 2024 16:40:48 +0800
Subject: [PATCH 021/145] =?UTF-8?q?feat(UserShipLists):=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=20ship=20=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E6=8F=8F?=
=?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/common/lists/user/UserShipLists.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/common/lists/user/UserShipLists.php b/app/common/lists/user/UserShipLists.php
index 4a603a351..e4ea31103 100644
--- a/app/common/lists/user/UserShipLists.php
+++ b/app/common/lists/user/UserShipLists.php
@@ -38,7 +38,7 @@ class UserShipLists extends BaseAdminDataLists
{
$field = "id,title";
- $arr[]=['id'=>0,'title'=>'普通会员'];
+ $arr[]=['id'=>0,'title'=>'一般用户'];
$lists = UserShip::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
From 449ecc0508db9f27192bd5913080827ec0a3e7c0 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 17:35:04 +0800
Subject: [PATCH 022/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E5=95=86=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../financial_transfers/FinancialTransfersController.php | 2 +-
app/api/lists/product/ProductLists.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/admin/controller/financial_transfers/FinancialTransfersController.php b/app/admin/controller/financial_transfers/FinancialTransfersController.php
index c014be0b8..9f98930d8 100644
--- a/app/admin/controller/financial_transfers/FinancialTransfersController.php
+++ b/app/admin/controller/financial_transfers/FinancialTransfersController.php
@@ -58,7 +58,7 @@ class FinancialTransfersController extends BaseAdminController
$result = FinancialTransfersLogic::dealchange($update,$params['id']);
if (true === $result) {
- return $this->success('转账成功' );
+ return $this->success('转账成功',[],1,1);
}
return $this->fail(FinancialTransfersLogic::getError());
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index f757b8f00..43ae36cf0 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -88,7 +88,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
}
}
if(!$found){
- $this->searchWhere[]=['store_id','=',2];
+ $this->searchWhere[]=['store_id','=',5];
}
$class_all=$this->request->get('class_all');
$where=[];
@@ -159,7 +159,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
}
}
if(!$found){
- $this->searchWhere[]=['store_id','=',2];
+ $this->searchWhere[]=['store_id','=',5];
}
$class_all=$this->request->get('class_all');
$where=[];
From 46ba3cb31fc71b9e7da52f0b0faa323339292870 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 17:44:59 +0800
Subject: [PATCH 023/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/product/ProductController.php | 2 +-
app/api/lists/product/ProductLists.php | 6 ++++--
app/common/controller/BaseLikeController.php | 4 ++--
app/common/service/JsonService.php | 11 ++++++++++-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/app/api/controller/product/ProductController.php b/app/api/controller/product/ProductController.php
index c10aeaceb..804325ac7 100644
--- a/app/api/controller/product/ProductController.php
+++ b/app/api/controller/product/ProductController.php
@@ -12,7 +12,7 @@ class ProductController extends BaseApiController{
*/
public function lists(){
- return $this->dataLists(new ProductLists());
+ return $this->dataLists(new ProductLists(),1);
}
/**
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 43ae36cf0..5cf03daad 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -88,7 +88,8 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
}
}
if(!$found){
- $this->searchWhere[]=['store_id','=',5];
+ $store_id = DictType::where('type','store')->value('remark')??5;
+ $this->searchWhere[]=['store_id','=',$store_id];
}
$class_all=$this->request->get('class_all');
$where=[];
@@ -159,7 +160,8 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
}
}
if(!$found){
- $this->searchWhere[]=['store_id','=',5];
+ $store_id = DictType::where('type','store')->value('remark')??5;
+ $this->searchWhere[]=['store_id','=',$store_id];
}
$class_all=$this->request->get('class_all');
$where=[];
diff --git a/app/common/controller/BaseLikeController.php b/app/common/controller/BaseLikeController.php
index 8b020b6e3..56a6b1fd1 100644
--- a/app/common/controller/BaseLikeController.php
+++ b/app/common/controller/BaseLikeController.php
@@ -46,7 +46,7 @@ class BaseLikeController extends BaseController
* @author 令狐冲
* @date 2021/7/8 00:40
*/
- protected function dataLists(BaseDataLists $lists = null)
+ protected function dataLists(BaseDataLists $lists = null,$remark = 0)
{
//列表类和控制器一一对应，"app/应用/controller/控制器的方法" =》"app\应用\lists\"目录下
//（例如："app/admin/controller/auth/AdminController.php的lists()方法" =》 "app/admin/lists/auth/AminLists.php")
@@ -55,7 +55,7 @@ class BaseLikeController extends BaseController
// $listName = str_replace('.', '\\', App::getNamespace() . '\\lists\\' . $this->request->controller() . ucwords($this->request->action()));
// $lists = invoke($listName);
}
- return JsonService::dataLists($lists);
+ return JsonService::dataLists($lists,$remark);
}
diff --git a/app/common/service/JsonService.php b/app/common/service/JsonService.php
index 7dbb069ac..273eba127 100644
--- a/app/common/service/JsonService.php
+++ b/app/common/service/JsonService.php
@@ -4,10 +4,13 @@
namespace app\common\service;
+use app\api\logic\store\StoreLogic;
use app\common\enum\ExportEnum;
use app\common\lists\BaseDataLists;
use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsExtendInterface;
+use app\common\model\dict\DictType;
+use app\common\model\system_store\SystemStore;
use support\Response;
use support\exception\BusinessException;
@@ -90,7 +93,7 @@ class JsonService
* @author 令狐冲
* @date 2021/7/28 11:15
*/
- public static function dataLists(BaseDataLists $lists)
+ public static function dataLists(BaseDataLists $lists,$remark)
{
//获取导出信息
if ($lists->export == ExportEnum::INFO && $lists instanceof ListsExcelInterface) {
@@ -109,6 +112,12 @@ class JsonService
'page_no' => $lists->pageNo,
'page_size' => $lists->pageSize,
];
+ $store_id = DictType::where('type','store')->value('remark')??5;
+ if($remark){
+ $data['store'] = StoreLogic::search([
+ 'id' => $store_id
+ ]);
+ }
$data['extend'] = [];
if ($lists instanceof ListsExtendInterface) {
$data['extend'] = $lists->extend();
From 189c872815ea06ef5bd26514f0f4b524d7dac8b6 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 17:53:31 +0800
Subject: [PATCH 024/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/store/logic/WorkbenchLogic.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index bbfdaf095..e3a2f26db 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -563,6 +563,11 @@ class WorkbenchLogic extends BaseLogic
//总的营业额的统计 总的利润的统计 总的成本合集的统计 总的加到保证金的
$all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]);
+ if(isset($params['month']) && $params['month']){
+ $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']])
+ ->whereMonth('create_time', $params['month'])
+ ;
+ }
$turnover_all = $all
->sum('pay_price');
$profit_all = $all
From 305707d179056b0a83cceb19e780bcd073f5038d Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 17:55:56 +0800
Subject: [PATCH 025/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/store/logic/WorkbenchLogic.php | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index e3a2f26db..bb7e57183 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -563,10 +563,24 @@ class WorkbenchLogic extends BaseLogic
//总的营业额的统计 总的利润的统计 总的成本合集的统计 总的加到保证金的
$all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]);
+
+ $deposit_all = SystemStore::where('id',$params['store_id'])
+ ->value('paid_deposit');
+
+ $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id'])
+ ->where('status',YesNoEnum::YES)
+ ->sum('receipts');
if(isset($params['month']) && $params['month']){
$all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']])
->whereMonth('create_time', $params['month'])
;
+ $deposit_all = SystemStore::where('id',$params['store_id'])
+ ->whereMonth('create_time', $params['month'])
+ ->value('paid_deposit');
+ $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id'])
+ ->where('status',YesNoEnum::YES)
+ ->whereMonth('create_time', $params['month'])
+ ->sum('receipts');
}
$turnover_all = $all
->sum('pay_price');
@@ -574,11 +588,8 @@ class WorkbenchLogic extends BaseLogic
->sum('profit');
$cost_all = $all
->sum('cost');
- $deposit_all = SystemStore::where('id',$params['store_id'])
- ->value('paid_deposit');
- $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id'])
- ->where('status',YesNoEnum::YES)
- ->sum('receipts');
+
+
$time = self::getLastSevenDays();
From 41ff69e0d9eefde1c0dcff1bd37b2570da0f4ecd Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 18:16:52 +0800
Subject: [PATCH 026/145] =?UTF-8?q?=E5=85=BC=E5=AE=B92=E7=BA=A7=E5=92=8C1?=
=?UTF-8?q?=E7=BA=A7=E5=88=AB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/lists/product/ProductLists.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 5cf03daad..4abfe93cb 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -94,12 +94,17 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
$class_all=$this->request->get('class_all');
$where=[];
if($class_all){
+ //查3级别的
$arr=Cate::where('pid',$class_all)->column('id');
if($arr){
$arr2=Cate::where('pid','in',$arr)->column('id');
$where[]=['cate_id','in',array_merge($arr,$arr2)];
}
}
+ if(empty($where)){
+ //2或者1
+ $where[]=['cate_id','=',$class_all];
+ }
$this->searchWhere[]=['status','=',1];
@@ -172,6 +177,10 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
$where[]=['cate_id','in',array_merge($arr,$arr2)];
}
}
+ if(empty($where)){
+ //2或者1
+ $where[]=['cate_id','=',$class_all];
+ }
$M_store_id=$this->request->__get('store_id');
$this->searchWhere[]=['status','=',1];
$this->searchWhere[]=['stock','>',0];
From 6e685257798284db503934d2f7a0e686fe5e99b9 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 14 Jun 2024 18:19:05 +0800
Subject: [PATCH 027/145] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/lists/product/ProductLists.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 4abfe93cb..a11a486c2 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -101,7 +101,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
$where[]=['cate_id','in',array_merge($arr,$arr2)];
}
}
- if(empty($where)){
+ if(empty($where) && $class_all){
//2或者1
$where[]=['cate_id','=',$class_all];
}
@@ -177,7 +177,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
$where[]=['cate_id','in',array_merge($arr,$arr2)];
}
}
- if(empty($where)){
+ if(empty($where)&& $class_all){
//2或者1
$where[]=['cate_id','=',$class_all];
}
From b3d6645953cdbe3a7ddab124098ea22ee76dee6a Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 15 Jun 2024 09:38:59 +0800
Subject: [PATCH 028/145] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/logic/user/UserLogic.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index 0428c03a3..5ba8704c4 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -6,6 +6,7 @@ namespace app\api\logic\user;
use app\common\{logic\BaseLogic,
model\dict\DictData,
model\finance\CapitalFlow,
+ model\store_finance_flow\StoreFinanceFlow,
model\store_order\StoreOrder,
model\system_store\DeliveryService,
model\system_store\SystemStore,
@@ -66,7 +67,8 @@ class UserLogic extends BaseLogic
public static function info($uid)
{
$data = User::with(['userShip'])->where('id',$uid)
- ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship')
+ ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship
+ ,purchase_funds')
->find();
//判断是不是员工
if($data){
@@ -88,6 +90,10 @@ class UserLogic extends BaseLogic
$data['store_id'] = $check['store_id'];
}
}
+ $data['return_money'] = StoreFinanceFlow::
+ where(['user_id'=>$uid,'status'=>0,'financial_pm'=>0])
+ ->sum('number');
+
}else{
$data = [];
}
From 03ea382ab7f6707c1ccb480130ce02b0cb1b9b79 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jun 2024 09:44:23 +0800
Subject: [PATCH 029/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?=
=?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=BE=97?=
=?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lists/store_product/StoreProductLists.php | 2 +-
.../logic/store_product/StoreProductLogic.php | 16 ++++-----
app/admin/logic/user/UserLogic.php | 9 ++---
app/admin/validate/user/UserValidate.php | 4 +--
app/api/controller/IndexController.php | 5 +--
app/common/logic/PayNotifyLogic.php | 36 ++++++++++++++++---
app/common/logic/StoreFinanceFlowLogic.php | 19 +++++++++-
app/store/controller/user/UserController.php | 8 ++---
app/store/lists/user/UserLists.php | 4 ++-
9 files changed, 75 insertions(+), 28 deletions(-)
diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php
index a32f501f4..7c0c9836e 100644
--- a/app/admin/lists/store_product/StoreProductLists.php
+++ b/app/admin/lists/store_product/StoreProductLists.php
@@ -46,7 +46,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
public function lists(): array
{
return StoreProduct::where($this->searchWhere)
- ->field(['id', 'image', 'store_name', 'cate_id', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code'])
+ ->field(['id', 'image', 'store_name','swap', 'cate_id', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function ($item) {
diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 24e69d270..e88207b5f 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -192,15 +192,15 @@ class StoreProductLogic extends BaseLogic
self::cate_update($cate_id, $two['id'], $store_id, 3);
self::cate_update($two['id'], $two['pid'], $store_id, 2);
self::cate_update($two['pid'], 0, $store_id, 1);
+ }else{
+ if ($one['pid'] == 0) {
+ self::cate_update($one['id'], 0, $store_id, 1);
+ } else {
+ self::cate_update($one['id'], $one['pid'], $store_id, 2);
+ self::cate_update($one['pid'], 0, $store_id, 1);
+ }
}
- } else {
- if ($one['pid'] == 0) {
- self::cate_update($one['id'], 0, $store_id, 1);
- } else {
- self::cate_update($one['id'], $one['pid'], $store_id, 2);
- self::cate_update($one['pid'], 0, $store_id, 1);
- }
- }
+ }
}
}
diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index ebc8d3013..a88acd7fc 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -68,7 +68,7 @@ class UserLogic extends BaseLogic
public static function StoreAdd(array $params)
{
$passwordSalt = Config::get('project.unique_identification');
- $password = create_password($params['password'], $passwordSalt);
+ $password = create_password(123456, $passwordSalt);
$defaultAvatar = config('project.default_image.admin_avatar');
$avatar = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : $defaultAvatar;
@@ -81,7 +81,8 @@ class UserLogic extends BaseLogic
'account' => $params['mobile'],
'password' => $password,
'mobile' => $params['mobile'],
- 'user_money' => $params['user_money']
+ 'user_ship' => $params['user_ship'],
+
];
$res=User::create($data);
UserAddress::create([
@@ -90,17 +91,17 @@ class UserLogic extends BaseLogic
'mobile' => $params['mobile'],
'province' => $params['province'],
'city' => $params['city'],
- 'district' => $params['district'],
+ 'area' => $params['area'],
'street' => $params['street'],
'village' => $params['village'],
'brigade' => $params['brigade'],
'is_default' => 1,
]);
-
Db::commit();
return $res;
} catch (\Exception $e) {
Db::rollback();
+ d($e);
self::setError($e->getMessage());
return false;
}
diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php
index 43df446b7..8729791c5 100644
--- a/app/admin/validate/user/UserValidate.php
+++ b/app/admin/validate/user/UserValidate.php
@@ -30,7 +30,7 @@ class UserValidate extends BaseValidate
'user_money' => 'float',
'province' => 'require',
'city' => 'require',
- 'district' => 'require',
+ 'area' => 'require',
'street' => 'require',
'village' => 'require',
'brigade' => 'require',
@@ -54,7 +54,7 @@ class UserValidate extends BaseValidate
'user_money' => '用户余额',
'province' => '省',
'city' => '市',
- 'district' => '区',
+ 'area' => '区',
'street' => '街道',
'village' => '村',
'brigade' => ' 队',
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 2f10d4441..d3a680899 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -26,10 +26,11 @@ class IndexController extends BaseApiController
public function index()
{
- $arr = StoreBranchProduct::where('store_id', 5)->select();
+ $arr = StoreBranchProduct::select();
foreach ($arr as $item) {
- StoreProductLogic::updateGoodsclass($item['cate_id'], 5);
+ StoreProductLogic::updateGoodsclass($item['cate_id'], $item['store_id']);
}
+ d(1);
try {
$wechat = new PayService(1);
$time = time();
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 57381099b..4f2f0c77d 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -298,15 +298,41 @@ class PayNotifyLogic extends BaseLogic
}
$fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2);
$count_frees=bcadd($count_frees,bcmul($fees,3,2),2);
-
- $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得
+ $village_uid=0;
+ $brigade_uid=0;
+ //查询用户对应的村长和队长
+ if($order['uid']>0){
+ $address=UserAddress::where(['uid'=>$order['uid'],'is_default'=>1])->find();
+ if($address){
+ $arr1=UserAddress::where(['village'=>$address['village'],'is_default'=>1])->column('uid');
+ if($arr1){
+ $village_uid=User::where('id','in',$arr1)->where('user_ship',2)->value('id');
+ }
+ $arr2=UserAddress::where(['village'=>$address['village'],'brigade'=>$address['brigade'],'is_default'=>1])->column('uid');
+ if($arr2){
+ $brigade_uid=User::where('id','in',$arr1)->where('user_ship',3)->value('id');
+ }
+ }
+ }
+ //村长获得
+ if($village_uid>0){
+ $financeLogic->other_arr['vip_uid'] = $village_uid;
+ }
+ $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']);
$financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
- $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得
+ //队长获得
+ if($brigade_uid>0){
+ $financeLogic->other_arr['vip_uid'] = $brigade_uid;
+ }
+ $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']);
$financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
- $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得
+ //其他获得
+ $financeLogic->other_arr['vip_uid']=0;
+ $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']);
$financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
}
- $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得
+ //供应链订单获得
+ $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']);
$financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
// }
$financeLogic->save();
diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php
index dfcf265aa..c2ad88d52 100644
--- a/app/common/logic/StoreFinanceFlowLogic.php
+++ b/app/common/logic/StoreFinanceFlowLogic.php
@@ -49,7 +49,7 @@ class StoreFinanceFlowLogic extends BaseLogic
if (empty($this->financeSn)) {
$this->financeSn = $this->getSn();
}
- $this->list[] = [
+ $data=[
'order_id' => $this->order['id'],
'transaction_id' => $transaction_id,
'order_sn' => $this->order['order_id'],
@@ -65,6 +65,23 @@ class StoreFinanceFlowLogic extends BaseLogic
'financial_record_sn' => $this->financeSn . ($this->index++),
'create_time'=>time()
];
+ switch($financialType){
+ case OrderEnum::MERCHANT_ORDER_OBTAINS: // 商户
+ case OrderEnum::ORDER_MARGIN: // 商户保证金
+ $data['type'] =OrderEnum::MERCHANT;
+ break;
+ case OrderEnum::PLATFORM_ORDER_OBTAINS: // 平台
+ case OrderEnum::ORDER_HANDLING_FEES: // 手续费
+ $data['type'] =OrderEnum::PLATFORM;
+ break;
+ case OrderEnum::SUPPLIER_ORDER_OBTAINS: // 供应链
+ $data['type'] =OrderEnum::SUPPLIER;
+ break;
+ default: // 用户
+ $data['type'] =OrderEnum::USER;
+ break;
+ }
+ $this->list[] = $data;
}
public function save()
diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php
index 547f4f366..4a6083856 100644
--- a/app/store/controller/user/UserController.php
+++ b/app/store/controller/user/UserController.php
@@ -22,12 +22,12 @@ class UserController extends BaseAdminController
public function add()
{
$params = (new UserValidate())->post()->goCheck('storeAdd');
- d($params);
$result = UserLogic::StoreAdd($params);
- if (true === $result) {
- return $this->success('添加成功', [], 1, 1);
+ if (UserLogic::hasError() ) {
+ return $this->fail(UserLogic::getError());
}
- return $this->fail(UserLogic::getError());
+ return $this->success('添加成功', [], 1, 1);
+
}
diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index 379d078f8..1d4563950 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -6,6 +6,7 @@ namespace app\store\lists\user;
use app\store\lists\BaseAdminDataLists;
use app\common\model\user\User;
+use app\common\model\user\UserShip;
class UserLists extends BaseAdminDataLists
{
@@ -34,7 +35,7 @@ class UserLists extends BaseAdminDataLists
public function lists(): array
{
- $field = "id,nickname,real_name,sex,avatar,account,mobile,user_money,create_time";
+ $field = "id,nickname,real_name,sex,avatar,account,mobile,user_money,user_ship,create_time";
$lists = User::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->field($field)
@@ -42,6 +43,7 @@ class UserLists extends BaseAdminDataLists
->select()->each(function($data){
$data['sex_text'] = $data->sex_text;
$data['mobile'] = substr_replace($data['mobile'], '****', 3, 4);
+ $data['user_ship_name'] =$data['user_ship']==0?'一般用户':UserShip::where('id',$data['user_ship'])->value('title');
})->toArray();
return $lists;
}
From 112e9b9c4a55370d53de9da9d559cf0d7c2b54fc Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 15 Jun 2024 09:46:41 +0800
Subject: [PATCH 030/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=85=E5=80=BC?=
=?UTF-8?q?=E5=88=B0=E7=94=A8=E6=88=B7=E5=BE=97=E9=87=87=E8=B4=AD=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/common/logic/PayNotifyLogic.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 57381099b..e78e5b790 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -177,7 +177,8 @@ class PayNotifyLogic extends BaseLogic
return true;
}
bcscale(2);
- $user->now_money = bcadd($user->now_money, $price, 2);
+// $user->now_money = bcadd($user->now_money, $price, 2);//v.1
+ $user->purchase_funds = bcadd($user->purchase_funds, $price, 2);
$user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2);
$user->save();
From 975a296b468c1bc4ef19bbe93409362a23216627 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jun 2024 10:18:32 +0800
Subject: [PATCH 031/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BA=93?=
=?UTF-8?q?=E5=AD=98=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=E5=92=8C=E5=BA=93?=
=?UTF-8?q?=E5=AD=98=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../store_product/StoreProductController.php | 5 +-
.../logic/store_order/StoreOrderLogic.php | 15 +++--
.../StoreBranchProductExchange.php | 24 +++++++
app/queue/redis/StoreStorageSend.php | 64 ++++++++++++++++++-
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php
diff --git a/app/admin/controller/store_product/StoreProductController.php b/app/admin/controller/store_product/StoreProductController.php
index 0bfbb0d32..4e9046b04 100644
--- a/app/admin/controller/store_product/StoreProductController.php
+++ b/app/admin/controller/store_product/StoreProductController.php
@@ -98,15 +98,16 @@ class StoreProductController extends BaseAdminController
{
$product_arr = $this->request->post('product_arr');
$store_arr = $this->request->post('store_arr');
+ $stock_type = $this->request->post('stock_type',1);
if (count($store_arr) == 1) {
$store_id = $store_arr[0];
foreach ($product_arr as $key => $arr) {
- Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
+ Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
}
} else {
foreach ($product_arr as $key => $arr) {
foreach ($store_arr as $k => $store_id) {
- Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
+ Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
}
}
}
diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index 512c18b7b..db652b03e 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -56,9 +56,14 @@ class StoreOrderLogic extends BaseLogic
$cart_select[$k]['price'] = $find['price'];
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
$cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
-
+
+ if ($user && $user['user_ship'] == 4) {
+ $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2);
+ $cart_select[$k]['deduction_price'] =$deduction_price_count;
+ self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
+ }
//利润
- $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
+ // $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
$cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本
$cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额
$cart_select[$k]['product_id'] = $find['product_id'];
@@ -84,10 +89,10 @@ class StoreOrderLogic extends BaseLogic
self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2);
self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2);
self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2);
- self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
+ // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
}
//TODO 收单打9.9折 会员按照比例打折 等级按照充值去升级
- $pay_price = self::$pay_price;
+ $pay_price = bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
$vipPrice = 0;
//成本价 收益
$order = [
@@ -95,7 +100,7 @@ class StoreOrderLogic extends BaseLogic
'order_id' =>$params['order_id'] ?? getNewOrderId('PF'),
'total_price' => self::$total_price, //总价
'cost' => self::$cost,//成本价
- 'profit' => self::$profit,//利润
+ 'profit' => 0,//利润
'pay_price' => $pay_price,//后期可能有降价抵扣
'vip_price' => $vipPrice,
'total_num' => count($cart_select),//总数
diff --git a/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php
new file mode 100644
index 000000000..24ad4cbc3
--- /dev/null
+++ b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php
@@ -0,0 +1,24 @@
+findOrEmpty()->toArray();
+ if($stock_type == 1){
+ $this->ordinary($product_arr,$store_id,$admin_id,$find);
+ }elseif($stock_type == 2){
+ $this->exchange($product_arr,$store_id,$admin_id,$find);
+ }
+ }
+
+ /**普通 */
+ public function ordinary($product_arr,$store_id,$admin_id,$find){
$store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
if ($find && !$store_find) {
$attr_value = StoreProductAttrValue::where('product_id', $product_arr['id'])->findOrEmpty();
@@ -89,13 +99,63 @@ class StoreStorageSend implements Consumer
}
}
- public function storage($find, $store_id, $admin_id, $product_arr)
+ /**兑换 */
+ public function exchange($product_arr,$store_id,$admin_id,$find){
+ $store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
+ if ($find && !$store_find) {
+ Db::startTrans();
+ try {
+ $product = [
+ 'product_id' => $find['id'],
+ 'image' => $find['image'],
+ 'store_name' => $find['store_name'],
+ 'store_info' => $find['store_info'],
+ 'keyword' => $find['keyword'],
+ 'bar_code' => $find['bar_code'],
+ 'cate_id' => $find['cate_id'],
+ 'price' => $find['price'],
+ 'cost' => $find['cost'],
+ 'vip_price' => $find['vip_price'],
+ 'unit' => $find['unit'],
+ 'store_id' => $store_id,
+ 'sales' => 0,
+ 'stock' => 0,
+ ];
+ StoreBranchProduct::create($product);
+ if ($product_arr['stock'] > 0) {
+ $this->storage($find, $store_id, $admin_id, $product_arr);
+ }
+ // StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
+ Db::commit();
+ return true;
+ } catch (\Exception $e) {
+ Db::rollback();
+ Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
+ return false;
+ }
+ } else {
+ Db::startTrans();
+ try {
+ if ($product_arr['stock'] > 0) {
+ $this->storage($find, $store_id, $admin_id, $product_arr);
+ }
+ Db::commit();
+ return true;
+ } catch (\Exception $e) {
+ Db::rollback();
+ Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
+ return false;
+ }
+ }
+ }
+ public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1)
{
$storage = [
'product_id' => $product_arr['id'],
'store_id' => $store_id,
'nums' => $product_arr['stock'],
'admin_id' => $admin_id,
+ 'type' => $stock_type,
];
if ($find['stock'] < $product_arr['stock']) {
$storage['status'] = -1;
From 9cefd94d267a8f70f8e1e28ab39190d8f34259a1 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jun 2024 10:38:13 +0800
Subject: [PATCH 032/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?=
=?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=9C=8D=E5=8A=A1=E5=95=86=E7=9A=84=E6=94=AF?=
=?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/common/service/SmsService.php | 65 ++
composer.json | 3 +-
composer.lock | 74 +-
vendor/composer/autoload_psr4.php | 1 +
vendor/composer/autoload_static.php | 5 +
vendor/composer/installed.json | 75 ++
vendor/composer/installed.php | 9 +
vendor/overtrue/easy-sms/.editorconfig | 20 +
vendor/overtrue/easy-sms/.github/FUNDING.yml | 3 +
.../easy-sms/.github/workflows/tests.yml | 24 +
.../overtrue/easy-sms/.php-cs-fixer.dist.php | 49 +
vendor/overtrue/easy-sms/LICENSE | 21 +
vendor/overtrue/easy-sms/README.md | 1019 +++++++++++++++++
vendor/overtrue/easy-sms/composer.json | 62 +
vendor/overtrue/easy-sms/psalm.xml | 15 +
.../src/Contracts/GatewayInterface.php | 38 +
.../src/Contracts/MessageInterface.php | 63 +
.../src/Contracts/PhoneNumberInterface.php | 53 +
.../src/Contracts/StrategyInterface.php | 27 +
vendor/overtrue/easy-sms/src/EasySms.php | 326 ++++++
.../easy-sms/src/Exceptions/Exception.php | 21 +
.../src/Exceptions/GatewayErrorException.php | 37 +
.../Exceptions/InvalidArgumentException.php | 19 +
.../NoGatewayAvailableException.php | 81 ++
.../easy-sms/src/Gateways/AliyunGateway.php | 107 ++
.../src/Gateways/AliyunIntlGateway.php | 97 ++
.../src/Gateways/AliyunrestGateway.php | 107 ++
.../src/Gateways/AvatardataGateway.php | 60 +
.../easy-sms/src/Gateways/BaiduGateway.php | 174 +++
.../src/Gateways/ChuanglanGateway.php | 156 +++
.../src/Gateways/Chuanglanv1Gateway.php | 147 +++
.../easy-sms/src/Gateways/ErrorlogGateway.php | 50 +
.../easy-sms/src/Gateways/Gateway.php | 120 ++
.../easy-sms/src/Gateways/HuaweiGateway.php | 148 +++
.../easy-sms/src/Gateways/HuaxinGateway.php | 73 ++
.../easy-sms/src/Gateways/HuyiGateway.php | 77 ++
.../easy-sms/src/Gateways/JuheGateway.php | 76 ++
.../easy-sms/src/Gateways/KingttoGateway.php | 61 +
.../easy-sms/src/Gateways/LuosimaoGateway.php | 74 ++
.../easy-sms/src/Gateways/MaapGateway.php | 72 ++
.../easy-sms/src/Gateways/ModuyunGateway.php | 99 ++
.../easy-sms/src/Gateways/NowcnGateway.php | 38 +
.../easy-sms/src/Gateways/QcloudGateway.php | 137 +++
.../easy-sms/src/Gateways/QiniuGateway.php | 148 +++
.../src/Gateways/RongcloudGateway.php | 134 +++
.../src/Gateways/RongheyunGateway.php | 69 ++
.../src/Gateways/SendcloudGateway.php | 95 ++
.../easy-sms/src/Gateways/SmsbaoGateway.php | 77 ++
.../easy-sms/src/Gateways/SubmailGateway.php | 88 ++
.../src/Gateways/TianyiwuxianGateway.php | 84 ++
.../easy-sms/src/Gateways/TiniyoGateway.php | 85 ++
.../easy-sms/src/Gateways/TinreeGateway.php | 77 ++
.../easy-sms/src/Gateways/TwilioGateway.php | 91 ++
.../easy-sms/src/Gateways/UcloudGateway.php | 130 +++
.../easy-sms/src/Gateways/Ue35Gateway.php | 77 ++
.../src/Gateways/VolcengineGateway.php | 311 +++++
.../easy-sms/src/Gateways/YunpianGateway.php | 101 ++
.../src/Gateways/YuntongxunGateway.php | 123 ++
.../easy-sms/src/Gateways/YunxinGateway.php | 188 +++
.../src/Gateways/YunzhixunGateway.php | 121 ++
.../easy-sms/src/Gateways/ZzyunGateway.php | 63 +
vendor/overtrue/easy-sms/src/Message.php | 187 +++
vendor/overtrue/easy-sms/src/Messenger.php | 92 ++
vendor/overtrue/easy-sms/src/PhoneNumber.php | 126 ++
.../easy-sms/src/Strategies/OrderStrategy.php | 32 +
.../src/Strategies/RandomStrategy.php | 34 +
.../overtrue/easy-sms/src/Support/Config.php | 147 +++
.../easy-sms/src/Traits/HasHttpRequest.php | 136 +++
68 files changed, 6797 insertions(+), 2 deletions(-)
create mode 100644 app/common/service/SmsService.php
create mode 100644 vendor/overtrue/easy-sms/.editorconfig
create mode 100644 vendor/overtrue/easy-sms/.github/FUNDING.yml
create mode 100644 vendor/overtrue/easy-sms/.github/workflows/tests.yml
create mode 100644 vendor/overtrue/easy-sms/.php-cs-fixer.dist.php
create mode 100644 vendor/overtrue/easy-sms/LICENSE
create mode 100644 vendor/overtrue/easy-sms/README.md
create mode 100644 vendor/overtrue/easy-sms/composer.json
create mode 100644 vendor/overtrue/easy-sms/psalm.xml
create mode 100644 vendor/overtrue/easy-sms/src/Contracts/GatewayInterface.php
create mode 100644 vendor/overtrue/easy-sms/src/Contracts/MessageInterface.php
create mode 100644 vendor/overtrue/easy-sms/src/Contracts/PhoneNumberInterface.php
create mode 100644 vendor/overtrue/easy-sms/src/Contracts/StrategyInterface.php
create mode 100644 vendor/overtrue/easy-sms/src/EasySms.php
create mode 100644 vendor/overtrue/easy-sms/src/Exceptions/Exception.php
create mode 100644 vendor/overtrue/easy-sms/src/Exceptions/GatewayErrorException.php
create mode 100644 vendor/overtrue/easy-sms/src/Exceptions/InvalidArgumentException.php
create mode 100644 vendor/overtrue/easy-sms/src/Exceptions/NoGatewayAvailableException.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/AliyunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/AliyunIntlGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/AliyunrestGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/AvatardataGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/BaiduGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/ChuanglanGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/Chuanglanv1Gateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/ErrorlogGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/Gateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/HuaweiGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/HuaxinGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/HuyiGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/JuheGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/KingttoGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/LuosimaoGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/MaapGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/ModuyunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/NowcnGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/QcloudGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/QiniuGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/RongcloudGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/RongheyunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/SendcloudGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/SmsbaoGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/SubmailGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/TianyiwuxianGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/TiniyoGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/TinreeGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/TwilioGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/UcloudGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/Ue35Gateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/VolcengineGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/YunpianGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/YuntongxunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/YunxinGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/YunzhixunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Gateways/ZzyunGateway.php
create mode 100644 vendor/overtrue/easy-sms/src/Message.php
create mode 100644 vendor/overtrue/easy-sms/src/Messenger.php
create mode 100644 vendor/overtrue/easy-sms/src/PhoneNumber.php
create mode 100644 vendor/overtrue/easy-sms/src/Strategies/OrderStrategy.php
create mode 100644 vendor/overtrue/easy-sms/src/Strategies/RandomStrategy.php
create mode 100644 vendor/overtrue/easy-sms/src/Support/Config.php
create mode 100644 vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php
diff --git a/app/common/service/SmsService.php b/app/common/service/SmsService.php
new file mode 100644
index 000000000..43566a1cc
--- /dev/null
+++ b/app/common/service/SmsService.php
@@ -0,0 +1,65 @@
+ 5.0,
+
+ // 默认发送配置
+ 'default' => [
+ // 网关调用策略，默认：顺序调用
+ 'strategy' => \Overtrue\EasySms\Strategies\OrderStrategy::class,
+
+ // 默认可用的发送网关
+ 'gateways' => [
+ 'yunpian', 'aliyun',
+ ],
+ ],
+ // 可用的网关配置
+ 'gateways' => [
+ 'errorlog' => [
+ 'file' => runtime_path() . '/logs/' . date('Ymd') . '/easy-sms.log',
+ ],
+ 'aliyun' => [
+ 'access_key_id' => 'LTAI5t7mhH3ij2cNWs1zhPmv',
+ 'access_key_secret' => 'gqo2wMpvi8h5bDBmCpMje6BaiXvcPu',
+ 'sign_name' => '里海科技',
+ ],
+ //...
+ ],
+ ];
+ $this->config=$config;
+
+ }
+
+ public function client($phone,$template,$code)
+ {
+ try{
+ $easySms = new EasySms($this->config);
+
+ $easySms->send($phone, [
+ 'content' => '您的验证码为: '.$code,
+ 'template' => $template,
+ 'data' => [
+ 'code' => $code
+ ],
+ ]);
+ }catch(NoGatewayAvailableException $e){
+ throw new BusinessException($e->getMessage());
+ }
+
+ }
+}
diff --git a/composer.json b/composer.json
index 6906f2cef..5a665d605 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,8 @@
"jpush/jpush": "^3.6",
"workerman/crontab": "^1.0",
"intervention/image": "^3.6",
- "picqer/php-barcode-generator": "^2.4"
+ "picqer/php-barcode-generator": "^2.4",
+ "overtrue/easy-sms": "^2.6"
},
"suggest": {
"ext-event": "For better performance. "
diff --git a/composer.lock b/composer.lock
index 6d7daedd7..02626c932 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "974978f64812f55d8825aabadc43739f",
+ "content-hash": "54acb0fe3bc70f1e94406e7b79e84b8a",
"packages": [
{
"name": "aliyuncs/oss-sdk-php",
@@ -2779,6 +2779,78 @@
],
"time": "2023-11-08T09:30:43+00:00"
},
+ {
+ "name": "overtrue/easy-sms",
+ "version": "2.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/overtrue/easy-sms.git",
+ "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/bb88b244f0de8d1f74bc50c4c08414f4c5f30281",
+ "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "ext-json": "*",
+ "guzzlehttp/guzzle": "^6.2 || ^7.0",
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "brainmaestro/composer-git-hooks": "^2.8",
+ "jetbrains/phpstorm-attributes": "^1.0",
+ "mockery/mockery": "~1.3.3 || ^1.4.2",
+ "phpunit/phpunit": "^5.7 || ^7.5 || ^8.5.19 || ^9.5.8"
+ },
+ "type": "library",
+ "extra": {
+ "hooks": {
+ "pre-commit": [
+ "composer check-style",
+ "composer psalm",
+ "composer test"
+ ],
+ "pre-push": [
+ "composer check-style"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Overtrue\\EasySms\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "overtrue",
+ "email": "i@overtrue.me"
+ }
+ ],
+ "description": "The easiest way to send short message.",
+ "support": {
+ "issues": "https://github.com/overtrue/easy-sms/issues",
+ "source": "https://github.com/overtrue/easy-sms/tree/2.6.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/overtrue",
+ "type": "github"
+ }
+ ],
+ "time": "2024-03-08T06:36:45+00:00"
+ },
{
"name": "overtrue/socialite",
"version": "4.10.1",
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 15491c6e8..348204ddb 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -72,6 +72,7 @@ return array(
'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
'PhpDocReader\\' => array($vendorDir . '/php-di/phpdoc-reader/src/PhpDocReader'),
'Overtrue\\Socialite\\' => array($vendorDir . '/overtrue/socialite/src'),
+ 'Overtrue\\EasySms\\' => array($vendorDir . '/overtrue/easy-sms/src'),
'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'),
'Nyholm\\Psr7\\' => array($vendorDir . '/nyholm/psr7/src'),
'Nyholm\\Psr7Server\\' => array($vendorDir . '/nyholm/psr7-server/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e2aa1e0ff..a6ee17994 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -145,6 +145,7 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc
'O' =>
array (
'Overtrue\\Socialite\\' => 19,
+ 'Overtrue\\EasySms\\' => 17,
'OSS\\' => 4,
),
'N' =>
@@ -492,6 +493,10 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc
array (
0 => __DIR__ . '/..' . '/overtrue/socialite/src',
),
+ 'Overtrue\\EasySms\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/overtrue/easy-sms/src',
+ ),
'OSS\\' =>
array (
0 => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index fc3ca9341..9dfcf3b4e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2893,6 +2893,81 @@
],
"install-path": "../nyholm/psr7-server"
},
+ {
+ "name": "overtrue/easy-sms",
+ "version": "2.6.0",
+ "version_normalized": "2.6.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/overtrue/easy-sms.git",
+ "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/bb88b244f0de8d1f74bc50c4c08414f4c5f30281",
+ "reference": "bb88b244f0de8d1f74bc50c4c08414f4c5f30281",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "ext-json": "*",
+ "guzzlehttp/guzzle": "^6.2 || ^7.0",
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "brainmaestro/composer-git-hooks": "^2.8",
+ "jetbrains/phpstorm-attributes": "^1.0",
+ "mockery/mockery": "~1.3.3 || ^1.4.2",
+ "phpunit/phpunit": "^5.7 || ^7.5 || ^8.5.19 || ^9.5.8"
+ },
+ "time": "2024-03-08T06:36:45+00:00",
+ "type": "library",
+ "extra": {
+ "hooks": {
+ "pre-commit": [
+ "composer check-style",
+ "composer psalm",
+ "composer test"
+ ],
+ "pre-push": [
+ "composer check-style"
+ ]
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Overtrue\\EasySms\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "overtrue",
+ "email": "i@overtrue.me"
+ }
+ ],
+ "description": "The easiest way to send short message.",
+ "support": {
+ "issues": "https://github.com/overtrue/easy-sms/issues",
+ "source": "https://github.com/overtrue/easy-sms/tree/2.6.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/overtrue",
+ "type": "github"
+ }
+ ],
+ "install-path": "../overtrue/easy-sms"
+ },
{
"name": "overtrue/socialite",
"version": "4.10.1",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 83a57723f..b1b2bed46 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -376,6 +376,15 @@
'aliases' => array(),
'dev_requirement' => false,
),
+ 'overtrue/easy-sms' => array(
+ 'pretty_version' => '2.6.0',
+ 'version' => '2.6.0.0',
+ 'reference' => 'bb88b244f0de8d1f74bc50c4c08414f4c5f30281',
+ 'type' => 'library',
+ 'install_path' => __DIR__ . '/../overtrue/easy-sms',
+ 'aliases' => array(),
+ 'dev_requirement' => false,
+ ),
'overtrue/socialite' => array(
'pretty_version' => '4.10.1',
'version' => '4.10.1.0',
diff --git a/vendor/overtrue/easy-sms/.editorconfig b/vendor/overtrue/easy-sms/.editorconfig
new file mode 100644
index 000000000..df55cd78f
--- /dev/null
+++ b/vendor/overtrue/easy-sms/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+
+[*.{vue,js,scss}]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/vendor/overtrue/easy-sms/.github/FUNDING.yml b/vendor/overtrue/easy-sms/.github/FUNDING.yml
new file mode 100644
index 000000000..273b78ee5
--- /dev/null
+++ b/vendor/overtrue/easy-sms/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [overtrue]
diff --git a/vendor/overtrue/easy-sms/.github/workflows/tests.yml b/vendor/overtrue/easy-sms/.github/workflows/tests.yml
new file mode 100644
index 000000000..263a7d03d
--- /dev/null
+++ b/vendor/overtrue/easy-sms/.github/workflows/tests.yml
@@ -0,0 +1,24 @@
+name: Tests
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+
+jobs:
+ phpunit:
+ strategy:
+ matrix:
+ php_version: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Setup PHP environment
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php_version }}
+ coverage: xdebug
+ - name: Install dependencies
+ run: composer install
+ - name: PHPUnit check
+ run: ./vendor/bin/phpunit --coverage-text
diff --git a/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php b/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..e755e859d
--- /dev/null
+++ b/vendor/overtrue/easy-sms/.php-cs-fixer.dist.php
@@ -0,0 +1,49 @@
+setRules([
+ '@PSR12' => true,
+ 'binary_operator_spaces' => true,
+ 'blank_line_after_opening_tag' => true,
+ 'compact_nullable_typehint' => true,
+ 'declare_equal_normalize' => true,
+ 'lowercase_cast' => true,
+ 'lowercase_static_reference' => true,
+ 'new_with_braces' => true,
+ 'no_blank_lines_after_class_opening' => true,
+ 'no_leading_import_slash' => true,
+ 'no_whitespace_in_blank_line' => true,
+ 'no_unused_imports' => true,
+ 'ordered_class_elements' => [
+ 'order' => [
+ 'use_trait',
+ ],
+ ],
+ 'ordered_imports' => [
+ 'imports_order' => [
+ 'class',
+ 'function',
+ 'const',
+ ],
+ 'sort_algorithm' => 'none',
+ ],
+ 'return_type_declaration' => true,
+ 'short_scalar_cast' => true,
+ 'single_blank_line_before_namespace' => true,
+ 'single_trait_insert_per_statement' => true,
+ 'ternary_operator_spaces' => true,
+ 'unary_operator_spaces' => true,
+ 'visibility_required' => [
+ 'elements' => [
+// 'const',
+ 'method',
+ 'property',
+ ],
+ ],
+ ])
+ ->setFinder(
+ PhpCsFixer\Finder::create()
+ ->exclude('vendor')
+ ->in([__DIR__.'/src/', __DIR__.'/tests/'])
+ )
+;
diff --git a/vendor/overtrue/easy-sms/LICENSE b/vendor/overtrue/easy-sms/LICENSE
new file mode 100644
index 000000000..8afd9ead0
--- /dev/null
+++ b/vendor/overtrue/easy-sms/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 overtrue
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/overtrue/easy-sms/README.md b/vendor/overtrue/easy-sms/README.md
new file mode 100644
index 000000000..eb8ffe05f
--- /dev/null
+++ b/vendor/overtrue/easy-sms/README.md
@@ -0,0 +1,1019 @@
+:calling: 一款满足你的多种发送需求的短信发送组件
+ +
+
+
+
+
+
+
+
+
+
+ * An offset to check for. + *
+ * + * @return bool true on success or false on failure. + * + *+ * The return value will be casted to boolean if non-boolean was returned + * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetExists($offset) + { + return array_key_exists($offset, $this->config); + } + + /** + * Offset to retrieve. + * + * @see http://php.net/manual/en/arrayaccess.offsetget.php + * + * @param mixed $offset
+ * The offset to retrieve. + *
+ * + * @return mixed Can return all value types + * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetGet($offset) + { + return $this->get($offset); + } + + /** + * Offset to set. + * + * @see http://php.net/manual/en/arrayaccess.offsetset.php + * + * @param mixed $offset+ * The offset to assign the value to. + *
+ * @param mixed $value+ * The value to set. + *
+ * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetSet($offset, $value) + { + if (isset($this->config[$offset])) { + $this->config[$offset] = $value; + } + } + + /** + * Offset to unset. + * + * @see http://php.net/manual/en/arrayaccess.offsetunset.php + * + * @param mixed $offset+ * The offset to unset. + *
+ * + * @since 5.0.0 + */ + #[\ReturnTypeWillChange] + public function offsetUnset($offset) + { + if (isset($this->config[$offset])) { + unset($this->config[$offset]); + } + } +} diff --git a/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php b/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php new file mode 100644 index 000000000..d861dedfc --- /dev/null +++ b/vendor/overtrue/easy-sms/src/Traits/HasHttpRequest.php @@ -0,0 +1,136 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace Overtrue\EasySms\Traits; + +use GuzzleHttp\Client; +use Psr\Http\Message\ResponseInterface; + +/** + * Trait HasHttpRequest. + */ +trait HasHttpRequest +{ + /** + * Make a get request. + * + * @param string $endpoint + * @param array $query + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function get($endpoint, $query = [], $headers = []) + { + return $this->request('get', $endpoint, [ + 'headers' => $headers, + 'query' => $query, + ]); + } + + /** + * Make a post request. + * + * @param string $endpoint + * @param array $params + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function post($endpoint, $params = [], $headers = []) + { + return $this->request('post', $endpoint, [ + 'headers' => $headers, + 'form_params' => $params, + ]); + } + + /** + * Make a post request with json params. + * + * @param $endpoint + * @param array $params + * @param array $headers + * + * @return ResponseInterface|array|string + */ + protected function postJson($endpoint, $params = [], $headers = []) + { + return $this->request('post', $endpoint, [ + 'headers' => $headers, + 'json' => $params, + ]); + } + + /** + * Make a http request. + * + * @param string $method + * @param string $endpoint + * @param array $options http://docs.guzzlephp.org/en/latest/request-options.html + * + * @return ResponseInterface|array|string + */ + protected function request($method, $endpoint, $options = []) + { + return $this->unwrapResponse($this->getHttpClient($this->getBaseOptions())->{$method}($endpoint, $options)); + } + + /** + * Return base Guzzle options. + * + * @return array + */ + protected function getBaseOptions() + { + $options = method_exists($this, 'getGuzzleOptions') ? $this->getGuzzleOptions() : []; + + return \array_merge($options, [ + 'base_uri' => method_exists($this, 'getBaseUri') ? $this->getBaseUri() : '', + 'timeout' => method_exists($this, 'getTimeout') ? $this->getTimeout() : 5.0, + ]); + } + + /** + * Return http client. + * + * @param array $options + * + * @return \GuzzleHttp\Client + * + * @codeCoverageIgnore + */ + protected function getHttpClient(array $options = []) + { + return new Client($options); + } + + /** + * Convert response contents to json. + * + * @param \Psr\Http\Message\ResponseInterface $response + * + * @return ResponseInterface|array|string + */ + protected function unwrapResponse(ResponseInterface $response) + { + $contentType = $response->getHeaderLine('Content-Type'); + $contents = $response->getBody()->getContents(); + + if (false !== stripos($contentType, 'json') || stripos($contentType, 'javascript')) { + return json_decode($contents, true); + } elseif (false !== stripos($contentType, 'xml')) { + return json_decode(json_encode(simplexml_load_string($contents)), true); + } + + return $contents; + } +} From 545e01e75a33a2036d350996845f8223e1bc5874 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 10:49:53 +0800 Subject: [PATCH 033/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=AC=BE=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E5=92=8C=E9=A2=84?= =?UTF-8?q?=E7=95=99=E7=94=A8=E6=88=B7=E5=88=86=E4=BA=AB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 4 ++ app/api/logic/order/OrderLogic.php | 3 ++ app/common/enum/OrderEnum.php | 3 ++ app/common/enum/PayEnum.php | 3 +- app/common/logic/PayNotifyLogic.php | 37 ++++++++++++++++++- .../model/user_spread_log/UserSpreadLog.php | 22 +++++++++++ .../store_order/StoreOrderController.php | 4 ++ 7 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 app/common/model/user_spread_log/UserSpreadLog.php diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index c8a6a62c3..a436e98f1 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -188,6 +188,10 @@ class OrderController extends BaseApiController } if ($order != false) { switch ($pay_type) { + case PayEnum::PURCHASE_FUNDS: + //采购款支付 + PayNotifyLogic::handle('purchase_funds', $order['order_id']); + return $this->success('采购款支付成功'); case PayEnum::BALANCE_PAY: //余额支付 PayNotifyLogic::handle('balancePay', $order['order_id']); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 895a42e05..1f422b03d 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -23,6 +23,7 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserShip; +use app\common\model\user_spread_log\UserSpreadLog; use Picqer\Barcode\BarcodeGeneratorJPG; use Picqer\Barcode\BarcodeGeneratorPNG; use support\exception\BusinessException; @@ -160,6 +161,8 @@ class OrderLogic extends BaseLogic $_order = $orderInfo['order']; $_order['uid'] = request()->userId; $user = User::where('id', \request()->userId)->find(); + $_order['is_vip'] = $user['user_ship']; + $_order['spread_uid'] = UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 $_order['real_name'] = $user['real_name']; $_order['mobile'] = $user['mobile']; $_order['pay_type'] = $orderInfo['order']['pay_type']; diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index 215162939..e8312c829 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -24,6 +24,7 @@ class OrderEnum * @SYSTEM_SET 系统设置 * @OWN_GET 平台收入 * @ORDER_MARGIN 商户保证金 + * @PURCHASE_FUNDS 采购款收银 */ const USER_ORDER_PAY = 1; const MERCHANT_ORDER_OBTAINS = 2; @@ -44,6 +45,8 @@ class OrderEnum const CASHIER_FACE_PAY = 17;//现金收银 + const PURCHASE_FUNDS = 18;//采购款收银 + /** * 收入支出类型 diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php index 8065e8fac..99786c428 100644 --- a/app/common/enum/PayEnum.php +++ b/app/common/enum/PayEnum.php @@ -31,6 +31,7 @@ class PayEnum * @GOODS_FIRST_PAYMENT_LATER 先货后款 * @CORPORATE_TRANSFER 对公转账 * @CASH_PAY 现金支付 + * @PURCHASE_FUNDS 采购款收银 */ const BALANCE_PAY = 3; const WECHAT_PAY = 1; @@ -49,7 +50,7 @@ class PayEnum const GOODS_FIRST_PAYMENT_LATER = 15; const CORPORATE_TRANSFER = 16; const CASH_PAY = 17; - + const PURCHASE_FUNDS = 18;//采购款收银 //支付状态 const UNPAID = 0; //未支付 const ISPAID = 1; //已支付 diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 6bb5f81ec..82e4e1c33 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -32,7 +32,7 @@ class PayNotifyLogic extends BaseLogic { Db::startTrans(); try { - if ($action != 'cash_pay' && $action != 'balancePay') { + if ($action != 'cash_pay' && $action != 'balancePay'&& $action != 'purchase_funds') { $payNotifyLogLogic = new PayNotifyLogLogic(); if ($action == 'refund') { $payNotifyLogLogic->insert($action, $extra, PayNotifyLog::TYPE_REFUND); @@ -83,6 +83,41 @@ class PayNotifyLogic extends BaseLogic PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } + + /** + * 采购款支付 + * @param $orderSn + * @param $extra + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function purchase_funds($orderSn, $extra = []) + { + $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); + $user = User::where('id', $order['uid'])->find(); + if ($user['purchase_funds'] < $order['pay_price']) { + throw new \Exception('采购款不足'); + } + $order->money = $order['pay_price']; + $order->paid = 1; + $order->pay_time = time(); + if (!$order->save()) { + throw new \Exception('订单保存出错'); + } + // 减去采购款 + $user->purchase_funds = bcsub($user['purchase_funds'], $order['pay_price'], 2); + $user->save(); + + $capitalFlowDao = new CapitalFlowLogic($user); + $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); + self::afterPay($order); + Redis::send('push-platform-print', ['id' => $order['id']], 60); + PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + + } + /** * @notes 微信通用回调 * @param $orderSn diff --git a/app/common/model/user_spread_log/UserSpreadLog.php b/app/common/model/user_spread_log/UserSpreadLog.php new file mode 100644 index 000000000..6ac54de19 --- /dev/null +++ b/app/common/model/user_spread_log/UserSpreadLog.php @@ -0,0 +1,22 @@ +success('采购款支付成功'); case PayEnum::CASH_PAY: //现金支付 From 48a66a5328d43504ef01cd9a221f9e42b9f6ebe8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 11:00:20 +0800 Subject: [PATCH 034/145] =?UTF-8?q?feat(UserLists):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0ListsSear?= =?UTF-8?q?chInterface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/user/UserLists.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index 1d4563950..35cc57608 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -7,8 +7,9 @@ namespace app\store\lists\user; use app\store\lists\BaseAdminDataLists; use app\common\model\user\User; use app\common\model\user\UserShip; +use app\common\lists\ListsSearchInterface; -class UserLists extends BaseAdminDataLists +class UserLists extends BaseAdminDataLists implements ListsSearchInterface { /** * @notes 搜索条件 @@ -19,7 +20,8 @@ class UserLists extends BaseAdminDataLists public function setSearch(): array { return [ - '=' => ['mobile'], + '=' => ['id'], + '%like%' => ['mobile'], ]; } From aa2c1463002812d0afea0c25a0cf17508e141ce6 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 11:07:02 +0800 Subject: [PATCH 035/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=AC=BE=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 7 ++++--- app/common/logic/PayNotifyLogic.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index a436e98f1..0d6e336ff 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -183,10 +183,11 @@ class OrderController extends BaseApiController $user=User::where('id',$this->userId)->find(); $order = OrderLogic::createOrder($cartId, $addressId, $user, $params); - if($order['pay_price'] <= 0){ - $pay_type = 3; - } + if ($order != false) { + if($order['pay_price'] <= 0){ + $pay_type = 3; + } switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 82e4e1c33..e8eefc5cf 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -111,7 +111,7 @@ class PayNotifyLogic extends BaseLogic $user->save(); $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); + $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); self::afterPay($order); Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); From 97a7a830c34b19da47eeefa675b3e33f0969cd6b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 11:13:52 +0800 Subject: [PATCH 036/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9D=80API=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/user/AddressLogic.php | 12 +++-- app/api/validate/UserAddressValidate.php | 2 +- .../controller/user/AddressController.php | 49 +++++++++++++++++++ 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 app/store/controller/user/AddressController.php diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php index 068aa6f0d..097204ab5 100644 --- a/app/api/logic/user/AddressLogic.php +++ b/app/api/logic/user/AddressLogic.php @@ -67,8 +67,14 @@ class AddressLogic extends BaseLogic 'phone' => $params['phone'], 'detail' => $params['detail'], 'is_default' => $params['is_default'], + 'province' => $params['province'], + 'city' => $params['city'], + 'area' => $params['area'], + 'street' => $params['street'], + 'village' => $params['village'], + 'brigade' => $params['brigade'], ]; - UserAddress::where('uid', $params['uid'])->where('id', $params['address_id'])->update($data); + UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data); Db::commit(); return true; } catch (\Exception $e) { @@ -93,7 +99,7 @@ class AddressLogic extends BaseLogic /** - * @notes 获取购物车表详情 + * @notes 获取地址详情 * @param $params * @return array * @author likeadmin @@ -101,6 +107,6 @@ class AddressLogic extends BaseLogic */ public static function detail($params): array { - return UserAddress::field('id address_id,real_name,phone,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray(); + return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where($params)->findOrEmpty()->toArray(); } } diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php index 30a1360b6..2b0300e0f 100644 --- a/app/api/validate/UserAddressValidate.php +++ b/app/api/validate/UserAddressValidate.php @@ -63,7 +63,7 @@ class UserAddressValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['real_name','phone','detail','address_id']); + return $this->only(['real_name','phone','detail','id']); } diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php new file mode 100644 index 000000000..7406b81cc --- /dev/null +++ b/app/store/controller/user/AddressController.php @@ -0,0 +1,49 @@ +dataLists(new UserAddressList()); + } + /** + * @notes 编辑地址 + * @return \support\Response + * @author likeadmin + * @date 2024/4/24 10:37 + */ + public function edit() + { + $params = (new UserAddressValidate())->post()->goCheck('edit'); + if(AddressLogic::edit($params)){ + return $this->success('编辑成功'); + }else{ + return $this->fail(AddressLogic::getError()); + } + } + /** + * @notes 获取地址详情 + * @return \support\Response + * @author likeadmin + * @date 2024/4/24 10:37 + */ + public function detail() + { + $id = $this->request->get('id'); + $uid = $this->request->get('uid'); + if($id){ + $params = ['id' => $id]; + } + if($uid){ + $params = ['uid' => $uid]; + } + return $this->success('获取成功',AddressLogic::detail($params)); + } +} From 5e5cc45490957b6d8193189025e0f07fdd604a92 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 11:36:34 +0800 Subject: [PATCH 037/145] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E5=88=9B=E5=BB=BA=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 1f422b03d..4e4177fe6 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -71,7 +71,7 @@ class OrderLogic extends BaseLogic /** 计算价格 */ foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,product_id')->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,product_id')->withTrashed()->find(); if (!$find) { continue; } @@ -200,7 +200,7 @@ class OrderLogic extends BaseLogic $goods_list[$k]['uid'] = request()->userId; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id - $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->find(); + $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->withTrashed()->find(); $updateData[] = [ 'id' => $v['branch_product_id'], 'stock' => $StoreBranchProduct['stock']-$v['cart_num'], From 1109eb92f1e2a4084ad4cbde11d5d4c39eae1ab3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 11:42:54 +0800 Subject: [PATCH 038/145] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/CartList.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index d68559b77..ca28189b1 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -63,7 +63,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists foreach ($list as $key => &$item) { $find = StoreBranchProduct::where(['product_id' => $item['product_id'],'store_id' => $item['store_id']]) - ->field('product_id,image,price,cost,store_name,unit') + ->field('product_id,image,price,cost,store_name,unit,delete_time') + ->withTrashed() ->find(); // if (isset($check) && $check['status'] == 1) { // $find['price'] = $find['cost']; From e2c471c030cb121d8381c5901245f55b5d2c090a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 13:44:32 +0800 Subject: [PATCH 039/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 1 + app/common/logic/PayNotifyLogic.php | 100 +++++++----------- app/queue/redis/CodePaySend.php | 6 +- .../store_order/StoreOrderController.php | 53 +++++++++- .../controller/user/AddressController.php | 6 +- app/store/controller/user/UserController.php | 1 - 6 files changed, 99 insertions(+), 68 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index a88acd7fc..6ec63f14e 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -17,6 +17,7 @@ use app\common\enum\user\UserTerminalEnum; use app\common\logic\BaseLogic; use app\common\model\user\User; use app\common\model\user\UserAddress; +use app\common\model\user\UserRecharge; use think\facade\Db; use app\common\service\FileService; use Webman\Config; diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index e8eefc5cf..617e9ea43 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -28,11 +28,11 @@ use Webman\RedisQueue\Redis; class PayNotifyLogic extends BaseLogic { - public static function handle($action, $orderSn, $extra = []) + public static function handle($action, $orderSn, $extra = [], $type = 'wechat') { Db::startTrans(); try { - if ($action != 'cash_pay' && $action != 'balancePay'&& $action != 'purchase_funds') { + if ($action != 'cash_pay' && $action != 'balancePay' && $action != 'purchase_funds') { $payNotifyLogLogic = new PayNotifyLogLogic(); if ($action == 'refund') { $payNotifyLogLogic->insert($action, $extra, PayNotifyLog::TYPE_REFUND); @@ -40,7 +40,7 @@ class PayNotifyLogic extends BaseLogic $payNotifyLogLogic->insert($action, $extra); } } - self::$action($orderSn, $extra); + self::$action($orderSn, $extra, $type); Db::commit(); return true; } catch (\Exception $e) { @@ -115,7 +115,6 @@ class PayNotifyLogic extends BaseLogic self::afterPay($order); Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - } /** @@ -150,11 +149,6 @@ class PayNotifyLogic extends BaseLogic } self::afterPay($order, $extra['transaction_id']); - //活动期间消费 - $check = DictType::where('type', 'activities')->find(); - if (isset($check) && $check['status'] == 1 && in_array($order->pay_type, [9, 17]) == false && $user['user_ship'] == 0) { - self::dealChange($order['uid']); - } if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; @@ -191,13 +185,17 @@ class PayNotifyLogic extends BaseLogic /** * 充值 */ - public static function recharge($orderSn, $extra = []) + public static function recharge($orderSn, $extra = [], $type = 'wechat') { $order = UserRecharge::where('order_id', $orderSn)->findOrEmpty(); if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { return true; } - $price = bcdiv($extra['amount']['payer_total'], 100, 2); + if ($type == 'wechat') { + $price = bcdiv($extra['amount']['payer_total'], 100, 2); + } else { + $price = $extra['buyer_pay_amount']; + } $order->price = $price; $order->paid = 1; $order->pay_time = time(); @@ -212,13 +210,16 @@ class PayNotifyLogic extends BaseLogic return true; } bcscale(2); -// $user->now_money = bcadd($user->now_money, $price, 2);//v.1 + // $user->now_money = bcadd($user->now_money, $price, 2);//v.1 + //更新等级 + if ($price >= 1000) { + $user->user_ship = 1; //v.1 + } $user->purchase_funds = bcadd($user->purchase_funds, $price, 2); $user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2); $user->save(); - //更新等级 - self::dealLevel($uid, $user->total_recharge_amount); + if (!empty($extra['payer']['openid'])) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 3], 5); } @@ -296,13 +297,13 @@ class PayNotifyLogic extends BaseLogic $financeLogic->user = ['uid' => $order['uid']]; // if ($order->pay_type != 9 || $order->pay_type != 10) { $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户订单支付 - $count_frees=0; + $count_frees = 0; //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { //平台手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); - $count_frees=bcadd($count_frees,$fees,2); + $count_frees = bcadd($count_frees, $fees, 2); $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, $order['pay_type']); //平台手续费 $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 @@ -312,7 +313,7 @@ class PayNotifyLogic extends BaseLogic $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度 $store_profit = bcdiv(bcmul($order['pay_price'], '0.05', 2), 1, 2); - $count_frees=bcadd($count_frees,$store_profit,2); + $count_frees = bcadd($count_frees, $store_profit, 2); if ($deposit > 0) { if ($deposit > $store_profit) { $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); @@ -328,78 +329,53 @@ class PayNotifyLogic extends BaseLogic if ($order['spread_uid'] > 0) { $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); - $count_frees=bcadd($count_frees,$fees,2); + $count_frees = bcadd($count_frees, $fees, 2); $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得 $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); - $count_frees=bcadd($count_frees,bcmul($fees,3,2),2); - $village_uid=0; - $brigade_uid=0; + $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); + $village_uid = 0; + $brigade_uid = 0; //查询用户对应的村长和队长 - if($order['uid']>0){ - $address=UserAddress::where(['uid'=>$order['uid'],'is_default'=>1])->find(); - if($address){ - $arr1=UserAddress::where(['village'=>$address['village'],'is_default'=>1])->column('uid'); - if($arr1){ - $village_uid=User::where('id','in',$arr1)->where('user_ship',2)->value('id'); + if ($order['uid'] > 0) { + $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); + if ($address) { + $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); + if ($arr1) { + $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); } - $arr2=UserAddress::where(['village'=>$address['village'],'brigade'=>$address['brigade'],'is_default'=>1])->column('uid'); - if($arr2){ - $brigade_uid=User::where('id','in',$arr1)->where('user_ship',3)->value('id'); + $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); + if ($arr2) { + $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); } } } //村长获得 - if($village_uid>0){ + if ($village_uid > 0) { $financeLogic->other_arr['vip_uid'] = $village_uid; } - $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //队长获得 - if($brigade_uid>0){ + if ($brigade_uid > 0) { $financeLogic->other_arr['vip_uid'] = $brigade_uid; } - $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //其他获得 - $financeLogic->other_arr['vip_uid']=0; - $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } //供应链订单获得 - $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); $financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); // } $financeLogic->save(); // } } - //等级处理 - public static function dealLevel($uid, $total_money) - { - $userShip = UserShip::where('limit', '<=', $total_money) - ->field('id,title,limit') - ->order('limit', 'desc') - ->find(); - $info = User::where('id', $uid)->findOrEmpty(); - if ($info && $userShip) { - if ($info->user_ship != $userShip['id']) { - $info->user_ship = $userShip['id']; - $info->save(); - } - } - return true; - } - - //处理活动期间直接改用户的等级 - public static function dealChange($uid) - { - User::where('id', $uid)->update(['user_ship' => UserShipEnum::LEVEL_ONE]); - return true; - } - - /** * 回调日志 * @param $order diff --git a/app/queue/redis/CodePaySend.php b/app/queue/redis/CodePaySend.php index c3b33c55b..d944b9eec 100644 --- a/app/queue/redis/CodePaySend.php +++ b/app/queue/redis/CodePaySend.php @@ -30,7 +30,11 @@ class CodePaySend implements Consumer ]; $res = $pay->wechat->query($order); if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + if(isset($data['pay_type']) && $data['pay_type']=='recharge'){ + PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); + }else{ + PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + } }else{ throw new BusinessException('订单支付中', 200); } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 02af03752..47147921c 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -13,6 +13,7 @@ use app\common\logic\SystemStoreStaffLogic; use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; use app\common\model\store_order\StoreOrder; +use app\common\model\user_recharge\UserRecharge; use app\store\validate\store_order\StoreOrderValidate; use support\Log; use Webman\RedisQueue\Redis; @@ -290,6 +291,56 @@ class StoreOrderController extends BaseAdminController return $this->success('ok',$data); } - + /** + * vip充值 + */ + public function rechange_amount() + { + $pay_type = $this->request->post('pay_type'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { + return $this->fail('支付条码不能为空'); + } + $params = $this->request->post(); + $data=[ + 'store_id'=>$this->adminInfo['store_id'], + 'uid'=>$params['uid'], + 'staff_id'=>$this->adminId, + 'order_id'=>getNewOrderId('CZ'), + 'price'=>$params['price'], + ]; + $order = UserRecharge::create($data); + switch ($pay_type) { + case PayEnum::WECHAT_PAY_BARCODE: + //微信条码支付 + $result = PaymentLogic::codepay($auth_code, $order); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); + } else { + Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); + return $this->success('用户支付中'); + } + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + case PayEnum::ALIPAY_BARCODE: + //支付宝条码支付 + $result = PaymentLogic::ali_auth_code($auth_code, $order); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if ($result['msg'] !== 'Success') { + return $this->success('用户支付中'); + } + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result,'ali'); + + $result['create_time'] = $order['create_time']; + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + default: + return $this->fail('支付方式错误'); + } + return $this->fail('支付失败'); + } } diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php index 7406b81cc..b3a74cf8b 100644 --- a/app/store/controller/user/AddressController.php +++ b/app/store/controller/user/AddressController.php @@ -1,14 +1,14 @@ dataLists(new UserAddressList()); diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php index 4a6083856..35b8737e5 100644 --- a/app/store/controller/user/UserController.php +++ b/app/store/controller/user/UserController.php @@ -30,7 +30,6 @@ class UserController extends BaseAdminController } - public function detail() { $params = (new UserValidate())->goCheck('detail'); From 94d89f86dc81cf3e46d641fafe3d637037f05c7a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 14:15:05 +0800 Subject: [PATCH 040/145] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20UserAddres?= =?UTF-8?q?sValidate=20=E7=B1=BB=E4=B8=AD=E7=9A=84=20detail=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/validate/UserAddressValidate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php index 2b0300e0f..b7911da0e 100644 --- a/app/api/validate/UserAddressValidate.php +++ b/app/api/validate/UserAddressValidate.php @@ -63,7 +63,7 @@ class UserAddressValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['real_name','phone','detail','id']); + return $this->only(['real_name','phone','id']); } From bc867d736250c1655d5c0ebf48072d20e5e86578 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 14:30:23 +0800 Subject: [PATCH 041/145] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php index 8143a4182..2e1ba315c 100644 --- a/app/api/controller/LoginController.php +++ b/app/api/controller/LoginController.php @@ -18,7 +18,7 @@ class LoginController extends BaseApiController public function account() { $params=$this->request->post(); - $params = (new LoginAccountValidate())->post()->goCheck(); +// $params = (new LoginAccountValidate())->post()->goCheck(); $result = LoginLogic::login($params); if (false === $result) { return $this->fail(LoginLogic::getError()); From b756c07191e6898f17c87d79881b2db9d44db01b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 15:07:59 +0800 Subject: [PATCH 042/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=99=E9=A2=9D=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 2 -- app/admin/validate/user/UserValidate.php | 4 +--- app/common/logic/PayNotifyLogic.php | 18 +++++++++--------- app/common/logic/StoreFinanceFlowLogic.php | 2 +- .../logic/store_order/StoreOrderLogic.php | 5 +++-- .../store_order/StoreOrderController.php | 1 + app/store/lists/user/UserLists.php | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 6ec63f14e..167aa3c9f 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -54,7 +54,6 @@ class UserLogic extends BaseLogic 'mobile' => $params['mobile'], 'sex' => $params['sex'], 'is_disable' => $params['is_disable'], - 'user_money' => $params['user_money'] ]); Db::commit(); @@ -127,7 +126,6 @@ class UserLogic extends BaseLogic 'mobile' => $params['mobile'] ?? '', 'sex' => $params['sex'] ?? 0, 'is_disable' => $params['is_disable'] ?? 0, - 'user_money' => $params['user_money'] ?? 0 ]); Db::commit(); diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index 8729791c5..ef36fbb7f 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -27,7 +27,6 @@ class UserValidate extends BaseValidate 'mobile' => 'require|mobile', 'is_disable' => 'in:0,1', 'sex' => 'in:1,2', - 'user_money' => 'float', 'province' => 'require', 'city' => 'require', 'area' => 'require', @@ -51,7 +50,6 @@ class UserValidate extends BaseValidate 'mobile' => '用户电话', 'is_disable' => '是否禁用', 'sex' => '用户性别', - 'user_money' => '用户余额', 'province' => '省', 'city' => '市', 'area' => '区', @@ -86,7 +84,7 @@ class UserValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex','user_money'])->remove('password','require'); + return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex'])->remove('password','require'); } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 617e9ea43..8d595beba 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -304,7 +304,7 @@ class PayNotifyLogic extends BaseLogic //平台手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); - $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, $order['pay_type']); //平台手续费 + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0,0, $order['pay_type']); //平台手续费 $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 //冻结金额的 @@ -320,17 +320,17 @@ class PayNotifyLogic extends BaseLogic } else { $money = bcsub($store_profit, $deposit, 2); $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //平台手续费 + $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); //平台手续费 } } else { - $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //平台手续费 + $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); //平台手续费 } - if ($order['is_vip'] == 1) { + if ($order['is_vip'] >=1) { if ($order['spread_uid'] > 0) { $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); - $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); //vip订单获得 + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); //vip订单获得 $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); @@ -355,21 +355,21 @@ class PayNotifyLogic extends BaseLogic if ($village_uid > 0) { $financeLogic->other_arr['vip_uid'] = $village_uid; } - $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //队长获得 if ($brigade_uid > 0) { $financeLogic->other_arr['vip_uid'] = $brigade_uid; } - $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //其他获得 $financeLogic->other_arr['vip_uid'] = 0; - $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } //供应链订单获得 - $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, $order['pay_type']); + $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); $financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); // } $financeLogic->save(); diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php index c2ad88d52..ac7d66070 100644 --- a/app/common/logic/StoreFinanceFlowLogic.php +++ b/app/common/logic/StoreFinanceFlowLogic.php @@ -59,7 +59,7 @@ class StoreFinanceFlowLogic extends BaseLogic 'financial_pm' => $pm, 'number' => $number, 'pay_type' => $pay_type, - 'status' => $status, + 'status' => 0, 'store_id' => $storeId !== '' ? $storeId : $this->order['store_id'], 'staff_id' => $staffId !== '' ? $staffId : $this->order['staff_id'], 'financial_record_sn' => $this->financeSn . ($this->index++), diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index db652b03e..c80890eb7 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -115,8 +115,10 @@ class StoreOrderLogic extends BaseLogic 'default_delivery'=>1, 'original_price'=>self::$total_price, 'deduction_price' => self::$activity_price - ]; + if($user['user_ship']!=4){ + $order['is_vip']=1; + } } catch (\Exception $e) { self::setError($e->getMessage()); return false; @@ -140,7 +142,6 @@ class StoreOrderLogic extends BaseLogic return false; } $_order = $orderInfo['order']; - $_order['deduction_price'] = 0; $_order['pay_type'] = $orderInfo['order']['pay_type']; $_order['verify_code'] = $verify_code; if (isset($params['reservation_time'])) { diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 47147921c..3ba2bc34e 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -310,6 +310,7 @@ class StoreOrderController extends BaseAdminController 'price'=>$params['price'], ]; $order = UserRecharge::create($data); + $order['pay_price']=$order['price']; switch ($pay_type) { case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index 35cc57608..7f7bc24fe 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -37,7 +37,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface public function lists(): array { - $field = "id,nickname,real_name,sex,avatar,account,mobile,user_money,user_ship,create_time"; + $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time"; $lists = User::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->field($field) From 8e82e40379885f1b4aff2a17e3d99b40ae9c086d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 15:35:03 +0800 Subject: [PATCH 043/145] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=AA=8C=E8=AF=81=E7=A0=81=E9=80=BB=E8=BE=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_order/StoreOrderLogic.php | 24 +++++++++++++ app/common/service/SmsService.php | 7 +++- app/functions.php | 14 ++++++++ app/store/controller/cart/CartController.php | 2 +- .../store_order/StoreOrderController.php | 34 +++++++++++++++++++ .../store_order/StoreOrderValidate.php | 5 +++ 6 files changed, 84 insertions(+), 2 deletions(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index c80890eb7..255298eec 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -12,7 +12,9 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\user\User; use app\common\service\pay\PayService; +use app\common\service\SmsService; use Exception; use support\Cache; use think\facade\Db; @@ -308,4 +310,26 @@ class StoreOrderLogic extends BaseLogic } + + public function dealSendSms($param) + { + $code = generateRandomCode(); + $phone = User::where('id',$param['uid'])->value('mobile'); + if(empty($phone)){ + throw new \Exception('用户未设置手机号'); + } + $template = getenv('SMS_TEMPLATE'); + + $check =(new SmsService())->client($phone,$template,$code); + if($check){ + $remark = $param['uid'].'_smsPay'; + Cache::set($remark,$code,5*60); + return true; + }else{ + return false; + } + + } + + } diff --git a/app/common/service/SmsService.php b/app/common/service/SmsService.php index 43566a1cc..d1270b1a9 100644 --- a/app/common/service/SmsService.php +++ b/app/common/service/SmsService.php @@ -50,13 +50,18 @@ class SmsService try{ $easySms = new EasySms($this->config); - $easySms->send($phone, [ + $res = $easySms->send($phone, [ 'content' => '您的验证码为: '.$code, 'template' => $template, 'data' => [ 'code' => $code ], ]); + if($res && $res['aliyun']['status'] == 'success'){ + return true; + }else{ + return false; + } }catch(NoGatewayAvailableException $e){ throw new BusinessException($e->getMessage()); } diff --git a/app/functions.php b/app/functions.php index 2328a71b2..0aacbdc0e 100644 --- a/app/functions.php +++ b/app/functions.php @@ -405,6 +405,20 @@ if (!function_exists('haversineDistance')) { } } +/** + * 随机验证码 + */ +if (!function_exists('generateRandomCode')) { + function generateRandomCode($length = 4) { + $code = ''; + for ($i = 0; $i < $length; $i++) { + $code .= random_int(0, 9); + } + return $code; + } +} + + if (!function_exists('reset_index')) { /** * 重置数组索引 diff --git a/app/store/controller/cart/CartController.php b/app/store/controller/cart/CartController.php index e190a385b..1e3ae32f1 100644 --- a/app/store/controller/cart/CartController.php +++ b/app/store/controller/cart/CartController.php @@ -24,7 +24,7 @@ class CartController extends BaseAdminController { $params = (new CartValidate())->post()->goCheck('StoreAdd'); $adminInfo = $this->adminInfo; - $params['uid'] = 0; + $params['uid'] = $this->request->post('uid')??0; $params['staff_id'] = $adminInfo['admin_id']; $params['store_id'] = $adminInfo['store_id']; $result = Cart::where(['uid' => 0,'staff_id'=>$adminInfo['admin_id'], 'store_id' => $adminInfo['store_id'], 'product_id' => $params['product_id'], 'is_fail' => 0, 'is_pay' => 0])->find(); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 3ba2bc34e..2305ab45c 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -4,6 +4,7 @@ namespace app\store\controller\store_order; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; +use app\common\model\order\Cart; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; @@ -15,6 +16,7 @@ use app\common\logic\store_order\StoreOrderLogic; use app\common\model\store_order\StoreOrder; use app\common\model\user_recharge\UserRecharge; use app\store\validate\store_order\StoreOrderValidate; +use support\Cache; use support\Log; use Webman\RedisQueue\Redis; @@ -124,11 +126,26 @@ class StoreOrderController extends BaseAdminController return $this->data($res); } + + public function checkSms() + { + $params = (new StoreOrderValidate())->post()->goCheck('check'); + $res = (new StoreOrderLogic())->dealSendSms($params); + if($res){ + return $this->success('发送成功',[],1,1); + }else{ + return $this->fail('发送失败'); + } + + } + + public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); $pay_type = (int)$this->request->post('pay_type'); $addressId = (int)$this->request->post('address_id'); + $sms_code = $this->request->post('sms_code',''); $auth_code = $this->request->post('auth_code'); //微信支付条码 $params = $this->request->post(); if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { @@ -137,6 +154,23 @@ class StoreOrderController extends BaseAdminController if (count($cartId) > 100) { return $this->fail('购物车商品不能超过100个'); } + + if($pay_type == PayEnum::PURCHASE_FUNDS && $sms_code){ + if(empty($cartId)){ + return $this->fail('缺失购物车数据'); + } + $uid = Cart::where('id',$cartId[0])->value('uid'); + $remark = $uid.'_smsPay'; + $code = Cache::get($remark); + if(empty($code)){ + return $this->fail('验证码过期请重新发送'); + } + if ($code !== $sms_code) { + return $this->fail('验证码错误'); + } + + } + $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 $order = StoreOrderLogic::createOrder($cartId, $addressId, null, $params); if ($order != false) { diff --git a/app/store/validate/store_order/StoreOrderValidate.php b/app/store/validate/store_order/StoreOrderValidate.php index f7b4eeb81..3ded2a71d 100644 --- a/app/store/validate/store_order/StoreOrderValidate.php +++ b/app/store/validate/store_order/StoreOrderValidate.php @@ -81,4 +81,9 @@ class StoreOrderValidate extends BaseValidate return $this->only(['id','verify_code']); } + public function sceneCheck() + { + return $this->only(['uid']); + } + } From 341cbe7457fd3e1177d0eb2ac7e738700bb8606c Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 15:54:32 +0800 Subject: [PATCH 044/145] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/store_order/StoreOrderLogic.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 255298eec..9df2d5a1e 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -118,9 +118,12 @@ class StoreOrderLogic extends BaseLogic 'original_price'=>self::$total_price, 'deduction_price' => self::$activity_price ]; - if($user['user_ship']!=4){ - $order['is_vip']=1; + if($user){ + if($user['user_ship']!=4){ + $order['is_vip']=1; + } } + } catch (\Exception $e) { self::setError($e->getMessage()); return false; From 8c1608207ebf0959c651014a7797287ab72ec9f1 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 16:06:28 +0800 Subject: [PATCH 045/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E6=A3=80=E9=AA=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=87=87=E8=B4=AD=E6=AC=BE=E5=A4=9F=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/store_order/StoreOrderController.php | 11 +++++++++++ app/store/validate/store_order/StoreOrderValidate.php | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 2305ab45c..01399ff7a 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -5,6 +5,7 @@ namespace app\store\controller\store_order; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; use app\common\model\order\Cart; +use app\common\model\user\User; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; @@ -130,6 +131,16 @@ class StoreOrderController extends BaseAdminController public function checkSms() { $params = (new StoreOrderValidate())->post()->goCheck('check'); + + $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 + $user= User::where('id',$params['uid'])->find(); + if(empty($user)){ + return $this->fail('无该用户请检查'); + } + $order = StoreOrderLogic::cartIdByOrderInfo($params['cartId'], null, $user, $params); + if($order['order']['pay_price'] > $user['purchase_funds']){ + return $this->fail('当前用户采购款不足支付'); + } $res = (new StoreOrderLogic())->dealSendSms($params); if($res){ return $this->success('发送成功',[],1,1); diff --git a/app/store/validate/store_order/StoreOrderValidate.php b/app/store/validate/store_order/StoreOrderValidate.php index 3ded2a71d..928c46581 100644 --- a/app/store/validate/store_order/StoreOrderValidate.php +++ b/app/store/validate/store_order/StoreOrderValidate.php @@ -21,6 +21,8 @@ class StoreOrderValidate extends BaseValidate protected $rule = [ 'id' => 'requireWithout:verify_code', 'verify_code' => 'requireWithout:id', + 'uid' => 'require|number', + 'cart_id' => 'require|array', ]; @@ -83,7 +85,7 @@ class StoreOrderValidate extends BaseValidate public function sceneCheck() { - return $this->only(['uid']); + return $this->only(['uid','cart_id']); } } From bfbd01fcc1adea437f065b5296d6a92ce28ad488 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 16:07:50 +0800 Subject: [PATCH 046/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=99=E9=A2=9D=E5=92=8C=E8=B4=AD=E4=B9=B0=E8=B5=84?= =?UTF-8?q?=E9=87=91=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=85=85=E5=80=BC=E4=BC=9A=E5=91=98=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 4 +++- app/common/logic/PayNotifyLogic.php | 2 +- app/store/controller/user/UserController.php | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 167aa3c9f..49ef54b36 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -15,6 +15,7 @@ namespace app\admin\logic\user; use app\common\enum\user\UserTerminalEnum; use app\common\logic\BaseLogic; +use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; @@ -148,7 +149,7 @@ class UserLogic extends BaseLogic { $field = [ 'id', 'account', 'nickname', 'avatar', 'real_name', - 'sex', 'mobile', 'create_time', 'login_time', 'channel' + 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' ]; $user = User::where(['id' => $userId])->field($field) @@ -156,6 +157,7 @@ class UserLogic extends BaseLogic $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); $user->sex = $user->getData('sex'); + $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number'); return $user->toArray(); } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 8d595beba..f542f508d 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -212,7 +212,7 @@ class PayNotifyLogic extends BaseLogic bcscale(2); // $user->now_money = bcadd($user->now_money, $price, 2);//v.1 //更新等级 - if ($price >= 1000) { + if ($price >= 0.01) { $user->user_ship = 1; //v.1 } $user->purchase_funds = bcadd($user->purchase_funds, $price, 2); diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php index 35b8737e5..3ad486640 100644 --- a/app/store/controller/user/UserController.php +++ b/app/store/controller/user/UserController.php @@ -8,7 +8,7 @@ use app\store\controller\BaseAdminController; use app\store\lists\user\UserLists; use app\admin\logic\user\UserLogic; use app\admin\validate\user\UserValidate; - +use app\common\model\user\User; class UserController extends BaseAdminController { @@ -22,7 +22,7 @@ class UserController extends BaseAdminController public function add() { $params = (new UserValidate())->post()->goCheck('storeAdd'); - $result = UserLogic::StoreAdd($params); + UserLogic::StoreAdd($params); if (UserLogic::hasError() ) { return $this->fail(UserLogic::getError()); } @@ -37,4 +37,14 @@ class UserController extends BaseAdminController return $this->success('', $detail); } + public function user_ship(){ + $user_ship=$this->request->post('user_ship',0); + $id=$this->request->post('id',0); + if($user_ship==1){ + return $this->fail('充值会员不能前端设置'); + } + User::where('id',$id)->update(['user_ship'=>$user_ship]); + return $this->success('设置成功'); + } + } \ No newline at end of file From 39173539d426131ecb95e7df80c19598c17f19c3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 16:38:53 +0800 Subject: [PATCH 047/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/store/SystemStoreLists.php | 2 +- app/store/controller/store_order/StoreOrderController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/lists/store/SystemStoreLists.php b/app/api/lists/store/SystemStoreLists.php index 2688c24cc..52bef3231 100644 --- a/app/api/lists/store/SystemStoreLists.php +++ b/app/api/lists/store/SystemStoreLists.php @@ -49,7 +49,7 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac $latitude = $this->request->get('latitude',''); $longitude = $this->request->get('longitude',''); if(empty($longitude) || empty($latitude)){ - throw new MyBusinessException('缺失经纬度'); + throw new Exception('缺失经纬度'); } $where[]=['is_show','=',YesNoEnum::YES]; $data = SystemStore::where($this->searchWhere)->where($where) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 01399ff7a..d223fff94 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -137,7 +137,7 @@ class StoreOrderController extends BaseAdminController if(empty($user)){ return $this->fail('无该用户请检查'); } - $order = StoreOrderLogic::cartIdByOrderInfo($params['cartId'], null, $user, $params); + $order = StoreOrderLogic::cartIdByOrderInfo($params['cart_id'], null, $user, $params); if($order['order']['pay_price'] > $user['purchase_funds']){ return $this->fail('当前用户采购款不足支付'); } From d4c53ac69dec1af2b0f8c8a08492f6775c669ce0 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 16:41:04 +0800 Subject: [PATCH 048/145] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=89=E7=BA=A7=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BB=A5=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E6=80=BB?= =?UTF-8?q?=E4=BB=B7=E5=92=8C=E6=8A=B5=E6=89=A3=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 34 ++++++++------ .../store_order/StoreOrderController.php | 45 ------------------- 2 files changed, 20 insertions(+), 59 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 4e4177fe6..086308e48 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -81,10 +81,13 @@ class OrderLogic extends BaseLogic $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - $onePrice = bcsub($find['price'], $find['cost'], 2); - + if ($user && $user['user_ship'] == 4) { + $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } //利润 - $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 + // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 $cart_select[$k]['product_id'] = $find['product_id']; @@ -107,9 +110,9 @@ class OrderLogic extends BaseLogic self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); - self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); + // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - $pay_price =self::$pay_price;// bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 $vipPrice = 0; //成本价 收益 $order = [ @@ -117,7 +120,7 @@ class OrderLogic extends BaseLogic 'order_id' => $params['order_id'] ?? getNewOrderId('PF'), 'total_price' => self::$total_price, //总价 'cost' => self::$cost, //成本价1- - 'profit' => self::$profit, //利润 + 'profit' =>0, //利润 'pay_price' => $pay_price, //后期可能有降价抵扣 'vip_price' => $vipPrice, 'total_num' => count($cart_select), //总数 @@ -128,14 +131,19 @@ class OrderLogic extends BaseLogic 'shipping_type' => $params['shipping_type'] ?? 2, //配送方式 1=快递 ，2=门店自提 'activity' => '减免', 'activity_price' => self::$activity_price, - 'activities' =>0, - 'deduction_price' => self::$activity_price + 'activities' => self::$activity_price>0?1:0, + 'deduction_price' => self::$activity_price, + 'is_vip' => 0, ]; $order['default_delivery'] = 0; if ($params['store_id']) { $order['default_delivery'] = SystemStore::where('id', $params['store_id'])->value('is_send'); } + if($user['user_ship']>=1 &&$user['user_ship']<=3){ + $order['is_vip'] = 1; + + } } catch (\Exception $e) { self::setError($e->getMessage()); return false; @@ -159,10 +167,8 @@ class OrderLogic extends BaseLogic return false; } $_order = $orderInfo['order']; - $_order['uid'] = request()->userId; - $user = User::where('id', \request()->userId)->find(); - $_order['is_vip'] = $user['user_ship']; - $_order['spread_uid'] = UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 + $_order['uid'] = $user['id']; + $_order['spread_uid'] =$params['spread_uid'];// UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 $_order['real_name'] = $user['real_name']; $_order['mobile'] = $user['mobile']; $_order['pay_type'] = $orderInfo['order']['pay_type']; @@ -173,7 +179,7 @@ class OrderLogic extends BaseLogic $_order['reservation'] = YesNoEnum::YES; } if ($addressId > 0) { - $address = UserAddress::where(['id' => $addressId, 'uid' => Request()->userId])->find(); + $address = UserAddress::where(['id' => $addressId, 'uid' => $user['id']])->find(); if ($address) { $_order['real_name'] = $address['real_name']; $_order['user_phone'] = $address['phone']; @@ -197,7 +203,7 @@ class OrderLogic extends BaseLogic $updateData = []; foreach ($goods_list as $k => $v) { $goods_list[$k]['oid'] = $order->id; - $goods_list[$k]['uid'] = request()->userId; + $goods_list[$k]['uid'] = $user['id']; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->withTrashed()->find(); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 01399ff7a..3ba2bc34e 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -4,8 +4,6 @@ namespace app\store\controller\store_order; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; -use app\common\model\order\Cart; -use app\common\model\user\User; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; @@ -17,7 +15,6 @@ use app\common\logic\store_order\StoreOrderLogic; use app\common\model\store_order\StoreOrder; use app\common\model\user_recharge\UserRecharge; use app\store\validate\store_order\StoreOrderValidate; -use support\Cache; use support\Log; use Webman\RedisQueue\Redis; @@ -127,36 +124,11 @@ class StoreOrderController extends BaseAdminController return $this->data($res); } - - public function checkSms() - { - $params = (new StoreOrderValidate())->post()->goCheck('check'); - - $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 - $user= User::where('id',$params['uid'])->find(); - if(empty($user)){ - return $this->fail('无该用户请检查'); - } - $order = StoreOrderLogic::cartIdByOrderInfo($params['cartId'], null, $user, $params); - if($order['order']['pay_price'] > $user['purchase_funds']){ - return $this->fail('当前用户采购款不足支付'); - } - $res = (new StoreOrderLogic())->dealSendSms($params); - if($res){ - return $this->success('发送成功',[],1,1); - }else{ - return $this->fail('发送失败'); - } - - } - - public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); $pay_type = (int)$this->request->post('pay_type'); $addressId = (int)$this->request->post('address_id'); - $sms_code = $this->request->post('sms_code',''); $auth_code = $this->request->post('auth_code'); //微信支付条码 $params = $this->request->post(); if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { @@ -165,23 +137,6 @@ class StoreOrderController extends BaseAdminController if (count($cartId) > 100) { return $this->fail('购物车商品不能超过100个'); } - - if($pay_type == PayEnum::PURCHASE_FUNDS && $sms_code){ - if(empty($cartId)){ - return $this->fail('缺失购物车数据'); - } - $uid = Cart::where('id',$cartId[0])->value('uid'); - $remark = $uid.'_smsPay'; - $code = Cache::get($remark); - if(empty($code)){ - return $this->fail('验证码过期请重新发送'); - } - if ($code !== $sms_code) { - return $this->fail('验证码错误'); - } - - } - $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 $order = StoreOrderLogic::createOrder($cartId, $addressId, null, $params); if ($order != false) { From 68624a0304c4475424ec425450557437d0403f29 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 16:47:50 +0800 Subject: [PATCH 049/145] =?UTF-8?q?feat(OrderLogic):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E4=BA=AB=E5=85=B3=E7=B3=BB=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 086308e48..3d5189acd 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -168,7 +168,7 @@ class OrderLogic extends BaseLogic } $_order = $orderInfo['order']; $_order['uid'] = $user['id']; - $_order['spread_uid'] =$params['spread_uid'];// UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 + $_order['spread_uid'] =$params['spread_uid']??0;// UserSpreadLog::where('uid',request()->userId)->value('old_spread_uid')??0;//预留分享关系 $_order['real_name'] = $user['real_name']; $_order['mobile'] = $user['mobile']; $_order['pay_type'] = $orderInfo['order']['pay_type']; From f8e232fc58ce3e06ceec560ce9e87277e1c9ca56 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 17:13:44 +0800 Subject: [PATCH 050/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E6=B5=81=E6=B0=B4=E5=88=86=E6=94=AF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store_finance_flow/StoreFinanceFlowLists.php | 4 +++- app/common/enum/OrderEnum.php | 15 +++++++++++---- app/common/logic/PayNotifyLogic.php | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index c3ef16898..0b63109db 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -63,13 +63,15 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt } if ($item['financial_pm'] == 0) { $item['number'] = '-' . $item['number']; + $item['financial_type_name'] = '订单支出给'.OrderEnum::getFinancialType($item['financial_type']); + } else { + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']).'获得'; $item['number'] = '+' . $item['number']; } $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : ''; $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); - $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']); }) ->toArray(); } diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index e8312c829..41899dce7 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -145,11 +145,18 @@ class OrderEnum self::USER_ORDER_PAY => '用户订单支付', self::MERCHANT_ORDER_PAY => '商户订单支付', self::PLATFORM_ORDER_PAY => '平台订单支付', - self::MERCHANT_ORDER_OBTAINS => '商户订单获得', - self::ORDER_HANDLING_FEES => '订单手续费', - self::PLATFORM_ORDER_OBTAINS => '平台订单获得', - self::SUPPLIER_ORDER_OBTAINS => '供应商订单获得', + self::MERCHANT_ORDER_OBTAINS => '商户', + self::ORDER_HANDLING_FEES => '手续费', + self::PLATFORM_ORDER_OBTAINS => '平台', + self::SUPPLIER_ORDER_OBTAINS => '供应商', self::SYSTEM_SET => '平台设置', + self::VILLAGE_ORDER_OBTAINS => '村长', + self::BRIGADE_ORDER_OBTAINS=>'队长', + self::OTHER_ORDER_OBTAINS=>'其他', + + + + ]; diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index f542f508d..f40bd4027 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -369,7 +369,7 @@ class PayNotifyLogic extends BaseLogic $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } //供应链订单获得 - $financeLogic->in($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); + $financeLogic->in($transaction_id, bcsub($order['pay_price'], $count_frees, 2), OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); $financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); // } $financeLogic->save(); From dfc7266fb0355d619b50a15f26a9ed8ab99f98be Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 17:15:18 +0800 Subject: [PATCH 051/145] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 5af66e356..eecfe3e13 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -4,6 +4,7 @@ namespace app\store\controller\store_order; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; +use app\common\model\user\User; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; From 4c8ce2bd649af2647786ee529738deeab5117e70 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 17:17:57 +0800 Subject: [PATCH 052/145] =?UTF-8?q?feat(OrderEnum):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=9D=E8=AF=81=E9=87=91=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php | 3 +-- app/common/enum/OrderEnum.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 0b63109db..42428513f 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -63,8 +63,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt } if ($item['financial_pm'] == 0) { $item['number'] = '-' . $item['number']; - $item['financial_type_name'] = '订单支出给'.OrderEnum::getFinancialType($item['financial_type']); - + $item['financial_type_name'] = '订单支付:'.OrderEnum::getFinancialType($item['financial_type']); } else { $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']).'获得'; $item['number'] = '+' . $item['number']; diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index 41899dce7..e9521edab 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -152,6 +152,7 @@ class OrderEnum self::SYSTEM_SET => '平台设置', self::VILLAGE_ORDER_OBTAINS => '村长', self::BRIGADE_ORDER_OBTAINS=>'队长', + self::ORDER_MARGIN=>'保证金', self::OTHER_ORDER_OBTAINS=>'其他', From 6b75053f6fd2d53d79e2fac9bbe05b12139b48df Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 17:19:37 +0800 Subject: [PATCH 053/145] =?UTF-8?q?feat(OrderEnum):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php | 2 +- app/common/enum/OrderEnum.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 42428513f..3dedf3c5a 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -63,7 +63,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt } if ($item['financial_pm'] == 0) { $item['number'] = '-' . $item['number']; - $item['financial_type_name'] = '订单支付:'.OrderEnum::getFinancialType($item['financial_type']); + $item['financial_type_name'] = '订单支出:'.OrderEnum::getFinancialType($item['financial_type']); } else { $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']).'获得'; $item['number'] = '+' . $item['number']; diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index e9521edab..f22c9d32c 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -153,6 +153,7 @@ class OrderEnum self::VILLAGE_ORDER_OBTAINS => '村长', self::BRIGADE_ORDER_OBTAINS=>'队长', self::ORDER_MARGIN=>'保证金', + self::VIP_ORDER_OBTAINS=>'会员', self::OTHER_ORDER_OBTAINS=>'其他', From bf98d4837afd0381545386650961981cc22163e1 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 18:00:53 +0800 Subject: [PATCH 054/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 2 +- app/queue/redis/StoreStorageSend.php | 3 ++- .../store_order/StoreOrderController.php | 15 ++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index f40bd4027..710970f6c 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -96,7 +96,7 @@ class PayNotifyLogic extends BaseLogic public static function purchase_funds($orderSn, $extra = []) { $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - $user = User::where('id', $order['uid'])->find(); + $user = User::where('id', $extra['uid'])->find(); if ($user['purchase_funds'] < $order['pay_price']) { throw new \Exception('采购款不足'); } diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index 1f4e58e7e..23e864870 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -55,7 +55,8 @@ class StoreStorageSend implements Consumer 'bar_code' => $find['bar_code'], 'cate_id' => $find['cate_id'], 'price' => $find['price'], - 'cost' => $find['cost'], +// 'cost' => $find['cost'], //v1.0 + 'cost' => $find['purchase'], 'vip_price' => $find['vip_price'], 'unit' => $find['unit'], 'store_id' => $store_id, diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index eecfe3e13..2a08a4f1f 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -4,6 +4,7 @@ namespace app\store\controller\store_order; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; +use app\common\model\order\Cart; use app\common\model\user\User; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; @@ -141,7 +142,7 @@ class StoreOrderController extends BaseAdminController } $res = (new StoreOrderLogic())->dealSendSms($params); if($res){ - return $this->success('发送成功',[],1,1); + return $this->success('发送成功',[],0,1); }else{ return $this->fail('发送失败'); } @@ -156,20 +157,24 @@ class StoreOrderController extends BaseAdminController $addressId = (int)$this->request->post('address_id'); $auth_code = $this->request->post('auth_code'); //微信支付条码 $params = $this->request->post(); - if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) { + if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY && $pay_type != PayEnum::PURCHASE_FUNDS) { return $this->fail('支付条码不能为空'); } if (count($cartId) > 100) { return $this->fail('购物车商品不能超过100个'); } + $user = null; + if($pay_type == PayEnum::PURCHASE_FUNDS){ + $user = User::where('id',$this->request->post('uid'))->find(); + } $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 - $order = StoreOrderLogic::createOrder($cartId, $addressId, null, $params); + $order = StoreOrderLogic::createOrder($cartId, $addressId, $user, $params); if ($order != false) { switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 - PayNotifyLogic::handle('purchase_funds', $order['order_id']); - return $this->success('采购款支付成功'); + PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); + return $this->success('采购款支付成功',[],0,1); case PayEnum::CASH_PAY: //现金支付 From d04149ba48da80abf9203c8b0a2aa10ffa384194 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 18:12:07 +0800 Subject: [PATCH 055/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/user/UserLists.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index 7f7bc24fe..fb2746572 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -4,6 +4,7 @@ namespace app\store\lists\user; +use app\common\model\store_finance_flow\StoreFinanceFlow; use app\store\lists\BaseAdminDataLists; use app\common\model\user\User; use app\common\model\user\UserShip; @@ -37,7 +38,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface public function lists(): array { - $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time"; + $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds"; $lists = User::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->field($field) @@ -46,6 +47,10 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface $data['sex_text'] = $data->sex_text; $data['mobile'] = substr_replace($data['mobile'], '****', 3, 4); $data['user_ship_name'] =$data['user_ship']==0?'一般用户':UserShip::where('id',$data['user_ship'])->value('title'); + $data['return_money'] = StoreFinanceFlow:: + where(['user_id'=>$data['id'],'status'=>0,'financial_pm'=>0]) + ->sum('number'); + })->toArray(); return $lists; } From 1f9765d44ffecaae4a30b33c252fabf079820db9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 15 Jun 2024 18:45:10 +0800 Subject: [PATCH 056/145] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BB=A5=E5=A4=84=E7=90=86=E4=B8=8D=E5=90=8C=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=89=8B=E7=BB=AD=E8=B4=B9=E3=80=81=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=B4=B9=E7=94=A8=E7=AD=89=E6=94=AF=E5=87=BA=E5=92=8C?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 75 ++++++++++++++++++----------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index f40bd4027..cd804d806 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -304,10 +304,10 @@ class PayNotifyLogic extends BaseLogic //平台手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); - $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0,0, $order['pay_type']); //平台手续费 - - $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 - //冻结金额的 + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 + } // $frozen = bcsub($order->profit, $fees, 2); //缴纳齐全了就加商户没有就加到平台 $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); @@ -316,22 +316,32 @@ class PayNotifyLogic extends BaseLogic $count_frees = bcadd($count_frees, $store_profit, 2); if ($deposit > 0) { if ($deposit > $store_profit) { - $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + if ($store_profit > 0) { + $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } } else { $money = bcsub($store_profit, $deposit, 2); - $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); //平台手续费 + if ($deposit > 0) { + $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + if ($money) { + $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } } } else { - $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); //平台手续费 + if ($store_profit > 0) { + $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } } - if ($order['is_vip'] >=1) { + if ($order['is_vip'] >= 1) { if ($order['spread_uid'] > 0) { $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); - $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); //vip订单获得 - $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 + $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } } $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); @@ -351,27 +361,34 @@ class PayNotifyLogic extends BaseLogic } } } - //村长获得 - if ($village_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $village_uid; + if ($fees > 0) { + //村长获得 + if ($village_uid > 0) { + $financeLogic->other_arr['vip_uid'] = $village_uid; + } + + $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //队长获得 + if ($brigade_uid > 0) { + $financeLogic->other_arr['vip_uid'] = $brigade_uid; + } + $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //其他获得 + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } - $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - //队长获得 - if ($brigade_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $brigade_uid; - } - $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0,$order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - //其他获得 - $financeLogic->other_arr['vip_uid'] = 0; - $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } + $fees=bcsub($order['pay_price'], $count_frees, 2); //供应链订单获得 - $financeLogic->in($transaction_id, bcsub($order['pay_price'], $count_frees, 2), OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0,0, $order['pay_type']); - $financeLogic->out($transaction_id, $count_frees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - // } + if ($fees > 0) { + $financeLogic->in($transaction_id,$fees , OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + + } +// } $financeLogic->save(); // } } From 1976367b3cd31d47950768d05825281b99d2281a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 18:46:37 +0800 Subject: [PATCH 057/145] =?UTF-8?q?=E9=A2=84=E7=95=99=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_order/StoreOrderLogic.php | 8 ++++-- app/common/service/SmsService.php | 28 +++++++++++++------ .../store_order/StoreOrderController.php | 13 +++++++++ 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 9df2d5a1e..e76081670 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -314,7 +314,7 @@ class StoreOrderLogic extends BaseLogic } - public function dealSendSms($param) + public function dealSendSms($param,$type = 0) { $code = generateRandomCode(); $phone = User::where('id',$param['uid'])->value('mobile'); @@ -322,8 +322,12 @@ class StoreOrderLogic extends BaseLogic throw new \Exception('用户未设置手机号'); } $template = getenv('SMS_TEMPLATE'); + if($type){ + $check =(new SmsService())->client($phone,$template,$code,1); + }else{ + $check =(new SmsService())->client($phone,$template,$code); + } - $check =(new SmsService())->client($phone,$template,$code); if($check){ $remark = $param['uid'].'_smsPay'; Cache::set($remark,$code,5*60); diff --git a/app/common/service/SmsService.php b/app/common/service/SmsService.php index d1270b1a9..af0d86ba0 100644 --- a/app/common/service/SmsService.php +++ b/app/common/service/SmsService.php @@ -45,18 +45,30 @@ class SmsService } - public function client($phone,$template,$code) + public function client($phone,$template,$code,$type = 0) { try{ $easySms = new EasySms($this->config); - $res = $easySms->send($phone, [ - 'content' => '您的验证码为: '.$code, - 'template' => $template, - 'data' => [ - 'code' => $code - ], - ]); + if($type){//预留发送到货短信 + $res = $easySms->send($phone, [ + 'content' => '您的验证码为: '.$code, + 'template' => $template, + 'data' => [ + 'code' => $code + ], + ]); + + }else{ + $res = $easySms->send($phone, [ + 'content' => '您的验证码为: '.$code, + 'template' => $template, + 'data' => [ + 'code' => $code + ], + ]); + } + if($res && $res['aliyun']['status'] == 'success'){ return true; }else{ diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 2a08a4f1f..8f4fb0338 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -373,5 +373,18 @@ class StoreOrderController extends BaseAdminController } return $this->fail('支付失败'); } + + public function stocking() + { + $uid = $this->request->post('uid'); + $res = (new StoreOrderLogic())->dealSendSms(['uid'=>$uid],1); + if($res){ + return $this->success('发送成功',[],0,1); + }else{ + return $this->fail('发送失败'); + } + + + } } From dc1fea9a15520744779ab5d5d8a7442d107c3d72 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 18:52:20 +0800 Subject: [PATCH 058/145] =?UTF-8?q?=E5=85=85=E9=92=B1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 8f4fb0338..f58c12af8 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -142,7 +142,7 @@ class StoreOrderController extends BaseAdminController } $res = (new StoreOrderLogic())->dealSendSms($params); if($res){ - return $this->success('发送成功',[],0,1); + return $this->success('发送成功',[],1,1); }else{ return $this->fail('发送失败'); } @@ -174,7 +174,7 @@ class StoreOrderController extends BaseAdminController case PayEnum::PURCHASE_FUNDS: //采购款支付 PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); - return $this->success('采购款支付成功',[],0,1); + return $this->success('采购款支付成功',[],1,1); case PayEnum::CASH_PAY: //现金支付 From 87227e38fa994758c7de5eb08e81791b8c0f13cd Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 15 Jun 2024 18:57:28 +0800 Subject: [PATCH 059/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index f58c12af8..1584096d1 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -142,7 +142,7 @@ class StoreOrderController extends BaseAdminController } $res = (new StoreOrderLogic())->dealSendSms($params); if($res){ - return $this->success('发送成功',[],1,1); + return $this->success('发送成功',[],1,0); }else{ return $this->fail('发送失败'); } @@ -174,7 +174,7 @@ class StoreOrderController extends BaseAdminController case PayEnum::PURCHASE_FUNDS: //采购款支付 PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); - return $this->success('采购款支付成功',[],1,1); + return $this->success('采购款支付成功',[],1,0); case PayEnum::CASH_PAY: //现金支付 From 04776f7b80976bb50a5dfb6c75010ffcbcd9d523 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 16 Jun 2024 20:52:11 +0800 Subject: [PATCH 060/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E5=BC=95?= =?UTF-8?q?=E5=85=A5UserSign=E6=A8=A1=E5=9E=8B=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9D=91=E9=95=BF=E5=92=8C=E9=98=9F=E9=95=BF=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=8E=B7=E5=BE=97=E5=85=91=E6=8D=A2=E5=88=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 46 +++++++++++++++++-------- app/common/model/user_sign/UserSign.php | 22 ++++++++++++ app/queue/redis/StoreStorageSend.php | 1 + 3 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 app/common/model/user_sign/UserSign.php diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index c666b5917..e51603b15 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -15,6 +15,7 @@ use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; use app\common\model\user\UserShip; +use app\common\model\user_sign\UserSign; use app\common\service\PushService; use support\Log; use think\facade\Db; @@ -78,7 +79,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); - self::afterPay($order); + // self::afterPay($order); Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -112,7 +113,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); - self::afterPay($order); + // self::afterPay($order); Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -142,12 +143,12 @@ class PayNotifyLogic extends BaseLogic $user = User::where('id', $order['uid'])->find(); if ($order->pay_type == OrderEnum::CASHIER_ORDER_PAY || $order->pay_type == OrderEnum::CASHIER_ORDER_ALI_PAY) { //收银台支付 $order->status = 2; + self::afterPay($order, $extra['transaction_id']); } else { $capitalFlowDao = new CapitalFlowLogic($user); //微信支付和用户余额无关 $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); } - self::afterPay($order, $extra['transaction_id']); if ($order->pay_type == 9) { @@ -239,6 +240,7 @@ class PayNotifyLogic extends BaseLogic $order->paid = 1; $order->pay_time = time(); $order->status = 2; + self::afterPay($order); if (!$order->save()) { throw new \Exception('订单保存出错'); } @@ -272,8 +274,9 @@ class PayNotifyLogic extends BaseLogic } if ($order->pay_type == 9) { $order->status = 2; + self::afterPay($order); + } - self::afterPay($order); if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; @@ -363,18 +366,33 @@ class PayNotifyLogic extends BaseLogic } if ($fees > 0) { //村长获得 - if ($village_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $village_uid; - } + $sing=[]; + $user_sing=new UserSign(); - $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $sing[]=[ + 'uid'=>$village_uid, + 'title'=>'村长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + $sing[]=[ + 'uid'=>$brigade_uid, + 'title'=>'队长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + // if ($village_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $village_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //队长获得 - if ($brigade_uid > 0) { - $financeLogic->other_arr['vip_uid'] = $brigade_uid; - } - $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); //其他获得 $financeLogic->other_arr['vip_uid'] = 0; $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); diff --git a/app/common/model/user_sign/UserSign.php b/app/common/model/user_sign/UserSign.php new file mode 100644 index 000000000..db0ade179 --- /dev/null +++ b/app/common/model/user_sign/UserSign.php @@ -0,0 +1,22 @@ + $find['purchase'], 'vip_price' => $find['vip_price'], 'unit' => $find['unit'], + 'batch' => $find['batch'], 'store_id' => $store_id, 'sales' => 0, 'stock' => 0, From 0286d428e69c322bdd7709e83bbb44f0052f3818 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 10:02:16 +0800 Subject: [PATCH 061/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 1 - app/api/controller/store/StoreController.php | 46 +++++++++++++++++-- app/api/controller/user/UserController.php | 1 - app/api/validate/UserValidate.php | 13 ++++++ .../store_order/StoreOrderController.php | 1 + 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 49ef54b36..330c588da 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -102,7 +102,6 @@ class UserLogic extends BaseLogic return $res; } catch (\Exception $e) { Db::rollback(); - d($e); self::setError($e->getMessage()); return false; } diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index ef5b21d04..adc00994b 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -2,12 +2,18 @@ namespace app\api\controller\store; +use app\admin\logic\user\UserLogic as UserUserLogic; use app\api\lists\store\SystemStoreLists; use app\api\controller\BaseApiController; use app\api\logic\store\StoreLogic; -use app\common\service\pay\PayService; -use Webman\Config; - +use app\api\logic\user\UserLogic; +use app\api\validate\UserValidate; +use app\common\enum\PayEnum; +use app\common\logic\PaymentLogic; +use app\common\logic\PayNotifyLogic; +use app\common\model\user\User; +use app\common\model\user_recharge\UserRecharge; +use Webman\RedisQueue\Redis; class StoreController extends BaseApiController { @@ -32,5 +38,39 @@ class StoreController extends BaseApiController } } + /** + * 门店会员充值 + */ + public function recharge() + { + $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + $params['uid'] = $this->userId; + $params['channel_type'] = $this->userInfo['terminal']; + $find=User::where('mobile',$params['mobile'])->find(); + if(!$find){ + $find=UserUserLogic::StoreAdd($params); + } + $data=[ + 'store_id'=>$params['store_id'], + 'uid'=>$find['uid'], + 'staff_id'=>0, + 'order_id'=>getNewOrderId('CZ'), + 'price'=>$params['price'], + ]; + $order = UserRecharge::create($data); + $order['pay_price']=$order['price']; + $result = PaymentLogic::codepay($auth_code, $order); + if (PaymentLogic::hasError()) { + return $this->fail(PaymentLogic::getError(), $params); + } + if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); + } else { + Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); + return $this->success('用户支付中'); + } + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + } } diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php index b21be4f69..2f2e921e9 100644 --- a/app/api/controller/user/UserController.php +++ b/app/api/controller/user/UserController.php @@ -89,7 +89,6 @@ class UserController extends BaseApiController return $this->fail(PaymentLogic::getError(), $params); } return $this->success('', $result); - } // #[ diff --git a/app/api/validate/UserValidate.php b/app/api/validate/UserValidate.php index ddc907b23..d670e7327 100644 --- a/app/api/validate/UserValidate.php +++ b/app/api/validate/UserValidate.php @@ -16,10 +16,14 @@ class UserValidate extends BaseValidate protected $rule = [ 'code' => 'require', + 'store_id' => 'require', + 'mobile' => 'require', ]; protected $message = [ 'code.require' => '参数缺失', + 'store_id.require' => '门店id', + 'mobile.require' => '手机', ]; @@ -57,5 +61,14 @@ class UserValidate extends BaseValidate { return $this->only(['price']); } + /** + * @notes 充值 + * @return UserValidate + * @Time: 2024/6/4 22:50 + */ + public function sceneRechargeStoreMoney() + { + return $this->only(['price']); + } } \ No newline at end of file diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 1584096d1..765fb4a2b 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -2,6 +2,7 @@ namespace app\store\controller\store_order; +use app\admin\logic\user\UserLogic; use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; use app\common\model\order\Cart; From 950cd2fe3a262f8c55e9af51190d08455cd11dbc Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 10:07:30 +0800 Subject: [PATCH 062/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 330c588da..894799e92 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -82,7 +82,7 @@ class UserLogic extends BaseLogic 'account' => $params['mobile'], 'password' => $password, 'mobile' => $params['mobile'], - 'user_ship' => $params['user_ship'], + 'user_ship' => $params['user_ship']??0, ]; $res=User::create($data); From 00a72c0b71db9b46630c27e740ac490306898f86 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 10:22:44 +0800 Subject: [PATCH 063/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=A0=B8=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 4 ++++ .../controller/store_order/StoreOrderController.php | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 3d5189acd..7f50e6ea2 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -388,11 +388,15 @@ class OrderLogic extends BaseLogic 'status' => OrderEnum::RECEIVED_GOODS, 'is_writeoff' => OrderEnum::IS_OK, 'update_time' => time(), + 'store_id' => $params['store_id'], + 'staff_id' => $params['staff_id']??0, ], ['id' => $data['id']]); (new StoreOrderCartInfo())->update([ 'verify_code'=>$params['verify_code'].'-1', 'writeoff_time' => time(), 'is_writeoff' => YesNoEnum::YES, + 'store_id' => $params['store_id'], + 'staff_id' => $params['staff_id']??0, 'update_time' => time(), ], ['oid' => $data['id']]); $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 765fb4a2b..70eba2f91 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -151,6 +151,9 @@ class StoreOrderController extends BaseAdminController } + /** + * 创建订单 + */ public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); @@ -216,6 +219,9 @@ class StoreOrderController extends BaseAdminController } } + /** + * 重新支付 + */ public function pay() { $order_id = $this->request->post('order_id'); @@ -273,6 +279,9 @@ class StoreOrderController extends BaseAdminController return $this->fail('支付失败'); } + /** + * 订单核销 + */ public function writeoff_order() { $params = (new OrderValidate())->post()->goCheck('check'); @@ -280,6 +289,8 @@ class StoreOrderController extends BaseAdminController if (empty($count)) { return $this->fail('无该核销码请检查'); } + $params['store_id']=$this->adminInfo['store_id']; + $params['staff_id']=$this->adminId; $res = OrderLogic::writeOff($params); if ($res) { return $this->success('核销成功'); From 1eb395bbe0c230f2c57d41f98bb77e7a8e807f72 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 10:51:55 +0800 Subject: [PATCH 064/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95API=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 2 +- app/api/logic/order/OrderLogic.php | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index adc00994b..253436c97 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -56,7 +56,7 @@ class StoreController extends BaseApiController 'uid'=>$find['uid'], 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), - 'price'=>$params['price'], + 'price'=>1000, ]; $order = UserRecharge::create($data); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 7f50e6ea2..5896de4e4 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -8,6 +8,7 @@ use app\common\enum\UserShipEnum; use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\logic\CapitalFlowLogic; +use app\common\logic\PayNotifyLogic; use app\common\logic\StoreFinanceFlowLogic; use app\common\model\dict\DictData; use app\common\model\dict\DictType; @@ -399,11 +400,13 @@ class OrderLogic extends BaseLogic 'staff_id' => $params['staff_id']??0, 'update_time' => time(), ], ['oid' => $data['id']]); - $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); - if (!empty($financeFlow)) { - $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); - $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); - } + // $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); + // if (!empty($financeFlow)) { + // $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); + // $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); + // } + $order=StoreOrder::where('id',$data['id'])->find(); + PayNotifyLogic::afterPay($order); Db::commit(); return true; } catch (\Exception $e) { From f1219258c3fed62156522df76d6d24dc5e8518f8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 11:04:23 +0800 Subject: [PATCH 065/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E6=9D=A1=E7=A0=81=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/PayController.php | 7 ++++++- app/api/controller/store/StoreController.php | 2 +- app/common/logic/PaymentLogic.php | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php index 6603df95e..90e6bfceb 100644 --- a/app/api/controller/PayController.php +++ b/app/api/controller/PayController.php @@ -68,6 +68,7 @@ class PayController extends BaseApiController public function wechatQuery() { $order_no = $this->request->get('order_no'); + $recharge = $this->request->get('recharge',0); $order = [ 'out_trade_no' => $order_no, ]; @@ -75,7 +76,11 @@ class PayController extends BaseApiController $res = $app->wechat->query($order); if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + if($recharge==0){ + PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); + }else{ + PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); + } return $this->success('支付成功'); } else { return $this->fail('订单支付中'); diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 253436c97..9ac5b9b7a 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -61,7 +61,7 @@ class StoreController extends BaseApiController $order = UserRecharge::create($data); $order['pay_price']=$order['price']; - $result = PaymentLogic::codepay($auth_code, $order); + $result = PaymentLogic::codepay($auth_code, $order,'条码支付'); if (PaymentLogic::hasError()) { return $this->fail(PaymentLogic::getError(), $params); } diff --git a/app/common/logic/PaymentLogic.php b/app/common/logic/PaymentLogic.php index 98b0c7fb4..51df608a2 100644 --- a/app/common/logic/PaymentLogic.php +++ b/app/common/logic/PaymentLogic.php @@ -74,7 +74,7 @@ class PaymentLogic extends BaseLogic /** * 微信条码支付 */ - public static function codepay($auth_code, $order) + public static function codepay($auth_code, $order,$description='条码商品') { $pattern = '/^(10|11|12|13|14|15)\d{16}$/'; @@ -83,7 +83,7 @@ class PaymentLogic extends BaseLogic return false; } $order = [ - 'description' => '条码商品', + 'description' => $description, 'out_trade_no' => (string)$order['order_id'], 'payer' => [ 'auth_code' => (string)$auth_code From 2a9887e632a0b7053f627cddb29b5b8847a15260 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 11:43:28 +0800 Subject: [PATCH 066/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E5=95=86=E6=88=B7=E5=88=86=E7=B1=BB=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_product/StoreProductLogic.php | 103 +++++++++++++----- .../store_product_cate/StoreProductCate.php | 14 +++ 2 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 app/common/model/store_product_cate/StoreProductCate.php diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index e88207b5f..e8ab690b5 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -9,6 +9,7 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_attr_value\StoreProductAttrValue; +use app\common\model\store_product_cate\StoreProductCate; use app\common\model\system_store\SystemStore; use app\common\model\system_store_storage\SystemStoreStorage; use app\Request; @@ -48,7 +49,7 @@ class StoreProductLogic extends BaseLogic 'purchase' => $params['purchase'], 'rose' => $params['rose'], 'is_return' => $params['is_return'], - 'swap' => $params['swap']??0, + 'swap' => $params['swap'] ?? 0, ]; // if ($params['rose'] > 0) { // $rose_price = bcmul($params['cost'], $params['rose'], 2); @@ -94,6 +95,34 @@ class StoreProductLogic extends BaseLogic } } + public static function deleteRelatedData($cate_id) + { + $data_to_delete = StoreProductCate::where('cate_id', $cate_id)->select(); + foreach ($data_to_delete as $item) { + + if ($item['pid'] != 0) { + self::deleteRelatedData($item['pid']); + StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); + } + + if($item['pid'] == 0 && in_array($item['count'],[0,1])){ + StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); + } + + } + } + + // 递归减少分类数据的count值 + public static function decreaseCount($cate_id) + { + $data_to_decrease = StoreProductCate::where('cate_id', $cate_id)->select(); + foreach ($data_to_decrease as $item) { + if ($item['pid'] != 0) { + self::decreaseCount($item['pid']); + } + StoreProductCate::where('id', $item['id'])->update(['count' => $item['count'] - 1]); + } + } /** * @notes 编辑商品列表 @@ -106,30 +135,51 @@ class StoreProductLogic extends BaseLogic { Db::startTrans(); try { - $data = [ - 'store_name' => $params['store_name'], - 'image' => $params['image'], - 'bar_code' => $params['bar_code'] ?? '', - 'cate_id' => $params['cate_id'], - 'unit' => $params['unit'], - 'stock' => $params['stock'], - 'cost' => $params['cost'], - 'purchase' => $params['purchase'], - 'rose' => $params['rose'], - 'is_return' => $params['is_return'], - 'price' => $params['price'], - 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], - 'swap' => $params['swap']??0, + $data = [ + 'store_name' => $params['store_name'], + 'image' => $params['image'], + 'bar_code' => $params['bar_code'] ?? '', + 'cate_id' => $params['cate_id'], + 'unit' => $params['unit'], + 'stock' => $params['stock'], + 'cost' => $params['cost'], + 'purchase' => $params['purchase'], + 'rose' => $params['rose'], + 'is_return' => $params['is_return'], + 'price' => $params['price'], + 'vip_price' => $params['vip_price'], + 'swap' => $params['swap'] ?? 0, + + ]; + + StoreProduct::where('id', $params['id'])->update($data); + $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') + ->select(); + + // 获取分类ID + foreach ($old_cate as $vv) { + $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select(); + //删除之前的分类 + foreach ($related_data as $value) { + if ($value['count'] == 1) { + self::deleteRelatedData($value['cate_id']); + } elseif ($value['count'] > 1) { + self::decreaseCount($value['cate_id']); + } + //新增对应的分类 + self::updateGoodsclass($params['cate_id'], $value['store_id']); + } + } + + + //修改 + StoreBranchProduct::where('product_id', $params['id'])->update([ + 'price' => $params['price'], 'vip_price' => $params['vip_price'], + 'cost' => $params['cost'], 'cate_id' => $params['cate_id'] + ]); - ]; - StoreProduct::where('id', $params['id'])->update($data); - StoreBranchProduct::where('product_id', $params['id'])->update([ - 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'] - ]); Db::commit(); - return true; + return true; } catch (\Exception $e) { Db::rollback(); self::setError($e->getMessage()); @@ -148,7 +198,7 @@ class StoreProductLogic extends BaseLogic public static function delete(array $params): bool { $res = StoreProduct::destroy($params['id']); - StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time'=>time()]); + StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time' => time()]); return $res; } @@ -192,7 +242,7 @@ class StoreProductLogic extends BaseLogic self::cate_update($cate_id, $two['id'], $store_id, 3); self::cate_update($two['id'], $two['pid'], $store_id, 2); self::cate_update($two['pid'], 0, $store_id, 1); - }else{ + } else { if ($one['pid'] == 0) { self::cate_update($one['id'], 0, $store_id, 1); } else { @@ -200,7 +250,7 @@ class StoreProductLogic extends BaseLogic self::cate_update($one['pid'], 0, $store_id, 1); } } - } + } } } @@ -213,6 +263,7 @@ class StoreProductLogic extends BaseLogic Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]); } } + /** * 复制商品到门店 */ diff --git a/app/common/model/store_product_cate/StoreProductCate.php b/app/common/model/store_product_cate/StoreProductCate.php new file mode 100644 index 000000000..41338c9e7 --- /dev/null +++ b/app/common/model/store_product_cate/StoreProductCate.php @@ -0,0 +1,14 @@ + Date: Mon, 17 Jun 2024 11:52:13 +0800 Subject: [PATCH 067/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/cate/CateLists.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/lists/cate/CateLists.php b/app/api/lists/cate/CateLists.php index 87a8fb73c..e924419bf 100644 --- a/app/api/lists/cate/CateLists.php +++ b/app/api/lists/cate/CateLists.php @@ -46,6 +46,7 @@ class CateLists extends BaseAdminDataLists implements ListsSearchInterface $level = Request()->get('level', 1); $this->searchWhere[] = ['level', '=', $level]; $this->searchWhere[] = ['count', '>', 0]; + $this->searchWhere[] = ['delete_time', '=', null]; $cate_arr = Db::name('store_product_cate')->where($this->searchWhere)->column('cate_id'); $lists = []; if ($cate_arr) { From 097ca47c074edfd71211bf539bab86a74e9ca0c3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 13:34:30 +0800 Subject: [PATCH 068/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=AD=97=E6=AE=B5=E5=88=B0=E5=95=86=E5=93=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E9=80=BB=E8=BE=91=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/store_product/StoreProductLists.php | 2 +- app/admin/logic/store_product/StoreProductLogic.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index 7c0c9836e..8d2d6969b 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -46,7 +46,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa public function lists(): array { return StoreProduct::where($this->searchWhere) - ->field(['id', 'image', 'store_name','swap', 'cate_id', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) + ->field(['id', 'image', 'store_name','swap', 'cate_id','batch', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index e88207b5f..3ca4152de 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -49,6 +49,7 @@ class StoreProductLogic extends BaseLogic 'rose' => $params['rose'], 'is_return' => $params['is_return'], 'swap' => $params['swap']??0, + 'batch' => $params['batch']??0, ]; // if ($params['rose'] > 0) { // $rose_price = bcmul($params['cost'], $params['rose'], 2); @@ -120,6 +121,7 @@ class StoreProductLogic extends BaseLogic 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['cost'], + 'batch' => $params['batch'], 'swap' => $params['swap']??0, ]; From ed5d63035ba8f0b9cf02b99b96a84908e4d5416b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 13:39:56 +0800 Subject: [PATCH 069/145] =?UTF-8?q?feat(StoreController):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=86=20StoreController=20=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=86=E5=88=AB=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 9ac5b9b7a..59493a688 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -45,15 +45,13 @@ class StoreController extends BaseApiController { $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney'); $auth_code = $this->request->post('auth_code'); //微信支付条码 - $params['uid'] = $this->userId; - $params['channel_type'] = $this->userInfo['terminal']; $find=User::where('mobile',$params['mobile'])->find(); if(!$find){ $find=UserUserLogic::StoreAdd($params); } $data=[ 'store_id'=>$params['store_id'], - 'uid'=>$find['uid'], + 'uid'=>$find['id'], 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), 'price'=>1000, From b0bda5044971a26a88df7d64b1e6ac9ae7326f23 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 13:47:45 +0800 Subject: [PATCH 070/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=85=91=E6=8D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductController.php | 7 +- .../StoreBranchProductExchangeLists.php | 125 ++++++++++++++++++ app/api/controller/store/StoreController.php | 2 +- 3 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php index c26452cb4..8b97950eb 100644 --- a/app/admin/controller/store_branch_product/StoreBranchProductController.php +++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\store_branch_product; use app\admin\controller\BaseAdminController; use app\admin\lists\store_branch_product\StoreBranchProductLists; +use app\admin\lists\store_branch_product_exchange\StoreBranchProductExchangeLists; use app\admin\logic\store_branch_product\StoreBranchProductLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\validate\store_product\StoreProductValidate; @@ -27,7 +28,11 @@ class StoreBranchProductController extends BaseAdminController */ public function lists() { - return $this->dataLists(new StoreBranchProductLists()); + if($this->request->get('exchange',0)==1){ + return $this->dataLists(new StoreBranchProductExchangeLists()); + }else{ + return $this->dataLists(new StoreBranchProductLists()); + } } diff --git a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php new file mode 100644 index 000000000..f4144ab48 --- /dev/null +++ b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php @@ -0,0 +1,125 @@ + ['product_id', 'cate_id','store_id','status'], + '%pipe_like%' => ['store_name_code'=>'store_name|bar_code'], + '%like%' => ['store_name'], + ]; + } + + + /** + * @notes 获取门店列表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 17:45 + */ + public function lists(): array + { + $status = $this->params['status'] ?? ''; + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $arr=Cate::where('pid',$class_all)->column('id'); + if($arr){ + $arr2=Cate::where('pid','in',$arr)->column('id'); + $where[]=['cate_id','in',array_merge($arr,$arr2)]; + } + } + return StoreBranchProductExchange::where($this->searchWhere)->where($where) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + ->when(!empty($this->adminInfo['store_id']), function ($query) { + $query->where('store_id', $this->adminInfo['store_id']); + }) + ->when(!empty($status), function ($query) use ($status) { + if ($status == 1) { + $query->where('status', $status); + } elseif ($status == 2) { + $query->where('status', 0); + } elseif ($status == 3) { + $query->where('stock', '<=', 0); + } elseif ($status == 4) { + $query->where('stock', '<', 10)->where('stock', '>', 0); + } + }) + ->limit($this->limitOffset, $this->limitLength) + ->order(['sort' => 'desc','stock'=>'desc','id' => 'desc']) + ->select() + ->each(function ($item) { + $item['system_store_name']=SystemStore::where('id',$item['store_id'])->value('name'); + $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name'); + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取门店列表数量 + * @return int + * @author admin + * @date 2024/05/31 17:45 + */ + public function count(): int + { + $status = $this->params['status'] ?? ''; + $class_all=$this->request->get('class_all'); + $where=[]; + if($class_all){ + $arr=Cate::where('pid',$class_all)->column('id'); + if($arr){ + $arr2=Cate::where('pid','in',$arr)->column('id'); + $where[]=['cate_id','in',array_merge($arr,$arr2)]; + } + } + return StoreBranchProductExchange::where($this->searchWhere)->where($where) + ->when(!empty($this->adminInfo['store_id']), function ($query) { + $query->where('store_id', $this->adminInfo['store_id']); + }) + ->when(!empty($status), function ($query) use ($status) { + if ($status == 1) { + $query->where('status', $status); + } elseif ($status == 2) { + $query->where('status', 0); + } elseif ($status == 3) { + $query->where('stock', '<=', 0); + } elseif ($status == 4) { + $query->where('stock', '<', 10)->where('stock', '>', 0); + } + }) + ->count(); + } + +} diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 59493a688..a620c3d24 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -54,7 +54,7 @@ class StoreController extends BaseApiController 'uid'=>$find['id'], 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), - 'price'=>1000, + 'price'=>0.01, ]; $order = UserRecharge::create($data); From c3e6bdf5d00497c36b28829c89d28d7c264b1ec9 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 14:09:39 +0800 Subject: [PATCH 071/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=92=8C=E9=97=A8=E5=BA=97=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 1 + app/store/logic/WorkbenchLogic.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index a620c3d24..9c8c22fb0 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -55,6 +55,7 @@ class StoreController extends BaseApiController 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), 'price'=>0.01, + 'recharge_type'=>'wechat_mini' ]; $order = UserRecharge::create($data); diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index bb7e57183..8f349359c 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -28,6 +28,7 @@ use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_visit\StoreVisit; use app\common\model\system_store\SystemStore; +use app\common\model\user_recharge\UserRecharge; use app\common\service\ConfigService; use app\common\service\FileService; @@ -60,6 +61,11 @@ class WorkbenchLogic extends BaseLogic $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 2]); //门店收益金额 $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, [], 'profit'); + //门店收款金额 + $data['receipt_amount'] = UserRecharge::where([ + 'store_id'=>$params['store_id'], + 'paid'=>YesNoEnum::YES + ])->sum('price'); //门店成交用户数 $data['user_number'] = StoreOrder::where('store_id', $params['store_id']) ->where('paid', 1) @@ -82,7 +88,8 @@ class WorkbenchLogic extends BaseLogic $i++; } $field = 'from_unixtime(pay_time,"%m-%d") as pay_time,sum(pay_price) as pay_price'; - } else { + } + else { $group = 'MONTH(pay_time)'; $i = 0; $month = 0; From b6211105c0554992aa9bd8f0fa66865da7f5c41a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:19:54 +0800 Subject: [PATCH 072/145] =?UTF-8?q?feat(store):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 15 +++++ .../user/UserRechargeController.php | 24 +++++++ app/api/lists/product/ProductLists.php | 4 +- app/api/lists/user/UserRechargeLists.php | 63 +++++++++++++++++++ .../store_order/StoreOrderController.php | 1 + 5 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 app/api/controller/user/UserRechargeController.php create mode 100644 app/api/lists/user/UserRechargeLists.php diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index a620c3d24..c4368e496 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -55,6 +55,7 @@ class StoreController extends BaseApiController 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), 'price'=>0.01, + 'recharge_type'=>'INDUSTRYMEMBERS', ]; $order = UserRecharge::create($data); @@ -71,4 +72,18 @@ class StoreController extends BaseApiController } return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); } + + /** + * 门店会员充值数量 + */ + public function recharge_count() + { + $store_id = $this->request->get('store_id',0); + $count=0; + if($store_id){ + $count= UserRecharge::where(['store_id'=>$store_id,'recharge_type'=>'INDUSTRYMEMBERS','paid'=>1])->count(); + } + return $this->success('ok',['count'=>$count]); + + } } diff --git a/app/api/controller/user/UserRechargeController.php b/app/api/controller/user/UserRechargeController.php new file mode 100644 index 000000000..6ca86becf --- /dev/null +++ b/app/api/controller/user/UserRechargeController.php @@ -0,0 +1,24 @@ +dataLists(new UserFeedbackLists()); + } + } diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index a11a486c2..438a317e5 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -113,7 +113,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li if($M_store_id){ $where[]=['store_id','=',$M_store_id]; $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) + ->field(['id', 'product_id','cate_id','store_name','batch', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) ->limit($this->limitOffset, $this->limitLength) ->with(['className','unitName']) ->order($this->sortOrder) @@ -122,7 +122,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li }else{ $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) + ->field(['id', 'product_id','cate_id','store_name','batch','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) ->limit($this->limitOffset, $this->limitLength) ->with(['className','unitName']) ->order($this->sortOrder) diff --git a/app/api/lists/user/UserRechargeLists.php b/app/api/lists/user/UserRechargeLists.php new file mode 100644 index 000000000..482cf821c --- /dev/null +++ b/app/api/lists/user/UserRechargeLists.php @@ -0,0 +1,63 @@ + ['store_id','recharge_type'], + ]; + } + + + /** + * @notes 获取用户充值表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/05/13 16:56 + */ + public function lists(): array + { + return UserRecharge::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $user = User::field('nickname')->where('id',$data['uid'])->findOrEmpty(); + $data['user_name'] = !$user->isEmpty() ? $user['nickname'] : ''; + }) + ->toArray(); + } + + + /** + * @notes 获取用户充值表数量 + * @return int + * @author likeadmin + * @date 2024/05/13 16:56 + */ + public function count(): int + { + return UserFeedback::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 70eba2f91..de727787f 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -350,6 +350,7 @@ class StoreOrderController extends BaseAdminController 'staff_id'=>$this->adminId, 'order_id'=>getNewOrderId('CZ'), 'price'=>$params['price'], + 'recharge_type'=>'INDUSTRYMEMBERS', ]; $order = UserRecharge::create($data); $order['pay_price']=$order['price']; From 449a0a7d2eb7ae903a50bb3b8c838ca94889ef86 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 14:20:50 +0800 Subject: [PATCH 073/145] =?UTF-8?q?=E8=B5=B7=E6=89=B9=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index a11a486c2..f208633c8 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -113,7 +113,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li if($M_store_id){ $where[]=['store_id','=',$M_store_id]; $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) + ->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit','batch']) ->limit($this->limitOffset, $this->limitLength) ->with(['className','unitName']) ->order($this->sortOrder) @@ -122,7 +122,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li }else{ $data = StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit']) + ->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit','batch']) ->limit($this->limitOffset, $this->limitLength) ->with(['className','unitName']) ->order($this->sortOrder) From 26f3117e8996273f8ebe92b7a40646431673a581 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:28:17 +0800 Subject: [PATCH 074/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=86=E5=95=86=E5=93=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=AF=B9=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=93=8D=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_product/StoreProductLogic.php | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index a26b5bf96..59f7c655f 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -49,8 +49,8 @@ class StoreProductLogic extends BaseLogic 'purchase' => $params['purchase'], 'rose' => $params['rose'], 'is_return' => $params['is_return'], - 'swap' => $params['swap']??0, - 'batch' => $params['batch']??0, + 'swap' => $params['swap'] ?? 0, + 'batch' => $params['batch'] ?? 0, ]; // if ($params['rose'] > 0) { // $rose_price = bcmul($params['cost'], $params['rose'], 2); @@ -106,10 +106,9 @@ class StoreProductLogic extends BaseLogic StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); } - if($item['pid'] == 0 && in_array($item['count'],[0,1])){ + if ($item['pid'] == 0 && in_array($item['count'], [0, 1])) { StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]); } - } } @@ -151,38 +150,41 @@ class StoreProductLogic extends BaseLogic 'vip_price' => $params['vip_price'], 'cost' => $params['cost'], 'batch' => $params['batch'], - 'swap' => $params['swap']??0, + 'swap' => $params['swap'] ?? 0, - ]; + ]; - StoreProduct::where('id', $params['id'])->update($data); - $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') - ->select(); - - // 获取分类ID - foreach ($old_cate as $vv) { - $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select(); - //删除之前的分类 - foreach ($related_data as $value) { - if ($value['count'] == 1) { - self::deleteRelatedData($value['cate_id']); - } elseif ($value['count'] > 1) { - self::decreaseCount($value['cate_id']); + StoreProduct::where('id', $params['id'])->update($data); + $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') + ->select(); + StoreBranchProduct::where('product_id', $params['id']) + ->update([ + 'batch' => $params['batch'], 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['purchase'], 'store_name' => $params['store_name'], 'image' => $params['image'], 'bar_code' => $params['bar_code'] + ]); + // 获取分类ID + foreach ($old_cate as $vv) { + $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select(); + //删除之前的分类 + foreach ($related_data as $value) { + if ($value['count'] == 1) { + self::deleteRelatedData($value['cate_id']); + } elseif ($value['count'] > 1) { + self::decreaseCount($value['cate_id']); + } + //新增对应的分类 + self::updateGoodsclass($params['cate_id'], $value['store_id']); } - //新增对应的分类 - self::updateGoodsclass($params['cate_id'], $value['store_id']); } - } - //修改 - StoreBranchProduct::where('product_id', $params['id'])->update([ - 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], 'cate_id' => $params['cate_id'] - ]); + //修改 + StoreBranchProduct::where('product_id', $params['id'])->update([ + 'price' => $params['price'], 'vip_price' => $params['vip_price'], + 'cost' => $params['cost'], 'cate_id' => $params['cate_id'] + ]); Db::commit(); - return true; + return true; } catch (\Exception $e) { Db::rollback(); self::setError($e->getMessage()); From ab96b647efbcffd078732b3733bc20769290cc99 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:29:18 +0800 Subject: [PATCH 075/145] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E6=94=AF=E5=95=86=E5=93=81=E7=9A=84?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_product/StoreProductLogic.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 59f7c655f..dc7187270 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -157,10 +157,6 @@ class StoreProductLogic extends BaseLogic StoreProduct::where('id', $params['id'])->update($data); $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') ->select(); - StoreBranchProduct::where('product_id', $params['id']) - ->update([ - 'batch' => $params['batch'], 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['purchase'], 'store_name' => $params['store_name'], 'image' => $params['image'], 'bar_code' => $params['bar_code'] - ]); // 获取分类ID foreach ($old_cate as $vv) { $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select(); From eff0242d8fe8acb7db7ff025cffba3e52c6142e2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:30:30 +0800 Subject: [PATCH 076/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=9A=84=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_product/StoreProductLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index dc7187270..72b3ad1ef 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -176,7 +176,8 @@ class StoreProductLogic extends BaseLogic //修改 StoreBranchProduct::where('product_id', $params['id'])->update([ 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], 'cate_id' => $params['cate_id'] + 'cost' => $params['cost'], 'cate_id' => $params['cate_id'], + 'batch'=>$params['batch'] ]); Db::commit(); From 08c8de158b7cc0cf558ca446dba2d3e05742d4de Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:49:10 +0800 Subject: [PATCH 077/145] =?UTF-8?q?feat(user):=20=E4=BF=AE=E6=94=B9UserRec?= =?UTF-8?q?hargeController=E5=92=8CUserRechargeLists=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/user/UserRechargeController.php | 4 ++-- app/api/lists/user/UserRechargeLists.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/api/controller/user/UserRechargeController.php b/app/api/controller/user/UserRechargeController.php index 6ca86becf..ba97d6a54 100644 --- a/app/api/controller/user/UserRechargeController.php +++ b/app/api/controller/user/UserRechargeController.php @@ -6,7 +6,7 @@ use app\api\logic\user\UserFeedbackLogic; use app\admin\validate\user\UserFeedbackValidate; use app\api\controller\BaseApiController; - +use app\api\lists\user\UserRechargeLists; class UserRechargeController extends BaseApiController { @@ -19,6 +19,6 @@ */ public function lists() { - return $this->dataLists(new UserFeedbackLists()); + return $this->dataLists(new UserRechargeLists()); } } diff --git a/app/api/lists/user/UserRechargeLists.php b/app/api/lists/user/UserRechargeLists.php index 482cf821c..fcf0d396b 100644 --- a/app/api/lists/user/UserRechargeLists.php +++ b/app/api/lists/user/UserRechargeLists.php @@ -57,7 +57,7 @@ use app\common\model\user_recharge\UserRecharge; */ public function count(): int { - return UserFeedback::where($this->searchWhere)->count(); + return UserRecharge::where($this->searchWhere)->count(); } } \ No newline at end of file From 1432a29f05c6cf71c97ac954d5aaf58b79850062 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 14:55:33 +0800 Subject: [PATCH 078/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=85=E5=80=BC=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/user/UserRechargeLists.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/api/lists/user/UserRechargeLists.php b/app/api/lists/user/UserRechargeLists.php index fcf0d396b..2090f6420 100644 --- a/app/api/lists/user/UserRechargeLists.php +++ b/app/api/lists/user/UserRechargeLists.php @@ -42,8 +42,7 @@ use app\common\model\user_recharge\UserRecharge; ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ - $user = User::field('nickname')->where('id',$data['uid'])->findOrEmpty(); - $data['user_name'] = !$user->isEmpty() ? $user['nickname'] : ''; + $data['real_name'] =User::where('id',$data['uid'])->value('real_name'); }) ->toArray(); } From 9dde487cb9abadcab3512ca5dfecfc77b318b689 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 15:12:03 +0800 Subject: [PATCH 079/145] =?UTF-8?q?feat(order):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=AA=8C=E8=AF=81=E7=A0=81=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84=E5=8F=8A=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=AC=BE=E4=B8=8D=E8=B6=B3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 5896de4e4..10b196451 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -194,7 +194,7 @@ class OrderLogic extends BaseLogic $generator = new BarcodeGeneratorPNG(); $barcode = $generator->getBarcode($verify_code, $generator::TYPE_CODE_128); $findPath = '/image/barcode/'.time().'.png'; - $savePath = 'public'.$findPath; + $savePath = public_path().$findPath; file_put_contents($savePath, $barcode); $_order['verify_img'] = $findPath; Db::startTrans(); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index e51603b15..98556c7c2 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -97,7 +97,7 @@ class PayNotifyLogic extends BaseLogic public static function purchase_funds($orderSn, $extra = []) { $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - $user = User::where('id', $extra['uid'])->find(); + $user = User::where('id', $order['uid'])->find(); if ($user['purchase_funds'] < $order['pay_price']) { throw new \Exception('采购款不足'); } From f1d5a04b46294e9e093a3dc42811d13c0dde8c5a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 15:27:22 +0800 Subject: [PATCH 080/145] =?UTF-8?q?feat(store=5Forder):=20=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- app/common/logic/PayNotifyLogic.php | 9 ++--- .../store_order/StoreOrderController.php | 34 ++++++++++++++++++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 575640412..ee1734d91 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ .env /tests/tmp /tests/.phpunit.result.cache -public/uploads \ No newline at end of file +public/uploads +public/image \ No newline at end of file diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 98556c7c2..49e30112e 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -80,7 +80,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); - Redis::send('push-platform-print', ['id' => $order['id']], 60); + // Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -114,7 +114,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); - Redis::send('push-platform-print', ['id' => $order['id']], 60); + // Redis::send('push-platform-print', ['id' => $order['id']], 60); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -154,11 +154,11 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + Redis::send('push-platform-print', ['id' => $order['id']]); } else { PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); } - Redis::send('push-platform-print', ['id' => $order['id']]); if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5); } @@ -281,10 +281,11 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + Redis::send('push-platform-print', ['id' => $order['id']]); + } else { PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } - Redis::send('push-platform-print', ['id' => $order['id']]); return true; } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index de727787f..206e34efc 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -15,7 +15,12 @@ use app\common\logic\PayNotifyLogic; use app\common\logic\SystemStoreStaffLogic; use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; +use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order\StoreOrder; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\system_store\SystemStore; +use app\common\model\system_store\SystemStoreStaff; use app\common\model\user_recharge\UserRecharge; use app\store\validate\store_order\StoreOrderValidate; use support\Log; @@ -396,8 +401,35 @@ class StoreOrderController extends BaseAdminController }else{ return $this->fail('发送失败'); } + } - + /** + * 订单打印 + */ + public function print(){ + $id=$this->request->get('id'); + $find = StoreOrder::where('id', $id)->find(); + if ($find) { + $merchant = SystemStore::where('id', $find['store_id'])->field('name,phone')->find(); + $mer_user_info = SystemStoreStaff::where('store_id', $find['store_id'])->where('is_admin',1)->field('staff_name,phone')->find(); + $user = User::where('id', $find['uid'])->field('nickname,mobile')->find(); + $find['system_store_name'] = $merchant['name']; + $find['pay_type_name'] = PayEnum::getPaySceneDesc($find['pay_type']); + $find['system_store_phone'] = $merchant['phone']; + $find['staff_name'] = $mer_user_info['staff_name']; + $find['staff_phone'] = $mer_user_info['phone']; + $find['nickname'] = $user['nickname']??''; + $find['user_mobile'] = $user['mobile']??''; + $find['info'] = StoreOrderCartInfo::where('oid', $find['id'])->field('store_id,product_id,cart_num,cart_info')->select()->each(function ($item) { + $goods = StoreBranchProduct::where(['store_id'=>$item['store_id'],'product_id'=>$item['product_id']])->field('store_name,unit')->find(); + $item['unit_name'] = StoreProductUnit::where('id', $goods['unit'])->value('name'); + $item['store_name'] = $goods['store_name']; + $item['total_price'] = $item['cart_info']['total_price']; + $item['price'] = $item['cart_info']['price']; + return $item; + }); + } + return $this->success('获取成功', $find); } } From bc881d8e09f7937cbaa826de82a7670ed799aebb Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 15:27:43 +0800 Subject: [PATCH 081/145] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E5=95=86=E5=93=81=E7=9A=84=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductLists.php | 2 +- app/api/logic/order/OrderLogic.php | 15 +++++++++------ app/common/enum/UserShipEnum.php | 13 +++++++++---- app/queue/redis/StoreStorageSend.php | 4 +++- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index a15a4e13a..cce4193a4 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -58,7 +58,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI } } return StoreBranchProduct::where($this->searchWhere)->where($where) - ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 5896de4e4..d87393fd9 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -66,30 +66,33 @@ class OrderLogic extends BaseLogic try { self::$total_price = 0; self::$pay_price = 0; - self::$cost = 0; //成本 + self::$cost = 0; //成本由采购价替代原成本为门店零售价 self::$profit = 0; //利润 self::$activity_price = 0; //活动减少 /** 计算价格 */ foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,product_id')->withTrashed()->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find(); if (!$find) { continue; } unset($cart_select[$k]['id']); + if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ + $find['price'] = $find['cost']; + } $cart_select[$k]['price'] = $find['price']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 if ($user && $user['user_ship'] == 4) { - $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); + $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); } //利润 // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 - $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 + $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; @@ -110,7 +113,7 @@ class OrderLogic extends BaseLogic $cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name'); self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); - self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); + self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2); // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 @@ -141,7 +144,7 @@ class OrderLogic extends BaseLogic if ($params['store_id']) { $order['default_delivery'] = SystemStore::where('id', $params['store_id'])->value('is_send'); } - if($user['user_ship']>=1 &&$user['user_ship']<=3){ + if($user && $user['user_ship']>=1 &&$user['user_ship']<=3){ $order['is_vip'] = 1; } diff --git a/app/common/enum/UserShipEnum.php b/app/common/enum/UserShipEnum.php index ea4b84ccf..772a54456 100644 --- a/app/common/enum/UserShipEnum.php +++ b/app/common/enum/UserShipEnum.php @@ -8,9 +8,14 @@ class UserShipEnum * 会员等级 */ const VIP1 = 1; - const VIP2 = 7; - const VIP3 = 8; - const VIP4 = 9; - const VIP5 = 10; + const VIP2 = 2; + const VIP3 = 3; + const VIP4 = 4; + const VIP5 = 5; + + /** + * 切换折扣价 + */ + const DISCOUNT_ARRAY = [4,5,6]; } \ No newline at end of file diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index f2069763c..3e755bd3c 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -56,7 +56,8 @@ class StoreStorageSend implements Consumer 'cate_id' => $find['cate_id'], 'price' => $find['price'], // 'cost' => $find['cost'], //v1.0 - 'cost' => $find['purchase'], + 'cost' => $find['cost'], + 'purchase' => $find['purchase'], 'vip_price' => $find['vip_price'], 'unit' => $find['unit'], 'batch' => $find['batch'], @@ -117,6 +118,7 @@ class StoreStorageSend implements Consumer 'cate_id' => $find['cate_id'], 'price' => $find['price'], 'cost' => $find['cost'], + 'purchase' => $find['purchase'], 'vip_price' => $find['vip_price'], 'unit' => $find['unit'], 'store_id' => $store_id, From 725dc922bf9ffe4ef4c87506bc2eea6c40c94930 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 15:32:36 +0800 Subject: [PATCH 082/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ee1734d91..a0a855bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ /tests/tmp /tests/.phpunit.result.cache public/uploads +public/image/barcode public/image \ No newline at end of file From 3ccaee48978507701facd57f8673f1d7883babfb Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 15:50:05 +0800 Subject: [PATCH 083/145] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/WorkbenchController.php | 11 +++++++++++ app/store/logic/WorkbenchLogic.php | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php index 3ca20e3cb..6617466ca 100644 --- a/app/store/controller/WorkbenchController.php +++ b/app/store/controller/WorkbenchController.php @@ -3,12 +3,14 @@ namespace app\store\controller; use app\common\controller\Definitions; +use app\common\model\dict\DictType; use app\store\lists\store_order\StoreOrderLists; use app\store\logic\WorkbenchLogic; // #[ApiDoc\Title('工作台')] class WorkbenchController extends BaseAdminController { + public $notNeedLogin = ['recharge_statistics']; // #[ // ApiDoc\Title('交易统计'), @@ -159,4 +161,13 @@ class WorkbenchController extends BaseAdminController $result = WorkbenchLogic::revenueStatistics($params); return $this->data($result); } + + + public function recharge_statistics() + { + $params['store_id'] = DictType::where('type','store')->value('remark')??5; + $result = WorkbenchLogic::rechargeData($params); + return $this->data($result); + + } } diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 8f349359c..53aa4eec5 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -709,6 +709,14 @@ class WorkbenchLogic extends BaseLogic } + public static function rechargeData($params) + { + $data['receipt_amount'] = UserRecharge::where([ + 'store_id'=>$params['store_id'], + 'paid'=>YesNoEnum::YES + ])->sum('price'); + return $data??[]; + } From 5dc332ae0a8e92e71bd855e830e53bf41d29114f Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 15:56:26 +0800 Subject: [PATCH 084/145] =?UTF-8?q?feat(StoreOrderController):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=8E=B7=E5=8F=96=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 206e34efc..692ee5a09 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -429,7 +429,8 @@ class StoreOrderController extends BaseAdminController return $item; }); } - return $this->success('获取成功', $find); + return $this->success('获取成功', $find?->toArray()); + } } From 7b6816aa80c84469ad4d2494abf5cdc80d9f72af Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 16:07:43 +0800 Subject: [PATCH 085/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_product/StoreProductLogic.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 72b3ad1ef..cfd50ef30 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -148,7 +148,6 @@ class StoreProductLogic extends BaseLogic 'is_return' => $params['is_return'], 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], 'batch' => $params['batch'], 'swap' => $params['swap'] ?? 0, @@ -177,7 +176,7 @@ class StoreProductLogic extends BaseLogic StoreBranchProduct::where('product_id', $params['id'])->update([ 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['cost'], 'cate_id' => $params['cate_id'], - 'batch'=>$params['batch'] + 'batch'=>$params['batch'],'store_name'=>$params['store_name'] ]); Db::commit(); From a82e96e259cfc33b17e63e6d7a7a98851c889447 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 16:44:32 +0800 Subject: [PATCH 086/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=A7=AF=E5=88=86=E6=9F=A5=E8=AF=A2=E5=92=8C=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 2 +- app/api/controller/store/StoreController.php | 17 ++++++++++---- app/api/logic/user/UserLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 23 ++++++++++--------- .../store_order/StoreOrderController.php | 6 ++--- app/store/lists/user/UserLists.php | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 894799e92..b2ea61dbd 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -147,7 +147,7 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'account', 'nickname', 'avatar', 'real_name', + 'id', 'account', 'nickname', 'avatar', 'real_name','integral', 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' ]; diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index c4368e496..4bb7e039a 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -24,15 +24,24 @@ class StoreController extends BaseApiController } + /** + * 门店信息 + */ public function detail() { $store_id = (int)$this->request->get('store_id'); - $where = [ - 'id' => $store_id - ]; + $phone = (int)$this->request->get('phone'); + $where = []; + if($phone){ + $where['phone'] = $phone; + } + if($store_id){ + $where['id'] = $store_id; + } + $info = StoreLogic::search($where); if ($info) { - return $this->data($info); + return $this->data($info?->toArray()); } else { return $this->fail('店铺不存在'); } diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index 5ba8704c4..bdbd73512 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -68,7 +68,7 @@ class UserLogic extends BaseLogic { $data = User::with(['userShip'])->where('id',$uid) ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship - ,purchase_funds') + ,purchase_funds,integral') ->find(); //判断是不是员工 if($data){ diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 49e30112e..f73cbd930 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -81,7 +81,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -115,7 +115,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } /** @@ -153,12 +153,13 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); - } + // } if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5); } @@ -280,12 +281,12 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - } + } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // } return true; } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 692ee5a09..b9f70c37b 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -183,12 +183,12 @@ class StoreOrderController extends BaseAdminController case PayEnum::PURCHASE_FUNDS: //采购款支付 PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); - return $this->success('采购款支付成功',[],1,0); + return $this->success('采购款支付成功',['id'=>$order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功',['id'=>$order['id']]); case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -250,7 +250,7 @@ class StoreOrderController extends BaseAdminController case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功',['id'=>$order['id']]); break; case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index fb2746572..e410ceec3 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -38,7 +38,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface public function lists(): array { - $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds"; + $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds,integral"; $lists = User::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->field($field) From adfd149e5dbdc73bd4f31f3770b6c296726d9372 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 16:46:08 +0800 Subject: [PATCH 087/145] =?UTF-8?q?feat(StoreController):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=97=E9=93=BA=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 4bb7e039a..2334ce3aa 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends BaseApiController $info = StoreLogic::search($where); if ($info) { - return $this->data($info?->toArray()); + return $this->success('ok',$info?$info->toArray():[]); } else { return $this->fail('店铺不存在'); } From fdd8e762a43607da01a89771fb4a71a943d5aa62 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 16:50:41 +0800 Subject: [PATCH 088/145] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 2a6503732..ccb309821 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -297,17 +297,16 @@ class OrderLogic extends BaseLogic public static function purchaseAgain($order_id) { - $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id')->select(); + $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id,store_id')->select(); $data = []; foreach ($arr as $k => $v) { $data[$k]['product_id'] = $v['product_id']; - $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v'); - $data[$k]['product_attr_unique'] = $unique; +// $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v'); + $data[$k]['product_attr_unique'] = ''; $data[$k]['cart_num'] = $v['cart_num']; $data[$k]['type'] = ''; $data[$k]['uid'] = Request()->userId; - $store_id = StoreProduct::where('id', $v['product_id'])->value('store_id'); - $data[$k]['store_id'] = $store_id; + $data[$k]['store_id'] = $v['store_id']; $data[$k]['staff_id'] = $v['staff_id']; $data[$k]['combination_id'] = 0; $data[$k]['seckill_id'] = 0; From 204e7f006d27ba942a805e0de3b6b21225292bc4 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 17:06:25 +0800 Subject: [PATCH 089/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user_label/UserLabelController.php | 95 +++++++++++++++++++ app/admin/lists/user_label/UserLabelLists.php | 65 +++++++++++++ app/admin/logic/user_label/UserLabelLogic.php | 94 ++++++++++++++++++ .../validate/user_label/UserLabelValidate.php | 84 ++++++++++++++++ app/api/controller/store/StoreController.php | 2 +- app/common/model/user_label/UserLabel.php | 22 +++++ 6 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 app/admin/controller/user_label/UserLabelController.php create mode 100644 app/admin/lists/user_label/UserLabelLists.php create mode 100644 app/admin/logic/user_label/UserLabelLogic.php create mode 100644 app/admin/validate/user_label/UserLabelValidate.php create mode 100644 app/common/model/user_label/UserLabel.php diff --git a/app/admin/controller/user_label/UserLabelController.php b/app/admin/controller/user_label/UserLabelController.php new file mode 100644 index 000000000..b03673825 --- /dev/null +++ b/app/admin/controller/user_label/UserLabelController.php @@ -0,0 +1,95 @@ +dataLists(new UserLabelLists()); + } + + + /** + * @notes 添加用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function add() + { + $params = (new UserLabelValidate())->post()->goCheck('add'); + $result = UserLabelLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(UserLabelLogic::getError()); + } + + + /** + * @notes 编辑用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function edit() + { + $params = (new UserLabelValidate())->post()->goCheck('edit'); + $result = UserLabelLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(UserLabelLogic::getError()); + } + + + /** + * @notes 删除用户标签 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function delete() + { + $params = (new UserLabelValidate())->post()->goCheck('delete'); + UserLabelLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取用户标签详情 + * @return \think\response\Json + * @author admin + * @date 2024/06/17 17:02 + */ + public function detail() + { + $params = (new UserLabelValidate())->goCheck('detail'); + $result = UserLabelLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/user_label/UserLabelLists.php b/app/admin/lists/user_label/UserLabelLists.php new file mode 100644 index 000000000..4e142b649 --- /dev/null +++ b/app/admin/lists/user_label/UserLabelLists.php @@ -0,0 +1,65 @@ + ['label_name'], + ]; + } + + + /** + * @notes 获取用户标签列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/06/17 17:02 + */ + public function lists(): array + { + return UserLabel::where($this->searchWhere) + ->field(['label_id', 'label_name']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['label_id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取用户标签数量 + * @return int + * @author admin + * @date 2024/06/17 17:02 + */ + public function count(): int + { + return UserLabel::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/user_label/UserLabelLogic.php b/app/admin/logic/user_label/UserLabelLogic.php new file mode 100644 index 000000000..d8a766b7c --- /dev/null +++ b/app/admin/logic/user_label/UserLabelLogic.php @@ -0,0 +1,94 @@ + $params['label_name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑用户标签 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/17 17:02 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + UserLabel::where('label_id', $params['label_id'])->update([ + 'label_name' => $params['label_name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除用户标签 + * @param array $params + * @return bool + * @author admin + * @date 2024/06/17 17:02 + */ + public static function delete(array $params): bool + { + return UserLabel::destroy($params['label_id']); + } + + + /** + * @notes 获取用户标签详情 + * @param $params + * @return array + * @author admin + * @date 2024/06/17 17:02 + */ + public static function detail($params): array + { + return UserLabel::findOrEmpty($params['label_id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/user_label/UserLabelValidate.php b/app/admin/validate/user_label/UserLabelValidate.php new file mode 100644 index 000000000..2289e5630 --- /dev/null +++ b/app/admin/validate/user_label/UserLabelValidate.php @@ -0,0 +1,84 @@ + 'require', + 'label_name' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'label_id' => 'label_id', + 'label_name' => '标签名称', + ]; + + + /** + * @notes 添加场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneAdd() + { + return $this->only(['label_name']); + } + + + /** + * @notes 编辑场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneEdit() + { + return $this->only(['label_id','label_name']); + } + + + /** + * @notes 删除场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneDelete() + { + return $this->only(['label_id']); + } + + + /** + * @notes 详情场景 + * @return UserLabelValidate + * @author admin + * @date 2024/06/17 17:02 + */ + public function sceneDetail() + { + return $this->only(['label_id']); + } + +} \ No newline at end of file diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 2334ce3aa..20e5a93a9 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -41,7 +41,7 @@ class StoreController extends BaseApiController $info = StoreLogic::search($where); if ($info) { - return $this->success('ok',$info?$info->toArray():[]); + return $this->success('ok',$info??[]); } else { return $this->fail('店铺不存在'); } diff --git a/app/common/model/user_label/UserLabel.php b/app/common/model/user_label/UserLabel.php new file mode 100644 index 000000000..adeb03be2 --- /dev/null +++ b/app/common/model/user_label/UserLabel.php @@ -0,0 +1,22 @@ + Date: Mon, 17 Jun 2024 17:37:55 +0800 Subject: [PATCH 090/145] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index b9f70c37b..e09ce0c47 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -136,13 +136,15 @@ class StoreOrderController extends BaseAdminController public function checkSms() { $params = (new StoreOrderValidate())->post()->goCheck('check'); - $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 $user= User::where('id',$params['uid'])->find(); if(empty($user)){ return $this->fail('无该用户请检查'); } $order = StoreOrderLogic::cartIdByOrderInfo($params['cart_id'], null, $user, $params); + if(!$order){ + return $this->fail(StoreOrderLogic::getError()); + } if($order['order']['pay_price'] > $user['purchase_funds']){ return $this->fail('当前用户采购款不足支付'); } From c0c61dd042049d69c63b9536d780dfd1c8ab908c Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 17:38:55 +0800 Subject: [PATCH 091/145] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=94=A8=E6=88=B7=E4=B8=BA=E5=BD=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=BA=E6=91=8A=E8=B4=A9/=E9=85=92=E5=BA=97/=E9=A3=9F?= =?UTF-8?q?=E5=A0=82=E6=97=B6,=E8=BF=94=E5=9B=9E=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index ccb309821..20fe8d784 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -47,6 +47,7 @@ class OrderLogic extends BaseLogic public static $pay_price; public static $cost; public static $profit; + public static $store_price;//门店零售价 public static $activity_price; /** @@ -69,6 +70,7 @@ class OrderLogic extends BaseLogic self::$cost = 0; //成本由采购价替代原成本为门店零售价 self::$profit = 0; //利润 self::$activity_price = 0; //活动减少 + self::$store_price = 0; //门店零售价 /** 计算价格 */ foreach ($cart_select as $k => $v) { @@ -77,11 +79,9 @@ class OrderLogic extends BaseLogic continue; } unset($cart_select[$k]['id']); - if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ - $find['price'] = $find['cost']; - } $cart_select[$k]['price'] = $find['price']; + $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 @@ -94,6 +94,7 @@ class OrderLogic extends BaseLogic // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 + $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; @@ -114,9 +115,17 @@ class OrderLogic extends BaseLogic self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2); + self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } + $preferential_amount = 0;//差价(用户为UserShipEnum::DISCOUNT_ARRAY 的时候的优惠差价) + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ + $pay_price =bcsub(self::$store_price, self::$activity_price, 2); //减去活动优惠金额 + $preferential_amount = bcsub(self::$pay_price,self::$store_price,2); + } + $vipPrice = 0; //成本价 收益 $order = [ @@ -138,6 +147,7 @@ class OrderLogic extends BaseLogic 'activities' => self::$activity_price>0?1:0, 'deduction_price' => self::$activity_price, 'is_vip' => 0, + 'preferential_amount' => $preferential_amount, ]; $order['default_delivery'] = 0; From e6bd6a937d86a42d6c3608bc2026ec91cf8ce49b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 17:45:34 +0800 Subject: [PATCH 092/145] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 20e5a93a9..97bd8068d 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -57,6 +57,9 @@ class StoreController extends BaseApiController $find=User::where('mobile',$params['mobile'])->find(); if(!$find){ $find=UserUserLogic::StoreAdd($params); + }else{ + $find['real_name']=$params['real_name']; + $find->save(); } $data=[ 'store_id'=>$params['store_id'], From 991dec0760d06c710ef6032bd5753184979d648e Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 17:53:59 +0800 Subject: [PATCH 093/145] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 20fe8d784..78dc82275 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -85,11 +85,11 @@ class OrderLogic extends BaseLogic $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - if ($user && $user['user_ship'] == 4) { - $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); - $cart_select[$k]['deduction_price'] =$deduction_price_count; - self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); - } +// if ($user && $user['user_ship'] == 4) { +// $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); +// $cart_select[$k]['deduction_price'] =$deduction_price_count; +// self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); +// } //利润 // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 From cb6ddb2dbb409e71728a88d75ab2b54d09b01b80 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 18:00:40 +0800 Subject: [PATCH 094/145] =?UTF-8?q?feat(user):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=87=E7=AD=BEID=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index b2ea61dbd..e825dbe32 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -118,14 +118,15 @@ class UserLogic extends BaseLogic Db::startTrans(); try { User::where('id', $params['id'])->update([ - 'avatar' => $params['avatar'] ?? '', - 'real_name' => $params['real_name'], - 'nickname' => $params['nickname'], - 'account' => $params['account'], - 'password' => $params['password'] ?? '', - 'mobile' => $params['mobile'] ?? '', - 'sex' => $params['sex'] ?? 0, - 'is_disable' => $params['is_disable'] ?? 0, + // 'avatar' => $params['avatar'] ?? '', + // 'real_name' => $params['real_name'], + // 'nickname' => $params['nickname'], + // 'account' => $params['account'], + // 'password' => $params['password'] ?? '', + // 'mobile' => $params['mobile'] ?? '', + // 'sex' => $params['sex'] ?? 0, + // 'is_disable' => $params['is_disable'] ?? 0, + 'label_id'=>$params['label_id'] ]); Db::commit(); From 8d0d8ab603e47323a07977c89b256d2493a8b113 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 18:03:23 +0800 Subject: [PATCH 095/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index e09ce0c47..024cb88af 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -205,7 +205,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -217,7 +217,7 @@ class StoreOrderController extends BaseAdminController } PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]); default: return $this->fail('支付方式错误'); } @@ -266,7 +266,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -279,7 +279,7 @@ class StoreOrderController extends BaseAdminController PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]); default: return $this->fail('支付方式错误'); } From d1e1c67978991d00c7cdbf79ad9b61e19b53e943 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Mon, 17 Jun 2024 18:11:18 +0800 Subject: [PATCH 096/145] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=B6=E7=9A=84=E7=94=A8=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/store_order/StoreOrderLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index e76081670..bf3c58cdc 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -49,7 +49,7 @@ class StoreOrderLogic extends BaseLogic /** 计算价格 */ foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->withTrashed()->find(); if (!$find) { continue; } @@ -147,6 +147,7 @@ class StoreOrderLogic extends BaseLogic return false; } $_order = $orderInfo['order']; + $_order['uid'] = $user['id']??0; $_order['pay_type'] = $orderInfo['order']['pay_type']; $_order['verify_code'] = $verify_code; if (isset($params['reservation_time'])) { From 7d84388fc92babd740f06e9bad3a1d80316cf4d5 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 18:12:26 +0800 Subject: [PATCH 097/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/system_store_storage/SystemStoreStorageLists.php | 2 +- .../lists/system_store_storage/SystemStoreStorageLists.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php index 900eb1e33..59cfcd955 100644 --- a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php @@ -29,7 +29,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['store_id', 'admin_id', 'staff_id', 'status'], + '=' => ['store_id', 'admin_id', 'staff_id', 'status','type'], ]; } diff --git a/app/store/lists/system_store_storage/SystemStoreStorageLists.php b/app/store/lists/system_store_storage/SystemStoreStorageLists.php index e2e94148c..c31918b02 100644 --- a/app/store/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/store/lists/system_store_storage/SystemStoreStorageLists.php @@ -29,7 +29,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['admin_id', 'staff_id', 'status'], + '=' => ['admin_id', 'staff_id', 'status','type'], ]; } From 30a6a404c68dc5b2b57b256c0f752b366e7f3c8e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 18:17:19 +0800 Subject: [PATCH 098/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E5=88=9B=E5=BB=BA=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queue/redis/StoreStorageSend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index 3e755bd3c..a291bd6a1 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -125,7 +125,7 @@ class StoreStorageSend implements Consumer 'sales' => 0, 'stock' => 0, ]; - StoreBranchProduct::create($product); + StoreBranchProductExchange::create($product); if ($product_arr['stock'] > 0) { $this->storage($find, $store_id, $admin_id, $product_arr); } From f050252966432a358dd9008965e34d90fd000110 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 19:02:13 +0800 Subject: [PATCH 099/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8F=91=E9=80=81=E7=B1=BB=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=8F=82=E6=95=B01=E5=88=B0=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E6=96=B9=E6=B3=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queue/redis/StoreStorageSend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index a291bd6a1..d2cb8e0e4 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -90,7 +90,7 @@ class StoreStorageSend implements Consumer Db::startTrans(); try { if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr); + $this->storage($find, $store_id, $admin_id, $product_arr,1); } Db::commit(); return true; @@ -141,7 +141,7 @@ class StoreStorageSend implements Consumer Db::startTrans(); try { if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr); + $this->storage($find, $store_id, $admin_id, $product_arr,2); } Db::commit(); return true; From 6b2be63031f339bdd771ff695bb17253f7b619d8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 19:45:17 +0800 Subject: [PATCH 100/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20config=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 14 +++++++++++++- app/common/logic/PayNotifyLogic.php | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index d3a680899..5bdbe8cc5 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -22,7 +22,7 @@ use Webman\RedisQueue\Redis; class IndexController extends BaseApiController { - public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street','village','brigade']; + public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street','village','brigade','config']; public function index() { @@ -180,5 +180,17 @@ class IndexController extends BaseApiController { $list = Db::name('geo_brigade')->select()?->toArray(); return $this->success('ok', $list); + } + + /** + * @notes 获取队列表 + */ + public function config() + { + $list=[ + 'store_id'=>5, + 'store_name'=>'测试', + ]; + return $this->success('ok', $list); } } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index f73cbd930..cd156ec9e 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -330,11 +330,13 @@ class PayNotifyLogic extends BaseLogic $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } if ($money) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update(); $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 } } } else { if ($store_profit > 0) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update(); $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 } } @@ -344,6 +346,7 @@ class PayNotifyLogic extends BaseLogic $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); if ($fees > 0) { + User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } From ba9ce8fdf126ae12446df26fb9585e20ff8f40c3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 19:46:37 +0800 Subject: [PATCH 101/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=A5=96=E5=8A=B1=20village=5Fuid=20=E5=92=8C=20briga?= =?UTF-8?q?de=5Fuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index cd156ec9e..9a4e21e80 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -362,10 +362,16 @@ class PayNotifyLogic extends BaseLogic $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); if ($arr1) { $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if($village_uid){ + User::where('id', $village_uid)->inc('integral', $fees)->update(); + } } $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); if ($arr2) { $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if($brigade_uid){ + User::where('id', $brigade_uid)->inc('integral', $fees)->update(); + } } } } From 4c1a07e5987299445f6693c12c60e9b982a21550 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 19:51:13 +0800 Subject: [PATCH 102/145] =?UTF-8?q?feat(IndexController):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0IndexController=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0?= =?UTF-8?q?=E7=9A=84API=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 5bdbe8cc5..c3014c879 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -188,7 +188,7 @@ class IndexController extends BaseApiController public function config() { $list=[ - 'store_id'=>5, + 'id'=>5, 'store_name'=>'测试', ]; return $this->success('ok', $list); From d43d26163feb9a732cf5a3905242937eea88b199 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 20:08:38 +0800 Subject: [PATCH 103/145] =?UTF-8?q?feat(process):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/process.php | 3 +++ process/Task.php | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 process/Task.php diff --git a/config/process.php b/config/process.php index fc6af1ffb..916875cc3 100644 --- a/config/process.php +++ b/config/process.php @@ -40,4 +40,7 @@ return [ ] ] ], + 'task' => [ + 'handler' => process\Task::class + ], ]; diff --git a/process/Task.php b/process/Task.php new file mode 100644 index 000000000..fa0e66504 --- /dev/null +++ b/process/Task.php @@ -0,0 +1,22 @@ +0]; + $where[]=['create_time','<',time() - 600];// 10分钟前创建的订单 + // 删除10分钟未支付的订单 + StoreOrder::where($where)->update(['delete_time'=>time()]); // 删除时间设置为当前时间，即删除 + }); + + + } +} \ No newline at end of file From e5336610ead2d9f6592d1d67ff4d939eb8911a69 Mon Sep 17 00:00:00 2001 From: liuchaofu <1873441552@qq.com> Date: Mon, 17 Jun 2024 21:33:42 +0800 Subject: [PATCH 104/145] =?UTF-8?q?vip=E7=AD=89=E7=BA=A7=E4=B8=BA1?= =?UTF-8?q?=E6=97=B6=E5=8A=A0=E5=85=A5=E5=86=BB=E7=BB=93=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 7 +- app/common/logic/PayNotifyLogic.php | 4 + app/common/logic/VipLogic.php | 183 ++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 3 deletions(-) create mode 100644 app/common/logic/VipLogic.php diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 78dc82275..1728473f1 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -99,12 +99,13 @@ class OrderLogic extends BaseLogic $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; - + //vip1待返回金额 + + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],2); +// d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] ); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; $cartInfo['image'] = $find['image']; - - $cartInfo['vip_price'] = 0; //$cart_select[$k]['total'] - $vipPrice ?? 0; $cart_select[$k]['cart_info'] = json_encode($cartInfo); $cart_select[$k]['branch_product_id'] = $find['branch_product_id']; //理论上每笔都是拆分了 diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 9a4e21e80..5b2b3ab5e 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -113,6 +113,10 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); + if($user['user_ship'] == 1){ + VipLogic::dealVipAmount($order,PayEnum::PURCHASE_FUNDS); + } + // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); diff --git a/app/common/logic/VipLogic.php b/app/common/logic/VipLogic.php new file mode 100644 index 000000000..d47b95051 --- /dev/null +++ b/app/common/logic/VipLogic.php @@ -0,0 +1,183 @@ +select()->toArray(); + $total_vip = 0; + foreach ($detail as $value){ + $total_vip +=$value['cart_info']['vip_frozen_price']; + } + $data=[ + 'order_id' => $order['id'], + 'transaction_id' => $transaction_id??0, + 'order_sn' =>$order['order_id'], + 'user_id' => $order['uid'], +// 'financial_type' => $financialType, + 'number' => $total_vip, + 'pay_type' => $pay_type??1, + 'status' => 0, + 'store_id' => $order['store_id'], + 'staff_id' => $order['staff_id'], + 'create_time'=>time() + ]; + Db::name('vip_flow')->insert($data); + //todo 限制执行 +// self::afterPay($order,$transaction_id,$total_vip); + return true; + } + + + + + + + + public static function afterPay($order, $transaction_id = 0,$Vipmoney=0) + { + $financeLogic = new StoreFinanceFlowLogic(); + $financeLogic->order = $order; + $financeLogic->user = ['uid' => $order['uid']]; + + $financeLogic->in($transaction_id, $Vipmoney, OrderEnum::USER_ORDER_PAY); //用户订单支付 + $count_frees = 0; + + //平台手续费 + $fees = bcdiv(bcmul($Vipmoney, '0.02', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出 + } + // $frozen = bcsub($order->profit, $fees, 2); + //缴纳齐全了就加商户没有就加到平台 + $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find(); + $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度 + $store_profit = bcdiv(bcmul($Vipmoney, '0.05', 2), 1, 2); + $count_frees = bcadd($count_frees, $store_profit, 2); + if ($deposit > 0) { + if ($deposit > $store_profit) { + if ($store_profit > 0) { + $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } else { + $money = bcsub($store_profit, $deposit, 2); + if ($deposit > 0) { + $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + if ($money) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update(); + $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } + } + } else { + if ($store_profit > 0) { + SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update(); + $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 + } + } + + if ($order['is_vip'] >= 1) { + if ($order['spread_uid'] > 0) { + $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; + $fees = bcdiv(bcmul($Vipmoney, '0.08', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); + if ($fees > 0) { + User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 + $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } + $fees = bcdiv(bcmul($Vipmoney, '0.01', 2), 1, 2); + $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); + $village_uid = 0; + $brigade_uid = 0; + //查询用户对应的村长和队长 + if ($order['uid'] > 0) { + $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); + if ($address) { + $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); + if ($arr1) { + $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if($village_uid){ + User::where('id', $village_uid)->inc('integral', $fees)->update(); + } + } + $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); + if ($arr2) { + $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if($brigade_uid){ + User::where('id', $brigade_uid)->inc('integral', $fees)->update(); + } + } + } + } + if ($fees > 0) { + //村长获得 + $sing=[]; + $user_sing=new UserSign(); + + $sing[]=[ + 'uid'=>$village_uid, + 'title'=>'村长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + $sing[]=[ + 'uid'=>$brigade_uid, + 'title'=>'队长订单获得兑换券', + 'store_id'=>$order['store_id'], + 'number'=>$fees, + ]; + // if ($village_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $village_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //队长获得 + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); + //其他获得 + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + } + + $fees=bcsub($Vipmoney, $count_frees, 2); + //供应链订单获得 + if ($fees > 0) { + $financeLogic->in($transaction_id,$fees , OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + + } + $financeLogic->save(); + + } + + +} \ No newline at end of file From 4292c803013337352a977fd388a400b1c5969d3b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 09:21:17 +0800 Subject: [PATCH 105/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=E4=BB=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E7=94=A8=E6=88=B7=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 56 ++++++++++++++++------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 9a4e21e80..ebc034de2 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -155,10 +155,10 @@ class PayNotifyLogic extends BaseLogic $extra['create_time'] = $order['create_time']; // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - } + } // else { - // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); // } if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5); @@ -276,14 +276,13 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $order->status = 2; self::afterPay($order); - } if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - } + } // else { // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // } @@ -298,6 +297,8 @@ class PayNotifyLogic extends BaseLogic public static function afterPay($order, $transaction_id = 0) { $financeLogic = new StoreFinanceFlowLogic(); + $user_sing = new UserSign(); + $financeLogic->order = $order; $financeLogic->user = ['uid' => $order['uid']]; // if ($order->pay_type != 9 || $order->pay_type != 10) { @@ -305,6 +306,15 @@ class PayNotifyLogic extends BaseLogic $count_frees = 0; //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { + if($order['uid']>0){ + $sing = [ + 'uid' => $order['uid'], + 'title' => '购买商品获得兑换券', + 'store_id' => $order['store_id'], + 'number' => bcmul($order['pay_price'], '0.01', 2), + ]; + $user_sing->save($sing); + } //平台手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); @@ -362,14 +372,14 @@ class PayNotifyLogic extends BaseLogic $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); if ($arr1) { $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); - if($village_uid){ + if ($village_uid) { User::where('id', $village_uid)->inc('integral', $fees)->update(); } } $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); if ($arr2) { $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); - if($brigade_uid){ + if ($brigade_uid) { User::where('id', $brigade_uid)->inc('integral', $fees)->update(); } } @@ -377,23 +387,22 @@ class PayNotifyLogic extends BaseLogic } if ($fees > 0) { //村长获得 - $sing=[]; - $user_sing=new UserSign(); + $sing = []; - $sing[]=[ - 'uid'=>$village_uid, - 'title'=>'村长订单获得兑换券', - 'store_id'=>$order['store_id'], - 'number'=>$fees, + $sing[] = [ + 'uid' => $village_uid, + 'title' => '村长订单获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, ]; - $sing[]=[ - 'uid'=>$brigade_uid, - 'title'=>'队长订单获得兑换券', - 'store_id'=>$order['store_id'], - 'number'=>$fees, + $sing[] = [ + 'uid' => $brigade_uid, + 'title' => '队长订单获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, ]; // if ($village_uid > 0) { - // $financeLogic->other_arr['vip_uid'] = $village_uid; + // $financeLogic->other_arr['vip_uid'] = $village_uid; // } // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); @@ -410,14 +419,13 @@ class PayNotifyLogic extends BaseLogic $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } } - $fees=bcsub($order['pay_price'], $count_frees, 2); + $fees = bcsub($order['pay_price'], $count_frees, 2); //供应链订单获得 if ($fees > 0) { - $financeLogic->in($transaction_id,$fees , OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->in($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - } -// } + // } $financeLogic->save(); // } } From c8d20b33d6126b60d56a0b107d455fe64ee45db3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 09:37:01 +0800 Subject: [PATCH 106/145] =?UTF-8?q?feat(user):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/UserController.php | 3 ++- app/common/logic/PayNotifyLogic.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 2b55bb1f6..b2046e788 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -57,7 +57,8 @@ class UserController extends BaseAdminController */ public function edit() { - $params = (new UserValidate())->post()->goCheck('edit'); + // $params = (new UserValidate())->post()->goCheck('edit'); + $params = $this->request->post(); $result = UserLogic::edit($params); if (true === $result) { return $this->success('编辑成功', [], 1, 1); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 24c1a74e1..b5ca18a3e 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -306,7 +306,7 @@ class PayNotifyLogic extends BaseLogic $financeLogic->order = $order; $financeLogic->user = ['uid' => $order['uid']]; // if ($order->pay_type != 9 || $order->pay_type != 10) { - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户订单支付 + $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY,$order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 $count_frees = 0; //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { From 5091d0a6bb25d17d7cdddc139a8bdbd6a55cdd1e Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 09:44:13 +0800 Subject: [PATCH 107/145] =?UTF-8?q?=E6=94=B6=E9=93=B6=E6=9C=BA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=87=87=E8=B4=AD=E6=AC=BE?= =?UTF-8?q?=E6=94=AF=E4=BB=98vip=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_order/StoreOrderLogic.php | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index bf3c58cdc..78eb61cf4 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -4,6 +4,7 @@ namespace app\common\logic\store_order; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; +use app\common\enum\UserShipEnum; use app\common\logic\BaseLogic; use app\common\enum\YesNoEnum; use app\common\model\dict\DictType; @@ -25,6 +26,7 @@ class StoreOrderLogic extends BaseLogic public static $pay_price; public static $cost; public static $profit; + public static $store_price;//门店零售价 public static $activity_price; /** * @notes 获取购物车商品信息 @@ -46,32 +48,37 @@ class StoreOrderLogic extends BaseLogic self::$cost = 0; //成本 self::$profit = 0; //利润 self::$activity_price = 0; //活动减少 - + self::$store_price = 0; //门店零售价 /** 计算价格 */ foreach ($cart_select as $k => $v) { - $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->withTrashed()->find(); + $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find(); if (!$find) { continue; } unset($cart_select[$k]['id']); $cart_select[$k]['price'] = $find['price']; + $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - if ($user && $user['user_ship'] == 4) { - $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); - $cart_select[$k]['deduction_price'] =$deduction_price_count; - self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); - } +// if ($user && $user['user_ship'] == 4) { +// $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); +// $cart_select[$k]['deduction_price'] =$deduction_price_count; +// self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); +// } //利润 // $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润 - $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 + $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 + $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; + //vip1待返回金额 + + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],2); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; $cartInfo['image'] = $find['image']; @@ -80,7 +87,7 @@ class StoreOrderLogic extends BaseLogic // if ($vipPrice) { // $cartInfo['price'] = $vipPrice; // } - $cartInfo['vip_price'] = 0;//$cart_select[$k]['total'] - $vipPrice ?? 0; + //$cart_select[$k]['total'] - $vipPrice ?? 0; $cart_select[$k]['cart_info'] = json_encode($cartInfo); $cart_select[$k]['branch_product_id'] = $find['branch_product_id']; //理论上每笔都是拆分了 @@ -91,10 +98,16 @@ class StoreOrderLogic extends BaseLogic self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2); self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2); self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); + self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - //TODO 收单打9.9折 会员按照比例打折 等级按照充值去升级 - $pay_price = bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $preferential_amount = 0;//差价(用户为UserShipEnum::DISCOUNT_ARRAY 的时候的优惠差价) + + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ + $pay_price =bcsub(self::$store_price, self::$activity_price, 2); //减去活动优惠金额 + $preferential_amount = bcsub(self::$pay_price,self::$store_price,2); + } $vipPrice = 0; //成本价 收益 $order = [ @@ -116,12 +129,11 @@ class StoreOrderLogic extends BaseLogic 'activities' => self::$activity_price>0?1:0, 'default_delivery'=>1, 'original_price'=>self::$total_price, - 'deduction_price' => self::$activity_price + 'deduction_price' => self::$activity_price, + 'preferential_amount' => $preferential_amount, ]; - if($user){ - if($user['user_ship']!=4){ - $order['is_vip']=1; - } + if($user && $user['user_ship']!=4){ + $order['is_vip']=1; } } catch (\Exception $e) { From 7d622b150ebe515ffa6f0e2a88ad1fd9a7f2fc63 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 09:47:03 +0800 Subject: [PATCH 108/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/store_order/StoreOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 78eb61cf4..d0c11d7bf 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -172,7 +172,7 @@ class StoreOrderLogic extends BaseLogic $goods_list = $orderInfo['cart_list']; foreach ($goods_list as $k => $v) { $goods_list[$k]['oid'] = $order['id']; - $goods_list[$k]['uid'] = 0; + $goods_list[$k]['uid'] = $user['id']??0; $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id $stock = StoreBranchProduct::where('id',$v['branch_product_id'])->value('stock'); From 92c20a157049125b0f20766fef02a2be456ea298 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 09:53:59 +0800 Subject: [PATCH 109/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95ID=E5=88=B0=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index b5ca18a3e..29c96ba69 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -313,6 +313,7 @@ class PayNotifyLogic extends BaseLogic if($order['uid']>0){ $sing = [ 'uid' => $order['uid'], + 'order_id' => $order['order_id'], 'title' => '购买商品获得兑换券', 'store_id' => $order['store_id'], 'number' => bcmul($order['pay_price'], '0.01', 2), @@ -395,12 +396,14 @@ class PayNotifyLogic extends BaseLogic $sing[] = [ 'uid' => $village_uid, + 'order_id' => $order['order_id'], 'title' => '村长订单获得兑换券', 'store_id' => $order['store_id'], 'number' => $fees, ]; $sing[] = [ 'uid' => $brigade_uid, + 'order_id' => $order['order_id'], 'title' => '队长订单获得兑换券', 'store_id' => $order['store_id'], 'number' => $fees, From 5768afd77a14dce12da6d7bd8336d0c1febb5180 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 09:56:32 +0800 Subject: [PATCH 110/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9PayNotifyLogi?= =?UTF-8?q?c=E4=BB=A5=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E7=A7=AF?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 29c96ba69..48a0c0a6d 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -311,14 +311,16 @@ class PayNotifyLogic extends BaseLogic //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { if($order['uid']>0){ + $user_number=bcmul($order['pay_price'], '0.01', 2); $sing = [ 'uid' => $order['uid'], 'order_id' => $order['order_id'], 'title' => '购买商品获得兑换券', 'store_id' => $order['store_id'], - 'number' => bcmul($order['pay_price'], '0.01', 2), + 'number' =>$user_number, ]; $user_sing->save($sing); + User::where('id', $order['uid'])->inc('integral', $user_number)->update(); } //平台手续费 From fe86e652ce77c86a1c59779bfa0fd8a0803682ee Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 10:06:41 +0800 Subject: [PATCH 111/145] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=AB=AF=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/logic/WorkbenchLogic.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 53aa4eec5..a0b9934ee 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -44,23 +44,21 @@ class WorkbenchLogic extends BaseLogic public static function index($params) { $data = []; - $startTime = $params['start_time']; - $endTime = $params['end_time']; - $endTime = date('Y-m-d', strtotime($endTime) + 86400); - $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime)); + $startTimeDefault = date('Y-m-d',time()); + $endTimeDefault =date('Y-m-d', strtotime($startTimeDefault) + 86400); $orderLogic = new StoreOrderLogic(); //订单总金额 - $data['order_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime); + $data['order_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault); //余额支付总金额 - $data['balance_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['pay_type' => PayEnum::BALANCE_PAY]); + $data['balance_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['pay_type' => PayEnum::BALANCE_PAY]); //线下收银总金额 - $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 3]); + $data['cashier_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['shipping_type' => 3]); //现金收银总金额 - $data['cash_amount'] = StoreCashFinanceFlow::where('store_id', $params['store_id'])->whereBetweenTime('create_time', $startTime, $endTime)->sum('cash_price'); + $data['cash_amount'] = StoreCashFinanceFlow::where('store_id', $params['store_id'])->whereBetweenTime('create_time', $startTimeDefault, $endTimeDefault)->sum('cash_price'); //核销订单金额 - $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 2]); + $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, ['shipping_type' => 2]); //门店收益金额 - $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, [], 'profit'); + $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTimeDefault, $endTimeDefault, [], 'profit'); //门店收款金额 $data['receipt_amount'] = UserRecharge::where([ 'store_id'=>$params['store_id'], @@ -69,9 +67,14 @@ class WorkbenchLogic extends BaseLogic //门店成交用户数 $data['user_number'] = StoreOrder::where('store_id', $params['store_id']) ->where('paid', 1) - ->whereBetweenTime('pay_time', $startTime, $endTime) + ->whereBetweenTime('pay_time', $startTimeDefault, $endTimeDefault) ->group('uid') ->count(); + + $startTime = $params['start_time']; + $endTime = $params['end_time']; + $endTime = date('Y-m-d', strtotime($endTime) + 86400); + $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime)); if ($dateDiff->days == 1) { $group = 'HOUR(pay_time)'; $i = 0; From a08d9ff06701a48c41212cbb436de126485798a2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 10:12:36 +0800 Subject: [PATCH 112/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 4 +- .../store_order/StoreOrderController.php | 144 +++++++----------- 2 files changed, 53 insertions(+), 95 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index e825dbe32..46b7033c4 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -77,7 +77,7 @@ class UserLogic extends BaseLogic try { $data=[ 'avatar' => $avatar, - 'real_name' =>'', + 'real_name' => $params['real_name']??"", 'nickname' => '用户'.time(), 'account' => $params['mobile'], 'password' => $password, @@ -88,7 +88,7 @@ class UserLogic extends BaseLogic $res=User::create($data); UserAddress::create([ 'uid' => $res['id'], - 'real_name' => $data['nickname'], + 'real_name' => $params['real_name']??"", 'mobile' => $params['mobile'], 'province' => $params['province'], 'city' => $params['city'], diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 024cb88af..ba689ab31 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -35,41 +35,7 @@ use Webman\RedisQueue\Redis; class StoreOrderController extends BaseAdminController { - // #[ - // ApiDoc\Title('订单列表'), - // ApiDoc\url('/store/store_order/storeOrder/lists'), - // ApiDoc\Method('GET'), - // ApiDoc\NotHeaders(), - // ApiDoc\Author('中国队长'), - // ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), - // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - // ApiDoc\Query(name: 'delivery_phone', type: 'int', require: false, desc: '配送员手机号'), - // ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式：1配送订单，2核销订单，3收银台订单'), - // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：-1待支付，0待发货，1待收货，2已完成'), - // ApiDoc\Header(ref: [Definitions::class, "token"]), - // ApiDoc\Query(ref: [Definitions::class, "page"]), - // ApiDoc\ResponseSuccess("data", type: "array", children: [ - // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - // ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], - // ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], - // ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], - // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], - // ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], - // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], - // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - // ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], - // ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - // ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - // ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], - // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], - // ['name' => 'price', 'desc' => '单价', 'type' => 'string'], - // ]], - // ]], - // ]), - // ] + /**订单列表 */ public function lists() { return $this->dataLists(new StoreOrderLists()); @@ -98,17 +64,9 @@ class StoreOrderController extends BaseAdminController ]); } - // #[ - // ApiDoc\Title('订单详情'), - // ApiDoc\url('/store/store_order/storeOrder/detail'), - // ApiDoc\Method('GET'), - // ApiDoc\NotHeaders(), - // ApiDoc\Author('中国队长'), - // ApiDoc\Header(ref: [Definitions::class, "token"]), - // ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'), - // ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'), - // ApiDoc\ResponseSuccess("data", type: "array"), - // ] + /** + * 订单详情 + */ public function detail(StoreOrderLogic $orderLogic) { $params = (new StoreOrderValidate())->goCheck('detail'); @@ -116,11 +74,14 @@ class StoreOrderController extends BaseAdminController return $this->data($result); } + /** + * 订单检查 + */ public function checkOrder() { $cartId = (array)$this->request->post('cart_id', []); $params = $this->request->post(); - $params['store_id']=$this->adminInfo['store_id']; + $params['store_id'] = $this->adminInfo['store_id']; $res = StoreOrderLogic::cartIdByOrderInfo($cartId, null, null, $params); if ($res == false) { $msg = StoreOrderLogic::getError(); @@ -137,24 +98,23 @@ class StoreOrderController extends BaseAdminController { $params = (new StoreOrderValidate())->post()->goCheck('check'); $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 - $user= User::where('id',$params['uid'])->find(); - if(empty($user)){ + $user = User::where('id', $params['uid'])->find(); + if (empty($user)) { return $this->fail('无该用户请检查'); } $order = StoreOrderLogic::cartIdByOrderInfo($params['cart_id'], null, $user, $params); - if(!$order){ + if (!$order) { return $this->fail(StoreOrderLogic::getError()); } - if($order['order']['pay_price'] > $user['purchase_funds']){ + if ($order['order']['pay_price'] > $user['purchase_funds']) { return $this->fail('当前用户采购款不足支付'); } $res = (new StoreOrderLogic())->dealSendSms($params); - if($res){ - return $this->success('发送成功',[],1,0); - }else{ + if ($res) { + return $this->success('发送成功', [], 1, 0); + } else { return $this->fail('发送失败'); } - } @@ -175,8 +135,8 @@ class StoreOrderController extends BaseAdminController return $this->fail('购物车商品不能超过100个'); } $user = null; - if($pay_type == PayEnum::PURCHASE_FUNDS){ - $user = User::where('id',$this->request->post('uid'))->find(); + if ($pay_type == PayEnum::PURCHASE_FUNDS) { + $user = User::where('id', $this->request->post('uid'))->find(); } $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 $order = StoreOrderLogic::createOrder($cartId, $addressId, $user, $params); @@ -184,13 +144,13 @@ class StoreOrderController extends BaseAdminController switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 - PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); - return $this->success('采购款支付成功',['id'=>$order['id']]); + PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $this->request->post('uid')]); + return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功',['id'=>$order['id']]); + return $this->success('现金支付成功', ['id' => $order['id']]); case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -205,7 +165,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'], 'id' => $order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -217,7 +177,7 @@ class StoreOrderController extends BaseAdminController } PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'], 'id' => $order['id']]); default: return $this->fail('支付方式错误'); } @@ -252,7 +212,7 @@ class StoreOrderController extends BaseAdminController case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功',['id'=>$order['id']]); + return $this->success('现金支付成功', ['id' => $order['id']]); break; case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -266,7 +226,7 @@ class StoreOrderController extends BaseAdminController Redis::send('send-code-pay', ['order_id' => $order['order_id']]); return $this->success('用户支付中'); } - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'], 'id' => $order['id']]); case PayEnum::ALIPAY_BARCODE: //支付宝条码支付 $result = PaymentLogic::ali_auth_code($auth_code, $order); @@ -279,7 +239,7 @@ class StoreOrderController extends BaseAdminController PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result); $result['create_time'] = $order['create_time']; - return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]); + return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'], 'id' => $order['id']]); default: return $this->fail('支付方式错误'); } @@ -296,8 +256,8 @@ class StoreOrderController extends BaseAdminController if (empty($count)) { return $this->fail('无该核销码请检查'); } - $params['store_id']=$this->adminInfo['store_id']; - $params['staff_id']=$this->adminId; + $params['store_id'] = $this->adminInfo['store_id']; + $params['staff_id'] = $this->adminId; $res = OrderLogic::writeOff($params); if ($res) { return $this->success('核销成功'); @@ -328,17 +288,16 @@ class StoreOrderController extends BaseAdminController $params['page_no'] = 1; $params['page_size'] = 15; } - $params['store_id'] =$this->request->adminInfo['store_id']; + $params['store_id'] = $this->request->adminInfo['store_id']; $result = $orderLogic->writeList($params); $data = [ 'lists' => $result, 'count' => count($result), 'page_no' => $params['page_no'], - 'page_size' =>$params['page_size'], + 'page_size' => $params['page_size'], ]; - return $this->success('ok',$data); - + return $this->success('ok', $data); } /** * vip充值 @@ -351,16 +310,16 @@ class StoreOrderController extends BaseAdminController return $this->fail('支付条码不能为空'); } $params = $this->request->post(); - $data=[ - 'store_id'=>$this->adminInfo['store_id'], - 'uid'=>$params['uid'], - 'staff_id'=>$this->adminId, - 'order_id'=>getNewOrderId('CZ'), - 'price'=>$params['price'], - 'recharge_type'=>'INDUSTRYMEMBERS', + $data = [ + 'store_id' => $this->adminInfo['store_id'], + 'uid' => $params['uid'], + 'staff_id' => $this->adminId, + 'order_id' => getNewOrderId('CZ'), + 'price' => $params['price'], + 'recharge_type' => 'INDUSTRYMEMBERS', ]; $order = UserRecharge::create($data); - $order['pay_price']=$order['price']; + $order['pay_price'] = $order['price']; switch ($pay_type) { case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -371,7 +330,7 @@ class StoreOrderController extends BaseAdminController if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); } else { - Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); + Redis::send('send-code-pay', ['order_id' => $order['order_id'], 'pay_type' => 'recharge']); return $this->success('用户支付中'); } return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); @@ -384,7 +343,7 @@ class StoreOrderController extends BaseAdminController if ($result['msg'] !== 'Success') { return $this->success('用户支付中'); } - PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result,'ali'); + PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result, 'ali'); $result['create_time'] = $order['create_time']; return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); @@ -397,10 +356,10 @@ class StoreOrderController extends BaseAdminController public function stocking() { $uid = $this->request->post('uid'); - $res = (new StoreOrderLogic())->dealSendSms(['uid'=>$uid],1); - if($res){ - return $this->success('发送成功',[],0,1); - }else{ + $res = (new StoreOrderLogic())->dealSendSms(['uid' => $uid], 1); + if ($res) { + return $this->success('发送成功', [], 0, 1); + } else { return $this->fail('发送失败'); } } @@ -408,22 +367,23 @@ class StoreOrderController extends BaseAdminController /** * 订单打印 */ - public function print(){ - $id=$this->request->get('id'); + public function print() + { + $id = $this->request->get('id'); $find = StoreOrder::where('id', $id)->find(); if ($find) { $merchant = SystemStore::where('id', $find['store_id'])->field('name,phone')->find(); - $mer_user_info = SystemStoreStaff::where('store_id', $find['store_id'])->where('is_admin',1)->field('staff_name,phone')->find(); + $mer_user_info = SystemStoreStaff::where('store_id', $find['store_id'])->where('is_admin', 1)->field('staff_name,phone')->find(); $user = User::where('id', $find['uid'])->field('nickname,mobile')->find(); $find['system_store_name'] = $merchant['name']; $find['pay_type_name'] = PayEnum::getPaySceneDesc($find['pay_type']); $find['system_store_phone'] = $merchant['phone']; $find['staff_name'] = $mer_user_info['staff_name']; $find['staff_phone'] = $mer_user_info['phone']; - $find['nickname'] = $user['nickname']??''; - $find['user_mobile'] = $user['mobile']??''; + $find['nickname'] = $user['nickname'] ?? ''; + $find['user_mobile'] = $user['mobile'] ?? ''; $find['info'] = StoreOrderCartInfo::where('oid', $find['id'])->field('store_id,product_id,cart_num,cart_info')->select()->each(function ($item) { - $goods = StoreBranchProduct::where(['store_id'=>$item['store_id'],'product_id'=>$item['product_id']])->field('store_name,unit')->find(); + $goods = StoreBranchProduct::where(['store_id' => $item['store_id'], 'product_id' => $item['product_id']])->field('store_name,unit')->find(); $item['unit_name'] = StoreProductUnit::where('id', $goods['unit'])->value('name'); $item['store_name'] = $goods['store_name']; $item['total_price'] = $item['cart_info']['total_price']; @@ -432,7 +392,5 @@ class StoreOrderController extends BaseAdminController }); } return $this->success('获取成功', $find?->toArray()); - } - } From 1c6cb9b1a5881947256bcce2f100aac5270a37fb Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 10:16:02 +0800 Subject: [PATCH 113/145] =?UTF-8?q?refactor(PayNotifyLogic):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E4=B8=BA9?= =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 48a0c0a6d..fe735a893 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -155,11 +155,11 @@ class PayNotifyLogic extends BaseLogic } - if ($order->pay_type == 9) { - $extra['create_time'] = $order['create_time']; + // if ($order->pay_type == 9) { + // $extra['create_time'] = $order['create_time']; // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - Redis::send('push-platform-print', ['id' => $order['id']]); - } + // Redis::send('push-platform-print', ['id' => $order['id']]); + // } // else { // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); @@ -251,7 +251,7 @@ class PayNotifyLogic extends BaseLogic } $cashFlowLogic = new CashFlowLogic(); $cashFlowLogic->insert($order['store_id'], $order['pay_price']); - Redis::send('push-platform-print', ['id' => $order['id']]); + // Redis::send('push-platform-print', ['id' => $order['id']]); } /** @@ -282,11 +282,11 @@ class PayNotifyLogic extends BaseLogic self::afterPay($order); } - if ($order->pay_type == 9) { - $extra['create_time'] = $order['create_time']; + // if ($order->pay_type == 9) { + // $extra['create_time'] = $order['create_time']; // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - Redis::send('push-platform-print', ['id' => $order['id']]); - } + // Redis::send('push-platform-print', ['id' => $order['id']]); + // } // else { // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // } From 7cf53797553dffe00de468d0741dcdf0855c81f2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 10:18:01 +0800 Subject: [PATCH 114/145] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=AC=BE=E6=94=B6=E9=93=B6=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/enum/PayEnum.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php index 99786c428..7cf6e2364 100644 --- a/app/common/enum/PayEnum.php +++ b/app/common/enum/PayEnum.php @@ -100,6 +100,7 @@ class PayEnum self::ALIPAY_QRCODE => '支付宝二维码', self::ALIPAY_BARCODE => '支付宝条码', self::BALANCE_PAY => '余额支付', + self::PURCHASE_FUNDS => '采购款收银', ]; if ($value === true) { From ac9eb17056811cf9c3ecf56ec286b23a5aebd17a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 10:44:00 +0800 Subject: [PATCH 115/145] =?UTF-8?q?feat(store=5Forder):=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7ID=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index ba689ab31..639433742 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -127,6 +127,7 @@ class StoreOrderController extends BaseAdminController $pay_type = (int)$this->request->post('pay_type'); $addressId = (int)$this->request->post('address_id'); $auth_code = $this->request->post('auth_code'); //微信支付条码 + $uid=$this->request->post('uid'); $params = $this->request->post(); if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY && $pay_type != PayEnum::PURCHASE_FUNDS) { return $this->fail('支付条码不能为空'); @@ -135,8 +136,8 @@ class StoreOrderController extends BaseAdminController return $this->fail('购物车商品不能超过100个'); } $user = null; - if ($pay_type == PayEnum::PURCHASE_FUNDS) { - $user = User::where('id', $this->request->post('uid'))->find(); + if ($uid) { + $user = User::where('id', $uid)->find(); } $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单 $order = StoreOrderLogic::createOrder($cartId, $addressId, $user, $params); @@ -144,7 +145,7 @@ class StoreOrderController extends BaseAdminController switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 - PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $this->request->post('uid')]); + PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $uid]); return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: From b5b364a3d1f5b3ef1cfe2ed0d4a1b4fb9ddae558 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 10:46:18 +0800 Subject: [PATCH 116/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9PayNotifyLogi?= =?UTF-8?q?c=E7=B1=BB=E4=BB=A5=E6=AD=A3=E7=A1=AE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=A9=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index fe735a893..090909fa7 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -311,7 +311,7 @@ class PayNotifyLogic extends BaseLogic //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { if($order['uid']>0){ - $user_number=bcmul($order['pay_price'], '0.01', 2); + $user_number=bcmul($order['pay_price'], '0.10', 2); $sing = [ 'uid' => $order['uid'], 'order_id' => $order['order_id'], From a546ddd3532078d71cfb3aa8ad916819ece251eb Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 10:47:26 +0800 Subject: [PATCH 117/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E7=9B=88=E6=94=B6=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E6=94=B6=E9=93=B6=E5=8F=B0=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E5=90=8E=E9=BB=98=E8=AE=A4=E4=B8=BA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/CashFlowLogic.php | 2 ++ app/store/logic/WorkbenchLogic.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/common/logic/CashFlowLogic.php b/app/common/logic/CashFlowLogic.php index 9a1d06004..4f0a39bdd 100644 --- a/app/common/logic/CashFlowLogic.php +++ b/app/common/logic/CashFlowLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\common\enum\YesNoEnum; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; class CashFlowLogic extends BaseLogic @@ -13,6 +14,7 @@ class CashFlowLogic extends BaseLogic $model->store_id = $storeId; $model->cash_price = $amount; $model->receivable = $amount; + $model->status = YesNoEnum::YES;//收银台收了默认算完成了 $model->save(); } diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index a0b9934ee..701840ded 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -548,24 +548,27 @@ class WorkbenchLogic extends BaseLogic public static function revenueStatistics($params) { - //当日营业额的统计 当日利润的统计 当日成本合集的统计 当日加到保证金的 当日的现金收银 + //当日营业额的统计 $today = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]); $turnover_today = $today ->whereDay('create_time') ->sum('pay_price'); + //当日利润的统计 $profit_today = $today ->whereDay('create_time') ->sum('profit'); + //当日成本合集的统计 $cost_today = $today ->whereDay('create_time') ->sum('cost'); - $deposit = StoreFinanceFlow::where(['store_id'=>$params['store_id']]) + //当日加到保证金的 + $deposit = StoreFinanceFlow::where(['store_id'=>$params['store_id'],'status'=>YesNoEnum::YES]) ->where('financial_type',OrderEnum::ORDER_MARGIN); $deposit_today =$deposit ->whereDay('create_time') ->sum('number'); - + //当日的现金收银 $cash_today = StoreCashFinanceFlow::where('store_id',$params['store_id']) ->whereDay('create_time') ->where('status',YesNoEnum::YES) @@ -574,8 +577,8 @@ class WorkbenchLogic extends BaseLogic //总的营业额的统计 总的利润的统计 总的成本合集的统计 总的加到保证金的 $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]); - $deposit_all = SystemStore::where('id',$params['store_id']) - ->value('paid_deposit'); + $deposit_all = StoreFinanceFlow::where(['store_id'=>$params['store_id'],'status'=>YesNoEnum::YES]) + ->sum('number'); $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) ->where('status',YesNoEnum::YES) From c9750921f1b5ba088f0b8db444a8f26a15087da7 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 11:16:48 +0800 Subject: [PATCH 118/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/logic/WorkbenchLogic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 701840ded..06902ee1d 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -572,7 +572,7 @@ class WorkbenchLogic extends BaseLogic $cash_today = StoreCashFinanceFlow::where('store_id',$params['store_id']) ->whereDay('create_time') ->where('status',YesNoEnum::YES) - ->sum('receipts'); + ->sum('receivable'); //总的营业额的统计 总的利润的统计 总的成本合集的统计 总的加到保证金的 $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]); @@ -593,7 +593,7 @@ class WorkbenchLogic extends BaseLogic $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) ->where('status',YesNoEnum::YES) ->whereMonth('create_time', $params['month']) - ->sum('receipts'); + ->sum('receivable'); } $turnover_all = $all ->sum('pay_price'); From 4b686647c4655e5095da73d45b3f513dd6c8d081 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 11:29:08 +0800 Subject: [PATCH 119/145] =?UTF-8?q?feat(StoreOrderController):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E6=AC=BE=E6=94=AF=E4=BB=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/validate/user/UserValidate.php | 2 +- app/common/logic/PayNotifyLogic.php | 158 +++++++++--------- .../store_order/StoreOrderController.php | 6 +- 3 files changed, 84 insertions(+), 82 deletions(-) diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index ef36fbb7f..90911234c 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -24,7 +24,7 @@ class UserValidate extends BaseValidate 'nickname' => 'require', 'account' => 'require', 'password' => 'require', - 'mobile' => 'require|mobile', + 'mobile' => 'require|unique:user', 'is_disable' => 'in:0,1', 'sex' => 'in:1,2', 'province' => 'require', diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 090909fa7..0db3235b4 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -113,8 +113,8 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); - if($user['user_ship'] == 1){ - VipLogic::dealVipAmount($order,PayEnum::PURCHASE_FUNDS); + if ($user['user_ship'] == 1) { + VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } // self::afterPay($order); @@ -156,8 +156,8 @@ class PayNotifyLogic extends BaseLogic // if ($order->pay_type == 9) { - // $extra['create_time'] = $order['create_time']; - // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // $extra['create_time'] = $order['create_time']; + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); // Redis::send('push-platform-print', ['id' => $order['id']]); // } // else { @@ -283,9 +283,9 @@ class PayNotifyLogic extends BaseLogic } // if ($order->pay_type == 9) { - // $extra['create_time'] = $order['create_time']; - // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - // Redis::send('push-platform-print', ['id' => $order['id']]); + // $extra['create_time'] = $order['create_time']; + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // Redis::send('push-platform-print', ['id' => $order['id']]); // } // else { // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -306,18 +306,18 @@ class PayNotifyLogic extends BaseLogic $financeLogic->order = $order; $financeLogic->user = ['uid' => $order['uid']]; // if ($order->pay_type != 9 || $order->pay_type != 10) { - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY,$order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 + $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 $count_frees = 0; //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { - if($order['uid']>0){ - $user_number=bcmul($order['pay_price'], '0.10', 2); + if ($order['uid'] > 0) { + $user_number = bcmul($order['pay_price'], '0.10', 2); $sing = [ 'uid' => $order['uid'], 'order_id' => $order['order_id'], 'title' => '购买商品获得兑换券', 'store_id' => $order['store_id'], - 'number' =>$user_number, + 'number' => $user_number, ]; $user_sing->save($sing); User::where('id', $order['uid'])->inc('integral', $user_number)->update(); @@ -357,77 +357,77 @@ class PayNotifyLogic extends BaseLogic $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //平台手续费 } } - if ($order['is_vip'] >= 1) { - if ($order['spread_uid'] > 0) { - $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; - $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); - $count_frees = bcadd($count_frees, $fees, 2); - if ($fees > 0) { - User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); - $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 - $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - } - } - $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); - $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); - $village_uid = 0; - $brigade_uid = 0; - //查询用户对应的村长和队长 - if ($order['uid'] > 0) { - $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); - if ($address) { - $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); - if ($arr1) { - $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); - if ($village_uid) { - User::where('id', $village_uid)->inc('integral', $fees)->update(); - } - } - $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); - if ($arr2) { - $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); - if ($brigade_uid) { - User::where('id', $brigade_uid)->inc('integral', $fees)->update(); - } - } - } - } + // if ($order['is_vip'] >= 1) { + if ($order['spread_uid'] > 0) { + $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; + $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); + $count_frees = bcadd($count_frees, $fees, 2); if ($fees > 0) { - //村长获得 - $sing = []; - - $sing[] = [ - 'uid' => $village_uid, - 'order_id' => $order['order_id'], - 'title' => '村长订单获得兑换券', - 'store_id' => $order['store_id'], - 'number' => $fees, - ]; - $sing[] = [ - 'uid' => $brigade_uid, - 'order_id' => $order['order_id'], - 'title' => '队长订单获得兑换券', - 'store_id' => $order['store_id'], - 'number' => $fees, - ]; - // if ($village_uid > 0) { - // $financeLogic->other_arr['vip_uid'] = $village_uid; - // } - // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - //队长获得 - // if ($brigade_uid > 0) { - // $financeLogic->other_arr['vip_uid'] = $brigade_uid; - // } - // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - $user_sing->saveAll($sing); - //其他获得 - $financeLogic->other_arr['vip_uid'] = 0; - $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); + $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); //vip订单获得 + $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); } } + $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2); + $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2); + $village_uid = 0; + $brigade_uid = 0; + //查询用户对应的村长和队长 + if ($order['uid'] > 0) { + $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find(); + if ($address) { + $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); + if ($arr1) { + $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if ($village_uid) { + User::where('id', $village_uid)->inc('integral', $fees)->update(); + } + } + $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); + if ($arr2) { + $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if ($brigade_uid) { + User::where('id', $brigade_uid)->inc('integral', $fees)->update(); + } + } + } + } + if ($fees > 0) { + //村长获得 + $sing = []; + + $sing[] = [ + 'uid' => $village_uid, + 'order_id' => $order['order_id'], + 'title' => '村长订单获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, + ]; + $sing[] = [ + 'uid' => $brigade_uid, + 'order_id' => $order['order_id'], + 'title' => '队长订单获得兑换券', + 'store_id' => $order['store_id'], + 'number' => $fees, + ]; + // if ($village_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $village_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + //队长获得 + // if ($brigade_uid > 0) { + // $financeLogic->other_arr['vip_uid'] = $brigade_uid; + // } + // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + $user_sing->saveAll($sing); + //其他获得 + $financeLogic->other_arr['vip_uid'] = 0; + $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); + $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); + } + // } $fees = bcsub($order['pay_price'], $count_frees, 2); //供应链订单获得 if ($fees > 0) { diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 639433742..d4213a31a 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -207,9 +207,11 @@ class StoreOrderController extends BaseAdminController if (!$order) { return $this->fail('订单不存在或已支付'); } - switch ($pay_type) { - + case PayEnum::PURCHASE_FUNDS: + //采购款支付 + PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $order['uid']]); + return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); From 84d056bfaf2e3254614be193d0226e5512c1888b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 11:45:09 +0800 Subject: [PATCH 120/145] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=E4=BB=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 0db3235b4..a6da7a402 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -378,16 +378,18 @@ class PayNotifyLogic extends BaseLogic if ($address) { $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid'); if ($arr1) { - $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); - if ($village_uid) { - User::where('id', $village_uid)->inc('integral', $fees)->update(); + $uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id'); + if ($uid) { + User::where('id', $uid)->inc('integral', $fees)->update(); + $village_uid=$uid; } } $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid'); if ($arr2) { - $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); - if ($brigade_uid) { - User::where('id', $brigade_uid)->inc('integral', $fees)->update(); + $uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id'); + if ($uid) { + User::where('id', $uid)->inc('integral', $fees)->update(); + $brigade_uid=$uid; } } } From b67259a91effae1134fc97128cfc30c823337ecf Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 11:49:53 +0800 Subject: [PATCH 121/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/enum/OrderEnum.php | 4 ++++ app/common/logic/CapitalFlowLogic.php | 14 ++++++++------ app/common/logic/PayNotifyLogic.php | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index f22c9d32c..8a5ca32e1 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -132,6 +132,10 @@ class OrderEnum const REFUND_STATUS_FINISH = 2; const CANCEL_SALE = 3; + //判断资金流水是否余额支付 + const BALANCE_PAYMEN_NO = 1; + + /** * @notes 获取支付类型 * @param bool $value diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php index e8ac3a513..fd12bb687 100644 --- a/app/common/logic/CapitalFlowLogic.php +++ b/app/common/logic/CapitalFlowLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\common\enum\OrderEnum; use app\common\model\finance\CapitalFlow; class CapitalFlowLogic extends BaseLogic @@ -55,21 +56,22 @@ class CapitalFlowLogic extends BaseLogic * @param $mark * @return mixed */ - public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0) + public function userExpense($store_id=0,$category, $linkType, $linkId, $amount, $mark = '',$payType=0) { $model = new CapitalFlow(); $model->uid = $this->user['id']; $model->category = $category; + $model->store_id = $store_id; $model->link_type = $linkType; $model->link_id = $linkId; $model->amount = $amount; - // if($payType == 1){ + if($payType == OrderEnum::BALANCE_PAYMEN_NO){ $model->before_balance = $this->user['now_money']; $model->balance = $this->user['now_money']; - // }else{ - // $model->before_balance = $this->user['now_money']; - // $model->balance = bcsub($this->user['now_money'], $amount, 2); - // } + }else{ + $model->before_balance = $this->user['now_money']; + $model->balance = bcsub($this->user['now_money'], $amount, 2); + } $model->create_time = date('Y-m-d H:i:s'); $model->type = 'out'; $model->title = $this->getTitle($category, $amount); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index a6da7a402..bfe287bb9 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -78,7 +78,7 @@ class PayNotifyLogic extends BaseLogic $user->save(); $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); + $capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -112,7 +112,7 @@ class PayNotifyLogic extends BaseLogic $user->save(); $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); + $capitalFlowDao->userExpense($order['store_id'],'user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1); if ($user['user_ship'] == 1) { VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } @@ -151,7 +151,7 @@ class PayNotifyLogic extends BaseLogic } else { $capitalFlowDao = new CapitalFlowLogic($user); //微信支付和用户余额无关 - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); + $capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); } From 79e89fa22ddb3ac76d231bb3b1d8e10cdad73e25 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 12:10:21 +0800 Subject: [PATCH 122/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/CapitalFlowLogic.php | 3 ++- app/common/logic/PayNotifyLogic.php | 6 +++--- app/store/logic/WorkbenchLogic.php | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php index fd12bb687..d2c7ab918 100644 --- a/app/common/logic/CapitalFlowLogic.php +++ b/app/common/logic/CapitalFlowLogic.php @@ -50,13 +50,14 @@ class CapitalFlowLogic extends BaseLogic /** * 用户支出 * @param $category + * @param $store_id * @param $linkType * @param $linkId * @param $amount * @param $mark * @return mixed */ - public function userExpense($store_id=0,$category, $linkType, $linkId, $amount, $mark = '',$payType=0) + public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0,) { $model = new CapitalFlow(); $model->uid = $this->user['id']; diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index bfe287bb9..a9c5d72c0 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -78,7 +78,7 @@ class PayNotifyLogic extends BaseLogic $user->save(); $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order['pay_price']); + $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -112,7 +112,7 @@ class PayNotifyLogic extends BaseLogic $user->save(); $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense($order['store_id'],'user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1); + $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']); if ($user['user_ship'] == 1) { VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } @@ -151,7 +151,7 @@ class PayNotifyLogic extends BaseLogic } else { $capitalFlowDao = new CapitalFlowLogic($user); //微信支付和用户余额无关 - $capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); + $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1,$order['store_id']); } diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 06902ee1d..ea4e9de58 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -21,6 +21,7 @@ use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\logic\store_order\StoreOrderLogic; use app\common\logic\StoreFinanceFlowLogic; +use app\common\model\finance\CapitalFlow; use app\common\model\order\Cart; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; @@ -582,7 +583,7 @@ class WorkbenchLogic extends BaseLogic $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) ->where('status',YesNoEnum::YES) - ->sum('receipts'); + ->sum('receivable'); if(isset($params['month']) && $params['month']){ $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]) ->whereMonth('create_time', $params['month']) @@ -599,11 +600,10 @@ class WorkbenchLogic extends BaseLogic ->sum('pay_price'); $profit_all = $all ->sum('profit'); - $cost_all = $all - ->sum('cost'); - - - + //消耗余额 V2.0 + $cost_all = CapitalFlow:: + where(['category'=>'user_order_balance_pay','store_id'=>$params['store_id']]) + ->sum('amount'); $time = self::getLastSevenDays(); $newArr = []; From 325014ee992d36c3fab7f66e58250b1ab2ab8f2a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 15:01:36 +0800 Subject: [PATCH 123/145] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 4 ++- .../logic/store_order/StoreOrderLogic.php | 21 +++++-------- app/store/controller/user/UserController.php | 8 +++++ .../controller/user/UserLabelController.php | 30 +++++++++++++++++++ 4 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 app/store/controller/user/UserLabelController.php diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 46b7033c4..ff86b002b 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -19,6 +19,7 @@ use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; +use app\common\model\user_label\UserLabel; use think\facade\Db; use app\common\service\FileService; use Webman\Config; @@ -148,7 +149,7 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'account', 'nickname', 'avatar', 'real_name','integral', + 'id', 'account', 'nickname', 'avatar', 'real_name','integral','label_id', 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' ]; @@ -158,6 +159,7 @@ class UserLogic extends BaseLogic $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); $user->sex = $user->getData('sex'); $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number'); + $user['label_name']=$user->label_id?UserLabel::where('label_id',$user->label_id)->value('label_name'):""; return $user->toArray(); } diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index d0c11d7bf..bbb40ea62 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -62,11 +62,11 @@ class StoreOrderLogic extends BaseLogic $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 -// if ($user && $user['user_ship'] == 4) { -// $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); -// $cart_select[$k]['deduction_price'] =$deduction_price_count; -// self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); -// } + if ($user && $user['user_ship'] == 4) { + $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } //利润 // $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 @@ -101,13 +101,9 @@ class StoreOrderLogic extends BaseLogic self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - $preferential_amount = 0;//差价(用户为UserShipEnum::DISCOUNT_ARRAY 的时候的优惠差价) $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 - if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ - $pay_price =bcsub(self::$store_price, self::$activity_price, 2); //减去活动优惠金额 - $preferential_amount = bcsub(self::$pay_price,self::$store_price,2); - } + $vipPrice = 0; //成本价 收益 $order = [ @@ -125,12 +121,11 @@ class StoreOrderLogic extends BaseLogic 'store_id' => $params['store_id'] ?? 0, 'shipping_type' =>3,//配送方式 1=快递 ，2=门店自提 'activity' =>'减免', - 'activity_price' =>self::$activity_price, + 'activity_price' =>self::$activity_price,//活动优惠价 'activities' => self::$activity_price>0?1:0, 'default_delivery'=>1, 'original_price'=>self::$total_price, - 'deduction_price' => self::$activity_price, - 'preferential_amount' => $preferential_amount, + 'deduction_price' => self::$activity_price,//抵扣金额 ]; if($user && $user['user_ship']!=4){ $order['is_vip']=1; diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php index 3ad486640..5e45e7786 100644 --- a/app/store/controller/user/UserController.php +++ b/app/store/controller/user/UserController.php @@ -47,4 +47,12 @@ class UserController extends BaseAdminController return $this->success('设置成功'); } + public function user_label(){ + $label_id=$this->request->post('label_id',0); + $id=$this->request->post('id',0); + + User::where('id',$id)->update(['label_id'=>$label_id]); + return $this->success('设置成功'); + } + } \ No newline at end of file diff --git a/app/store/controller/user/UserLabelController.php b/app/store/controller/user/UserLabelController.php new file mode 100644 index 000000000..abae0d92b --- /dev/null +++ b/app/store/controller/user/UserLabelController.php @@ -0,0 +1,30 @@ +dataLists(new UserLabelLists()); + } + +} \ No newline at end of file From 17239d39e84b80babded41e3193e62e875bb65a3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 15:27:42 +0800 Subject: [PATCH 124/145] =?UTF-8?q?=E8=BF=81=E7=A7=BBvip=E4=B8=BA1?= =?UTF-8?q?=E5=BE=97=E6=97=B6=E5=80=99=E5=BE=97=E5=86=BB=E7=BB=93=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=92=8C=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BE=97=E5=B8=A6=E8=BF=94=E5=9B=9E=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/user/UserLogic.php | 6 ++-- app/common/logic/PayNotifyLogic.php | 43 ++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index bdbd73512..e6b493914 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -15,6 +15,8 @@ use app\common\{logic\BaseLogic, model\user\UserRecharge, model\user\UserShip, service\wechat\WeChatMnpService}; +use think\facade\Db; + /** * 会员逻辑层 @@ -90,8 +92,8 @@ class UserLogic extends BaseLogic $data['store_id'] = $check['store_id']; } } - $data['return_money'] = StoreFinanceFlow:: - where(['user_id'=>$uid,'status'=>0,'financial_pm'=>0]) + $data['return_money'] = Db::name('vip_flow')-> + where(['user_id'=>$uid,'status'=>0]) ->sum('number'); }else{ diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index a9c5d72c0..f7923921f 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -10,6 +10,7 @@ use app\common\model\finance\PayNotifyLog; use app\common\model\pay\PayNotify; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_order\StoreOrder; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\system_store\SystemStore; use app\common\model\user\User; use app\common\model\user\UserAddress; @@ -114,7 +115,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']); if ($user['user_ship'] == 1) { - VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); + self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } // self::afterPay($order); @@ -311,6 +312,11 @@ class PayNotifyLogic extends BaseLogic //商户应该获得的钱 每个商品的price-ot_price 利润 // if (isset($order->profit) && $order->profit > 0) { if ($order['uid'] > 0) { + //用户下单该用户等级为1得时候才处理冻结金额 + $user = User::where('id', $order['uid'])->find(); + if ($user['user_ship'] == 1) { + self::dealVipAmount($order, $order['pay_type']); + } $user_number = bcmul($order['pay_price'], '0.10', 2); $sing = [ 'uid' => $order['uid'], @@ -460,4 +466,39 @@ class PayNotifyLogic extends BaseLogic ]; PayNotify::create($data); } + + + /** + * 处理用户为vip1时得冻结资金 + * @param $order + * @param $pay_type + * @param $transaction_id + * @return true + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function dealVipAmount($order,$pay_type =1, $transaction_id = 0) + { + $detail = StoreOrderCartInfo::where('oid',$order['id'])->select()->toArray(); + $total_vip = 0; + foreach ($detail as $value){ + $total_vip +=$value['cart_info']['vip_frozen_price']; + } + $data=[ + 'order_id' => $order['id'], + 'transaction_id' => $transaction_id??0, + 'order_sn' =>$order['order_id'], + 'user_id' => $order['uid'], + 'number' => $total_vip, + 'pay_type' => $pay_type??1, + 'status' => 0, + 'store_id' => $order['store_id'], + 'staff_id' => $order['staff_id'], + 'create_time'=>time() + ]; + Db::name('vip_flow')->insert($data); + return true; + } + } From b23cafcb64a9d4b19adb2e851dff330ee40850d6 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 16:18:12 +0800 Subject: [PATCH 125/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=B8=BA1=E6=97=B6=E6=83=85=E5=86=B5=E4=B8=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=87=91=E9=A2=9D=E4=B8=BA=E6=94=AF=E4=BB=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=87=8F=E5=8E=BB=E5=86=BB=E7=BB=93=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 43 ++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index f7923921f..748971e67 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -304,14 +304,10 @@ class PayNotifyLogic extends BaseLogic $financeLogic = new StoreFinanceFlowLogic(); $user_sing = new UserSign(); - $financeLogic->order = $order; - $financeLogic->user = ['uid' => $order['uid']]; - // if ($order->pay_type != 9 || $order->pay_type != 10) { - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 - $count_frees = 0; - //商户应该获得的钱 每个商品的price-ot_price 利润 - // if (isset($order->profit) && $order->profit > 0) { if ($order['uid'] > 0) { + // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 + $vipFrozenAmount = self::dealFrozenPrice($order['id']); + $order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2); //用户下单该用户等级为1得时候才处理冻结金额 $user = User::where('id', $order['uid'])->find(); if ($user['user_ship'] == 1) { @@ -329,6 +325,12 @@ class PayNotifyLogic extends BaseLogic User::where('id', $order['uid'])->inc('integral', $user_number)->update(); } + $financeLogic->order = $order; + $financeLogic->user = ['uid' => $order['uid']]; + // if ($order->pay_type != 9 || $order->pay_type != 10) { + $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 + $count_frees = 0; + //平台手续费 $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2); $count_frees = bcadd($count_frees, $fees, 2); @@ -467,6 +469,25 @@ class PayNotifyLogic extends BaseLogic PayNotify::create($data); } + /** + * 冻结金额 + * @param $oid + * @return int|mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + + public static function dealFrozenPrice($oid) + { + $detail = StoreOrderCartInfo::where('oid',$oid)->select()->toArray(); + $total_vip = 0; + foreach ($detail as $value){ + $total_vip +=$value['cart_info']['vip_frozen_price']; + } + return $total_vip; + } + /** * 处理用户为vip1时得冻结资金 @@ -478,13 +499,9 @@ class PayNotifyLogic extends BaseLogic * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function dealVipAmount($order,$pay_type =1, $transaction_id = 0) + public static function dealVipAmount($order,$pay_type =1,$transaction_id = 0) { - $detail = StoreOrderCartInfo::where('oid',$order['id'])->select()->toArray(); - $total_vip = 0; - foreach ($detail as $value){ - $total_vip +=$value['cart_info']['vip_frozen_price']; - } + $total_vip = self::dealFrozenPrice($order['id']); $data=[ 'order_id' => $order['id'], 'transaction_id' => $transaction_id??0, From 479de5cc419bb4c067d97af79c29418d411b2486 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 16:57:10 +0800 Subject: [PATCH 126/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=89=A3=E9=99=A4=E9=87=91=E9=A2=9D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 31 ++++++++++--------- .../logic/store_order/StoreOrderLogic.php | 13 ++++++-- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 1728473f1..6f66fd902 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -85,23 +85,32 @@ class OrderLogic extends BaseLogic $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 -// if ($user && $user['user_ship'] == 4) { -// $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); -// $cart_select[$k]['deduction_price'] =$deduction_price_count; -// self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); -// } + if ($user && $user['user_ship'] == 1) { + //更新 会员为1的时候原价减去会员价 + $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } + if ($user && $user['user_ship'] == 4) { + //更新 为4商户的时候减去商户价格 + $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } + //利润 // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 + $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价 + $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; //vip1待返回金额 - - $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],2); + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2); // d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] ); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; @@ -119,13 +128,7 @@ class OrderLogic extends BaseLogic self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - $preferential_amount = 0;//差价(用户为UserShipEnum::DISCOUNT_ARRAY 的时候的优惠差价) - $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 - if($user && in_array($user['user_ship'],UserShipEnum::DISCOUNT_ARRAY)){ - $pay_price =bcsub(self::$store_price, self::$activity_price, 2); //减去活动优惠金额 - $preferential_amount = bcsub(self::$pay_price,self::$store_price,2); - } $vipPrice = 0; //成本价 收益 @@ -148,8 +151,6 @@ class OrderLogic extends BaseLogic 'activities' => self::$activity_price>0?1:0, 'deduction_price' => self::$activity_price, 'is_vip' => 0, - 'preferential_amount' => $preferential_amount, - ]; $order['default_delivery'] = 0; if ($params['store_id']) { diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index bbb40ea62..00f2c5150 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -62,8 +62,16 @@ class StoreOrderLogic extends BaseLogic $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 + if ($user && $user['user_ship'] == 1) { + //更新 会员为1的时候原价减去会员价 + $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); + $cart_select[$k]['deduction_price'] =$deduction_price_count; + self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + } + if ($user && $user['user_ship'] == 4) { - $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2); + //更新 为4商户的时候减去商户价格 + $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); } @@ -72,13 +80,14 @@ class StoreOrderLogic extends BaseLogic $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额 $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价 + $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价 $cart_select[$k]['product_id'] = $find['product_id']; $cart_select[$k]['old_cart_id'] = $v['id']; $cart_select[$k]['cart_num'] = $v['cart_num']; $cart_select[$k]['verify_code'] = $params['verify_code'] ?? ''; //vip1待返回金额 - $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],2); + $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2); $cartInfo = $cart_select[$k]; $cartInfo['name'] = $find['store_name']; $cartInfo['image'] = $find['image']; From f00ca73aa97b0e74bf6540e7761d9fa0280f0f26 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 17:27:36 +0800 Subject: [PATCH 127/145] =?UTF-8?q?=E6=9C=80=E8=BF=91=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 8 +++++++- app/api/logic/order/OrderLogic.php | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 0d6e336ff..27553902d 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -366,12 +366,18 @@ class OrderController extends BaseApiController public function detail() { $order_id = (int)$this->request->get('order_id'); + $lat = $this->request->get('lat',''); + $lng = $this->request->get('long',''); $where = [ 'id' => $order_id, 'uid' => $this->userId, ]; $url = 'https://'.$this->request->host(true); - $order = OrderLogic::detail($where,$url); + $parm = [ + 'lat'=>$lat, + 'long'=>$lng + ]; + $order = OrderLogic::detail($where,$url,$parm); if ($order) { return $this->data($order); } else { diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 6f66fd902..38ce2fe1d 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -338,7 +338,7 @@ class OrderLogic extends BaseLogic } - public static function detail($params,$url=''): array + public static function detail($params,$url='',$param=[]): array { $find = StoreOrder::where($params)->findOrEmpty()->toArray(); if ($find) { @@ -360,6 +360,24 @@ class OrderLogic extends BaseLogic if($find['verify_img']){ $find['verify_img'] = $url.$find['verify_img']; } + //处理返回最近的店铺 + if($param['lat'] && $param['long']){ + $storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray(); + $nearestStore = null; + $minDistance = PHP_FLOAT_MAX; + foreach ($storeAll as $value){ + $value['distance'] = haversineDistance($value['latitude'],$value['longitude'],$param['lat'] ,$param['long']); + if ($value['distance'] < $minDistance) { + $minDistance = $value['distance']; + $nearestStore = $value; + } + } + if ($nearestStore) { + $find['near_store'] =$nearestStore; + + } + + } } return $find; } From e200cdcd67c1f8669bc0db12d271d44504668b16 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 17:33:41 +0800 Subject: [PATCH 128/145] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/controller/store_order/StoreOrderController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index d4213a31a..70d8173e4 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -82,7 +82,8 @@ class StoreOrderController extends BaseAdminController $cartId = (array)$this->request->post('cart_id', []); $params = $this->request->post(); $params['store_id'] = $this->adminInfo['store_id']; - $res = StoreOrderLogic::cartIdByOrderInfo($cartId, null, null, $params); + $user=User::where('id',$params['uid'])->find(); + $res = StoreOrderLogic::cartIdByOrderInfo($cartId, null, $user, $params); if ($res == false) { $msg = StoreOrderLogic::getError(); if ($msg == '购物车为空') { From e210bb790635b10b4409c535d1ba2dd451868cb1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 18:14:25 +0800 Subject: [PATCH 129/145] =?UTF-8?q?feat(WorkbenchController):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9C=AC=E6=9C=88=E8=AE=A2=E5=8D=95=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E6=9C=AC=E6=9C=88=E6=94=AF=E4=BB=98=E4=BA=BA=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/WorkbenchController.php | 4 +- app/common/controller/BaseLikeController.php | 3 - app/common/model/store_visit/StoreVisit.php | 2 +- app/statistics/controller/IndexController.php | 107 ++++++++++++++++++ app/statistics/logic/OrderLogic.php | 69 +++++++++++ app/statistics/logic/ProductLogic.php | 51 +++++++++ app/statistics/logic/UserLogic.php | 33 ++++++ config/middleware.php | 7 +- 8 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 app/statistics/controller/IndexController.php create mode 100644 app/statistics/logic/OrderLogic.php create mode 100644 app/statistics/logic/ProductLogic.php create mode 100644 app/statistics/logic/UserLogic.php diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 3ad24544d..20335665f 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -704,8 +704,8 @@ class WorkbenchController extends BaseAdminController ] ], "month" => [ - WorkbenchLogic::month_order_count($dates_two,'本月订单数'), - WorkbenchLogic::month_order_count($dates_two,'本月支付人数') + WorkbenchLogic::month_order_count('本月订单数'), + WorkbenchLogic::month_order_count('本月支付人数') ] ] ]; diff --git a/app/common/controller/BaseLikeController.php b/app/common/controller/BaseLikeController.php index 56a6b1fd1..13c07d9c8 100644 --- a/app/common/controller/BaseLikeController.php +++ b/app/common/controller/BaseLikeController.php @@ -74,9 +74,6 @@ class BaseLikeController extends BaseController } - // #[ - // ApiDoc\Title('是否免登录验证'), - // ] public function isNotNeedLogin() : bool { $notNeedLogin = $this->notNeedLogin; diff --git a/app/common/model/store_visit/StoreVisit.php b/app/common/model/store_visit/StoreVisit.php index 0f506070a..82a837d8f 100644 --- a/app/common/model/store_visit/StoreVisit.php +++ b/app/common/model/store_visit/StoreVisit.php @@ -8,7 +8,7 @@ use think\model\concern\SoftDelete; /** - * 计量单位 + * 商品浏览分析 * Class StoreProductUnit * @package app\common\model\store_product_unit */ diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php new file mode 100644 index 000000000..a28a407b1 --- /dev/null +++ b/app/statistics/controller/IndexController.php @@ -0,0 +1,107 @@ +fail(OrderLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', ['dayPayPrice' => $res]); + } + public function user() + { + $today = strtotime(date('Y-m-d')); + $dates=[]; + // 循环输出前5天的日期 + for ($i = 0; $i <= 4; $i++) { + // 计算前第$i天的日期时间戳 + $timestamp = $today - ($i * 86400); // 86400秒等于1天 + + // 将时间戳格式化为日期 + $date = date('Y-m-d', $timestamp); + $dates[]=$date; + } + $res = UserLogic::userCount(5,$dates); + if (UserLogic::hasError()) { + return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + + /** + * 中间商品统计 + */ + public function product_count() + { + $res = ProductLogic::Count(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 订单统计 + */ + public function order_user_num_count() + { + $res = OrderLogic::Count(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 商品销量排行榜统计 + */ + public function sales_ranking() + { + $res = ProductLogic::sales(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 成交用户数据 + */ + public function user_trade_count() + { + $dates = []; + + $today = new DateTime(); + $thirtyDaysAgo = new DateTime($today->format('Y-m-d')); + $thirtyDaysAgo->modify('-30 days'); + for ($i = 0; $i < 31; $i++) { + $date = new DateTime($thirtyDaysAgo->format('Y-m-d')); + $date->modify('+' . $i . ' days'); + $dates[] = $date->format('Y-m-d'); + } + $res = UserLogic::TradeCount(5, $dates); + if (UserLogic::hasError()) { + return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } + /** + * 当日订单金额 + */ + public function street_currday_order_count() + { + $res = OrderLogic::Currday(5); + if (ProductLogic::hasError()) { + return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息 + } + return $this->success('ok', $res); + } +} diff --git a/app/statistics/logic/OrderLogic.php b/app/statistics/logic/OrderLogic.php new file mode 100644 index 000000000..83d7054df --- /dev/null +++ b/app/statistics/logic/OrderLogic.php @@ -0,0 +1,69 @@ +whereDay('create_time')->count(); + $orderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereDay('create_time')->group('uid')->count(); + $monthOrderNum = StoreOrder::where('store_id', $store_id)->whereMonth('create_time')->count(); + $monthOrderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereMonth('create_time')->group('uid')->count(); + $data = [ + "orderNum" => $orderNum, + "monthOrderNum" => $monthOrderNum, + "monthOrderNumRate" => 0, + "orderNumRate" => 0, + "orderPayNum" => $orderPayNum, + "monthOrderPayNum" => $monthOrderPayNum, + "monthOrderPayRate" => 0, + "orderOrderPayRate" => 0 + ]; + return $data; + } + public static function Currday($store_id) + { + $date = date("Y-m-d"); + $startTime = strtotime($date . ' 00:00:00'); // 当天的开始时间戳 + $endTime = strtotime($date . ' 23:59:59'); // 当天的结束时间戳 + + $interval = 4 * 60 * 60; // 4小时的秒数 + $data = []; + for ($time = $startTime; $time < $endTime; $time += $interval) { + + $endTimeSegment = $time + $interval; + $startTimeSegment = date('Y-m-d H:i:s', $time); + $yesterendTimeSegment = date('Y-m-d H:i:s', $endTimeSegment - 86400); + $endTimeSegment = date('Y-m-d H:i:s', $endTimeSegment); + $yesterstartTimeSegment = date('Y-m-d H:i:s', $time - 86400); + // 统计当前时间段的订单 + $todayAmount = StoreOrder::where('store_id', $store_id) + ->where('paid', 1) + ->whereBetween('create_time', [strtotime($startTimeSegment), strtotime($endTimeSegment)]) + ->sum('pay_price'); + $yesterdayAmount = StoreOrder::where('store_id', $store_id) + ->where('paid', 1) + ->whereBetween('create_time', [strtotime($yesterstartTimeSegment), strtotime($yesterendTimeSegment)]) + ->sum('pay_price'); + $data[] = [ + 'todayAmount' => $todayAmount, + 'yesterdayAmount' => $yesterdayAmount, + ]; + } + return $data; + } + public static function dayPayPrice($store_id) + { + $todayAmount = UserRecharge::where('store_id', $store_id) + ->where('paid', 1) + ->whereDay('create_time') + ->sum('price'); + + return $todayAmount; + } +} diff --git a/app/statistics/logic/ProductLogic.php b/app/statistics/logic/ProductLogic.php new file mode 100644 index 000000000..1b6a8aa83 --- /dev/null +++ b/app/statistics/logic/ProductLogic.php @@ -0,0 +1,51 @@ +count(); + $yestertodayProductCount=StoreBranchProduct::where('store_id',$store_id)->where('create_time', '<',strtotime(date('Y-md'))-1)->count(); + if ($yestertodayProductCount == 0 ||$todayProductCount==0) { + $weeklyProductTotalGrowthRate = 0; + } else { + $weeklyProductTotalGrowthRate = ($todayProductCount - $yestertodayProductCount) / $yestertodayProductCount * 100; + } + + $todayNewProductCount=StoreBranchProduct::where('store_id',$store_id)->whereDay('create_time')->count(); + $yestertodayNewProductCount=StoreBranchProduct::where('store_id',$store_id)->whereDay('create_time', 'yesterday')->count(); + if ($yestertodayProductCount == 0 ||$todayProductCount==0) { + $weeklyNewProductTotalGrowthRate = 0; + } else { + $weeklyNewProductTotalGrowthRate = ($todayNewProductCount - $yestertodayNewProductCount) / $yestertodayNewProductCount * 100; + } + $data = [ + "totalProductCounInfo" => [ + "todayProductCount" => $todayProductCount, + "yestertodayProductCount" => $yestertodayProductCount, + "weeklyProductTotalGrowthRate" => $weeklyProductTotalGrowthRate + ], + "newProductCountInfo" => [ + "todayNewProductCount" => 0, + "yestertodayNewProductCount" => 0, + "weeklyNewProductTotalGrowthRate" => $weeklyNewProductTotalGrowthRate + ], + "merchantCountInfo" => [ + "todayMerchantCount" => 1, + "yestertodayMerchantCount" => 1, + "weeklyMerchantGrowthRate" => 0 + ] + ]; + return $data; + } + + public static function sales($store_id){ + $select=StoreBranchProduct::where('store_id',$store_id)->limit(10)->order('sales desc')->field('id,store_name,image,sales')->select(); + return $select?->toArray(); + } +} diff --git a/app/statistics/logic/UserLogic.php b/app/statistics/logic/UserLogic.php new file mode 100644 index 000000000..5c34dc12f --- /dev/null +++ b/app/statistics/logic/UserLogic.php @@ -0,0 +1,33 @@ +$date) { + $data[$k]['newUserCount']=UserRecharge::whereDay('create_time', $date)->where('store_id',$store_id)->where('paid',1)->where('recharge_type','INDUSTRYMEMBERS')->count(); + $data[$k]['viewUserCount']=StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->group('uid')->count(); + $data[$k]['totalUserCount']=UserRecharge::where('create_time','<',strtotime($date) )->where('store_id',$store_id)->where('paid',1)->where('recharge_type','INDUSTRYMEMBERS')->count(); + } + return $data; + } + public static function TradeCount($store_id,$dates) + { + $data = []; + foreach ($dates as $k=>$date) { + $data[$k]['date']=$date; + $data[$k]['visitUser']=StoreVisit::whereDay('create_time', $date)->where('store_id',$store_id)->cache('statistics_store_visit_count_' . $date, 300)->group('uid')->count(); + $data[$k]['orderUser']=StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->cache('statistics_store_order_count_' . $date, 300)->group('uid')->count(); + $data[$k]['payOrderUser']=StoreOrder::whereDay('create_time', $date)->where('store_id',$store_id)->where('paid',1)->cache('statistics_store_order_pay_count_' . $date, 300)->group('uid')->count(); + } + return $data; + } +} diff --git a/config/middleware.php b/config/middleware.php index 6bc9bfc97..f2a5297fd 100644 --- a/config/middleware.php +++ b/config/middleware.php @@ -38,5 +38,10 @@ return [ app\store\middleware\InitMiddleware::class, app\store\middleware\LoginMiddleware::class, // app\store\middleware\AuthMiddleware::class, - ] + ], + 'statistics' => [ + // 跨域中间件 + app\common\http\middleware\AdminAllowMiddleware::class, + + ], ]; From a9e418ba8dace86f9ee3b91a0979769c247300be Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 18:15:17 +0800 Subject: [PATCH 130/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=BAvip1=E7=9A=84=E6=97=B6=E5=80=99=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 38ce2fe1d..e95c756ae 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -128,7 +128,11 @@ class OrderLogic extends BaseLogic self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + if ($user && $user['user_ship'] == 1) { + $pay_price = self::$pay_price; + }else{ + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + } $vipPrice = 0; //成本价 收益 From 3a789a37267dcad33bdd10e1015805829137ae7c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 18 Jun 2024 18:17:39 +0800 Subject: [PATCH 131/145] =?UTF-8?q?feat(IndexController):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=95=86=E5=BA=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index c3014c879..5ccf27950 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -7,6 +7,7 @@ use app\admin\validate\tools\GenerateTableValidate; use app\admin\logic\tools\GeneratorLogic; use app\common\logic\store_order\StoreOrderLogic; use app\common\model\store_branch_product\StoreBranchProduct; +use app\common\model\system_store\SystemStore; use app\common\service\pay\PayService; use app\common\service\wechat\WechatTemplate; use Exception; @@ -22,7 +23,7 @@ use Webman\RedisQueue\Redis; class IndexController extends BaseApiController { - public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street','village','brigade','config']; + public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config']; public function index() { @@ -173,7 +174,7 @@ class IndexController extends BaseApiController $list = Db::name('geo_village')->where('street_code', $area_code)->select()?->toArray(); return $this->success('ok', $list); } - /** + /** * @notes 获取队列表 */ public function brigade() @@ -182,14 +183,16 @@ class IndexController extends BaseApiController return $this->success('ok', $list); } - /** + /** * @notes 获取队列表 */ public function config() { - $list=[ - 'id'=>5, - 'store_name'=>'测试', + $store_id = getenv('STORE_ID') ?? 1; + $find = SystemStore::where('id', $store_id)->find(); + $list = [ + 'id' => $find['id'], + 'store_name' => $find['name'], ]; return $this->success('ok', $list); } From ea4e67a38feef66fbd303caff913d46eb5cb55df Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 18:25:08 +0800 Subject: [PATCH 132/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91=E5=92=8C=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 18 +++++++++++++++--- .../logic/store_order/StoreOrderLogic.php | 7 +++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 748971e67..d9041617f 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -306,13 +306,24 @@ class PayNotifyLogic extends BaseLogic if ($order['uid'] > 0) { // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 - $vipFrozenAmount = self::dealFrozenPrice($order['id']); - $order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2); //用户下单该用户等级为1得时候才处理冻结金额 $user = User::where('id', $order['uid'])->find(); - if ($user['user_ship'] == 1) { + + //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 + if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) { + $oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds'); + if ($oldUser < $order['pay_price']) { + $order['pay_price'] = $oldUser; + } + }elseif ($user['user_ship'] == 1){ + $vipFrozenAmount = self::dealFrozenPrice($order['id']); + //为1的时候要去减活动价 + $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); + $order['pay_price'] = bcsub($final_price,$vipFrozenAmount,2); self::dealVipAmount($order, $order['pay_type']); } + + $user_number = bcmul($order['pay_price'], '0.10', 2); $sing = [ 'uid' => $order['uid'], @@ -325,6 +336,7 @@ class PayNotifyLogic extends BaseLogic User::where('id', $order['uid'])->inc('integral', $user_number)->update(); } + $financeLogic->order = $order; $financeLogic->user = ['uid' => $order['uid']]; // if ($order->pay_type != 9 || $order->pay_type != 10) { diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 00f2c5150..851180901 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -110,8 +110,11 @@ class StoreOrderLogic extends BaseLogic self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - - $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + if ($user && $user['user_ship'] == 1) { + $pay_price = self::$pay_price; + }else{ + $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + } $vipPrice = 0; //成本价 收益 From 2e64e57488650cda9d2e5f5e8bffcf355b72c247 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 18:38:42 +0800 Subject: [PATCH 133/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index d9041617f..30355e8a4 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -78,6 +78,12 @@ class PayNotifyLogic extends BaseLogic $user->now_money = bcsub($user['now_money'], $order['pay_price'], 2); $user->save(); + if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) { + $oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds'); + if ($oldUser < $order['pay_price']) { + $order['pay_price'] = $oldUser; + } + } $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); // self::afterPay($order); From f27eb18340755d83bfde9fca4f420dbe78eb3230 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 18 Jun 2024 19:06:24 +0800 Subject: [PATCH 134/145] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A4=9A=E6=89=A3?= =?UTF-8?q?=E8=B4=B9=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 30355e8a4..ec383da9b 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -324,12 +324,12 @@ class PayNotifyLogic extends BaseLogic }elseif ($user['user_ship'] == 1){ $vipFrozenAmount = self::dealFrozenPrice($order['id']); //为1的时候要去减活动价 - $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); - $order['pay_price'] = bcsub($final_price,$vipFrozenAmount,2); +// $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); +// d($final_price,$vipFrozenAmount); + $order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2); self::dealVipAmount($order, $order['pay_type']); } - $user_number = bcmul($order['pay_price'], '0.10', 2); $sing = [ 'uid' => $order['uid'], From d0b0dbb3b3cee23a174903ebb6fc2d923d2c4d34 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 19 Jun 2024 09:39:48 +0800 Subject: [PATCH 135/145] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=A0=87=E9=A2=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/statistics/controller/IndexController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php index a28a407b1..040fc8193 100644 --- a/app/statistics/controller/IndexController.php +++ b/app/statistics/controller/IndexController.php @@ -17,7 +17,7 @@ class IndexController extends BaseLikeController if (OrderLogic::hasError()) { return $this->fail(OrderLogic::getError()); //获取错误信息并返回错误信息 } - return $this->success('ok', ['dayPayPrice' => $res]); + return $this->success('ok', ['dayPayPrice' => $res,'title'=>'喻寺镇农(特)产品交易大数据']); } public function user() { From b1e1e39164dbb2e54b7205d0baf76faaeab3527e Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 10:07:26 +0800 Subject: [PATCH 136/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=90=8E=E7=94=A8=E6=88=B7=E7=9A=84=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/CapitalFlowLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php index d2c7ab918..1b6aea9ba 100644 --- a/app/common/logic/CapitalFlowLogic.php +++ b/app/common/logic/CapitalFlowLogic.php @@ -57,7 +57,7 @@ class CapitalFlowLogic extends BaseLogic * @param $mark * @return mixed */ - public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0,) + public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0) { $model = new CapitalFlow(); $model->uid = $this->user['id']; diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index ec383da9b..0502a2d61 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -314,12 +314,13 @@ class PayNotifyLogic extends BaseLogic // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 //用户下单该用户等级为1得时候才处理冻结金额 $user = User::where('id', $order['uid'])->find(); - //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 - if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) { - $oldUser = User::where('id',$order['spread_uid'])->value('purchase_funds'); - if ($oldUser < $order['pay_price']) { - $order['pay_price'] = $oldUser; + if ($order['spread_uid'] > 0) { + $oldUser = User::where('id',$order['spread_uid'])->field('purchase_funds,user_ship')->find(); + if ($oldUser && $oldUser['user_ship'] == 1){ + if ($oldUser['purchase_funds'] < $order['pay_price']) { + $order['pay_price'] = $oldUser['purchase_funds']; + } } }elseif ($user['user_ship'] == 1){ $vipFrozenAmount = self::dealFrozenPrice($order['id']); From 17a6b57673fa161d1393bcdc6b9fb7b44ea93e5d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 10:24:11 +0800 Subject: [PATCH 137/145] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E6=B6=A6=E9=80=BB=E8=BE=91=E5=8F=AA=E6=9C=89=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=8C=89=E7=85=A7=E9=87=87=E8=B4=AD=E6=AC=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=8B=86=E5=88=86,=E5=85=B6=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E5=88=86=E6=B6=A6=E8=BF=98=E6=98=AF=E6=8C=89=E7=85=A7=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 0502a2d61..9b9a76d7b 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -309,20 +309,21 @@ class PayNotifyLogic extends BaseLogic { $financeLogic = new StoreFinanceFlowLogic(); $user_sing = new UserSign(); - + $vipFen = 0; if ($order['uid'] > 0) { // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 //用户下单该用户等级为1得时候才处理冻结金额 $user = User::where('id', $order['uid'])->find(); - //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 + //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 (只有会员按照这个逻辑拆分,其余的还是按照正常的支付金额) if ($order['spread_uid'] > 0) { $oldUser = User::where('id',$order['spread_uid'])->field('purchase_funds,user_ship')->find(); if ($oldUser && $oldUser['user_ship'] == 1){ if ($oldUser['purchase_funds'] < $order['pay_price']) { - $order['pay_price'] = $oldUser['purchase_funds']; + $vipFen = $oldUser['purchase_funds']; } } - }elseif ($user['user_ship'] == 1){ + } + elseif ($user['user_ship'] == 1){ $vipFrozenAmount = self::dealFrozenPrice($order['id']); //为1的时候要去减活动价 // $final_price = bcsub($order['pay_price'],$order['deduction_price'],2); @@ -387,7 +388,11 @@ class PayNotifyLogic extends BaseLogic // if ($order['is_vip'] >= 1) { if ($order['spread_uid'] > 0) { $financeLogic->other_arr['vip_uid'] = $order['spread_uid']; - $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); + if($vipFen){ + $fees = bcdiv(bcmul($vipFen, '0.08', 2), 1, 2); + }else{ + $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2); + } $count_frees = bcadd($count_frees, $fees, 2); if ($fees > 0) { User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update(); From 5b01a6ab491d38c9fb84ba3bfaf1f4373b4a4410 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 10:56:52 +0800 Subject: [PATCH 138/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=E7=9A=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/store_order/StoreOrderLists.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php index 12f7c7208..3c86ba983 100644 --- a/app/store/lists/store_order/StoreOrderLists.php +++ b/app/store/lists/store_order/StoreOrderLists.php @@ -46,13 +46,13 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - $store_id = $this->adminInfo['store_id']; + $store_id = $this->adminInfo['store_id']??5; $this->searchWhere[] = ['store_id' ,'=',$store_id]; $is_sashier=$this->request->get('is_sashier'); if($is_sashier==1){//收银台订单 - $this->searchWhere[] = ['pay_type','in',[17,9,13]]; + $this->searchWhere[] = ['pay_type','in',[17,9,13,18]]; }elseif($is_sashier==2){//小程序订单 - $this->searchWhere[] = ['pay_type','in',[7,3]]; + $this->searchWhere[] = ['pay_type','in',[7,3,18]]; } return StoreOrder::where($this->searchWhere) ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid']) From 4112b6ffe3e4560d9bbda59c4443d59802a8d0c7 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 11:23:54 +0800 Subject: [PATCH 139/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B6=E9=93=B6=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/store_order/StoreOrderLogic.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 851180901..972e4ebeb 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -112,8 +112,10 @@ class StoreOrderLogic extends BaseLogic } if ($user && $user['user_ship'] == 1) { $pay_price = self::$pay_price; + $activity_string = ''; }else{ $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $activity_string = '减免'; } $vipPrice = 0; @@ -132,7 +134,7 @@ class StoreOrderLogic extends BaseLogic 'cart_id' => implode(',', $cartId), 'store_id' => $params['store_id'] ?? 0, 'shipping_type' =>3,//配送方式 1=快递 ，2=门店自提 - 'activity' =>'减免', + 'activity' =>$activity_string, 'activity_price' =>self::$activity_price,//活动优惠价 'activities' => self::$activity_price>0?1:0, 'default_delivery'=>1, From 204498937f3f2f7b11947cfcf6b24d3dea30e489 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 19 Jun 2024 11:56:47 +0800 Subject: [PATCH 140/145] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/user/UserLists.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index e410ceec3..0a888bef6 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -21,7 +21,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['id'], + '=' => ['id','user_ship'], '%like%' => ['mobile'], ]; } From 8ac8d073f62e42e5d6405b8e6ddf5a03052a9ee5 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 13:52:15 +0800 Subject: [PATCH 141/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E5=8F=B0=E9=87=87=E8=B4=AD=E6=AC=BE=E6=94=AF=E4=BB=98=E5=90=8E?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=A0=B8=E9=94=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 12 +++++++++++- .../controller/store_order/StoreOrderController.php | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 9b9a76d7b..a7aa59456 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\api\logic\order\OrderLogic; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; use app\common\enum\user\UserShipEnum; @@ -124,6 +125,15 @@ class PayNotifyLogic extends BaseLogic self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } + if($extra && $extra['store_id']){ + $params = [ + 'verify_code'=>$order['verify_code'], + 'store_id'=>$extra['store_id'], + 'staff_id'=>$extra['staff_id'] + ]; + OrderLogic::writeOff($params); + } + // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -252,10 +262,10 @@ class PayNotifyLogic extends BaseLogic $order->paid = 1; $order->pay_time = time(); $order->status = 2; - self::afterPay($order); if (!$order->save()) { throw new \Exception('订单保存出错'); } + self::afterPay($order); $cashFlowLogic = new CashFlowLogic(); $cashFlowLogic->insert($order['store_id'], $order['pay_price']); // Redis::send('push-platform-print', ['id' => $order['id']]); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 70d8173e4..e69c4f048 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -146,7 +146,10 @@ class StoreOrderController extends BaseAdminController switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 - PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $uid]); + PayNotifyLogic::handle('purchase_funds', $order['order_id'], [ + 'uid' => $uid,'store_id'=>$this->request->adminInfo['store_id'], + 'staff_id'=>$this->request->adminInfo['admin_id'] + ]); return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: From 14d0f838fd80fa403462caf0e8caa54ce9dc8735 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 14:19:44 +0800 Subject: [PATCH 142/145] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BA=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A71=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 3 ++- app/common/logic/store_order/StoreOrderLogic.php | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index e95c756ae..dcfa9efab 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -84,12 +84,13 @@ class OrderLogic extends BaseLogic $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - + $cart_select[$k]['vip'] = 0; if ($user && $user['user_ship'] == 1) { //更新 会员为1的时候原价减去会员价 $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + $cart_select[$k]['vip'] =1; } if ($user && $user['user_ship'] == 4) { //更新 为4商户的时候减去商户价格 diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 972e4ebeb..b5e6bf98c 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -61,12 +61,13 @@ class StoreOrderLogic extends BaseLogic $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - + $cart_select[$k]['vip'] = 0; if ($user && $user['user_ship'] == 1) { //更新 会员为1的时候原价减去会员价 $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + $cart_select[$k]['vip'] =1; } if ($user && $user['user_ship'] == 4) { @@ -223,6 +224,12 @@ class StoreOrderLogic extends BaseLogic $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? ''; $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? ''; + $detail =StoreOrderCartInfo::where('oid',$order['id'])->find()->toArray(); + $vip =0; + if(isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1){ + $vip = 1; + } + $order['vip'] = $vip; return $order->toArray(); } From 149d818157726294f193945759381b200e3a67a7 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 16:21:33 +0800 Subject: [PATCH 143/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E7=9A=84=E8=B4=A6=E5=8D=95=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store_finance_flow/StoreFinanceFlowLists.php | 1 + .../controller/finance/StoreBillController.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 3dedf3c5a..fd996b83b 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -33,6 +33,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt return [ '=' => ['store_id', 'user_id', 'create_time', 'staff_id'], 'between_time'=>'create_time', + '%pipe_like%' => ['keyword'=>'order_sn'], ]; } diff --git a/app/store/controller/finance/StoreBillController.php b/app/store/controller/finance/StoreBillController.php index 50c7fb34c..cbd7bc6be 100644 --- a/app/store/controller/finance/StoreBillController.php +++ b/app/store/controller/finance/StoreBillController.php @@ -2,7 +2,10 @@ namespace app\store\controller\finance; +use app\admin\lists\store_finance_flow\StoreFinanceFlowDayLists; use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowMonthLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowWeekLists; use app\common\controller\Definitions; use app\common\lists\StoreBillLists; use app\store\controller\BaseAdminController; @@ -27,7 +30,15 @@ class StoreBillController extends BaseAdminController // ] public function lists() { - return $this->dataLists(new StoreBillLists()); + $type = $this->request->get('type'); + if($type == 1){ + return $this->dataLists(new StoreFinanceFlowDayLists()); + }else if($type == 2){ + return $this->dataLists(new StoreFinanceFlowWeekLists()); + }else{ + return $this->dataLists(new StoreFinanceFlowMonthLists()); + } +// return $this->dataLists(new StoreBillLists()); } // #[ From 7981e126f370b09ffe56443740a436aeb07067e2 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 16:58:38 +0800 Subject: [PATCH 144/145] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E6=9C=BA=E5=88=86=E7=B1=BB=E9=80=BB=E8=BE=91=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/store_branch_product/StoreBranchProductLists.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index cce4193a4..c5b70125e 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -57,6 +57,11 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI $where[]=['cate_id','in',array_merge($arr,$arr2)]; } } + if(empty($where) && $class_all){ + //2或者1 + $where[]=['cate_id','=',$class_all]; + } + return StoreBranchProduct::where($this->searchWhere)->where($where) ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status']) ->when(!empty($this->adminInfo['store_id']), function ($query) { From 69ed8b332d24b81966b0f362b93f783fc1e39c82 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 17:05:37 +0800 Subject: [PATCH 145/145] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E5=BE=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_product/StoreProductLogic.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index cfd50ef30..6aee0d22b 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -154,7 +154,8 @@ class StoreProductLogic extends BaseLogic ]; StoreProduct::where('id', $params['id'])->update($data); - $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') + + /*$old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') ->select(); // 获取分类ID foreach ($old_cate as $vv) { @@ -169,13 +170,13 @@ class StoreProductLogic extends BaseLogic //新增对应的分类 self::updateGoodsclass($params['cate_id'], $value['store_id']); } - } + }*/ //修改 StoreBranchProduct::where('product_id', $params['id'])->update([ 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], 'cate_id' => $params['cate_id'], + 'cost' => $params['cost'], 'batch'=>$params['batch'],'store_name'=>$params['store_name'] ]);