Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
3968e722
Commit
3968e722
authored
Nov 29, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页接口
parent
092d1a1c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
19 deletions
+29
-19
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+7
-3
application.ini
conf/application.ini
+22
-16
No files found.
application/models/Business/Goods/GoodsClassService.php
View file @
3968e722
...
...
@@ -189,7 +189,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$signStoreClasses
=
$this
->
getSignClassesByCityCode
(
$cityCode
);
//var_dump($signStoreClasses);
if
(
$signStoreClasses
){
$storeIds
=
array_unique
(
array_column
(
$signStoreClasses
,
'store_id'
));
$tempStoreList
=
$storeDao
->
getNearbyStores
(
$cityCode
,
$storeIds
);
...
...
@@ -209,14 +209,18 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$class_distance
=
\Our\CommonExtension
::
getDistance
(
$lat
,
$lng
,
$store
[
'store_latitude'
],
$store
[
'store_latitude'
],
1
);
$class
=
$signClass
;
$class
[
'class_distance'
]
=
$class_distance
;
$returnClass
[
$class_distance
]
=
$class
;
$returnClass
[]
=
$class
;
if
(
!
(
$newStoreIds
&&
in_array
(
$signClass
[
'store_id'
],
$newStoreIds
))){
$newStoreIds
[]
=
$signClass
[
'store_id'
];
}
}
}
ksort
(
$returnClass
);
foreach
(
$returnClass
as
$key
=>
$class
){
$classDistance
[
$key
]
=
$class
[
'class_distance'
];
}
array_multisort
(
$classDistance
,
SORT_DESC
,
$returnClass
);
$signParentClassIds
=
array_unique
(
array_column
(
$returnClass
,
'gc_parent_id'
));
//$signStoreIds = array_unique(array_column($returnClass,'store_id'));
...
...
conf/application.ini
View file @
3968e722
...
...
@@ -404,7 +404,7 @@ elastic.master.scheme="http";
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.database
=
"
test
qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
...
...
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
...
...
@@ -449,49 +449,55 @@ elastic.master.scheme="http";
[lyztest : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"1
27.0.0.1
"
resources.database.params.hostname
=
"1
06.14.14.233
"
resources.database.params.port
=
3306
resources.database.params.database
=
"
test
qmcs"
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"
123456
"
resources.database.params.password
=
"
!@#$%12345werty
"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"1
27.0.0.1
"
resources.database.slave.params.hostname
=
"1
06.14.14.233
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"
123456
"
resources.database.slave.params.password
=
"
!@#$%12345werty
"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
; mongodb
resources.database.mongo.params.driver
=
"scram"
resources.database.mongo.params.hostname
=
"106.14.14.233"
resources.database.mongo.params.port
=
27017
resources.database.mongo.params.database
=
"qmcs"
resources.database.mongo.params.username
=
"qmcs"
resources.database.mongo.params.password
=
"123456asdfgh"
resources.database.mongo.params.charset
=
"UTF8"
resources.database.mongo.params.driver_options.1002
=
"SET NAMES utf8"
redis.database.params.host
=
"127.0.0.1"
redis.database.params.port
=
"6379"
redis.database.params.prefix
=
"qm_"
;redis.database.params.password = "23456ertyu"
redis.database.params.password
=
"23456ertyu"
out.config
=
"/data/config"
out.config
=
"/data/config"
;
;锁文件
out.locks
=
"/data/locks"
;
; redis配置
;redis.database.params.password = "test"
;推送配置
push.clientHost
=
"ws://192.168.80.1
34
:9502"
push.host
=
"1
92.168.134.18
"
push.clientHost
=
"ws://192.168.80.1
8
:9502"
push.host
=
"1
27.0.0.1
"
push.port
=
"9503"
push.open
=
1
push.user.service.id
=
293
push.user.service.type
=
7
elastic.master.host
=
"192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
[linqing : common]
; 数据库配置
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment