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
364482e5
Commit
364482e5
authored
Jan 11, 2019
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除推荐店铺距离排序
parent
b411b820
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+0
-1
StoreService.php
application/models/Business/Store/StoreService.php
+2
-3
application.ini
conf/application.ini
+2
-2
No files found.
application/models/Business/Goods/GoodsClassService.php
View file @
364482e5
...
@@ -220,7 +220,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
...
@@ -220,7 +220,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
if
(
!
(
$newStoreIds
&&
in_array
(
$signClass
[
'store_id'
],
$newStoreIds
))){
if
(
!
(
$newStoreIds
&&
in_array
(
$signClass
[
'store_id'
],
$newStoreIds
))){
$newStoreIds
[]
=
$signClass
[
'store_id'
];
$newStoreIds
[]
=
$signClass
[
'store_id'
];
}
}
}
}
}
}
foreach
(
$returnClass
as
$key
=>
$class
){
foreach
(
$returnClass
as
$key
=>
$class
){
...
...
application/models/Business/Store/StoreService.php
View file @
364482e5
...
@@ -826,7 +826,6 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -826,7 +826,6 @@ class StoreServiceModel extends \Business\AbstractModel{
//$expressStores = $this->getExpressStores($gcId,$condition);
//$expressStores = $this->getExpressStores($gcId,$condition);
$goodsClassList
=
$goodsClassDao
->
getOnlineSecondClassList
(
$gcId
);
$goodsClassList
=
$goodsClassDao
->
getOnlineSecondClassList
(
$gcId
);
if
(
$goodsClassList
){
if
(
$goodsClassList
){
foreach
(
$goodsClassList
as
$goodsClass
){
foreach
(
$goodsClassList
as
$goodsClass
){
$returnStores
=
array
();
$returnStores
=
array
();
...
@@ -863,7 +862,6 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -863,7 +862,6 @@ class StoreServiceModel extends \Business\AbstractModel{
$returnStores
[
'stores'
][]
=
$purchasedStore
;
$returnStores
[
'stores'
][]
=
$purchasedStore
;
}
}
}
}
if
(
$returnStores
[
'stores'
]){
if
(
$returnStores
[
'stores'
]){
foreach
(
$returnStores
[
'stores'
]
as
$key
=>
$tempStore
){
foreach
(
$returnStores
[
'stores'
]
as
$key
=>
$tempStore
){
$tempDistance
[
$key
]
=
$tempStore
[
'storeDistance'
];
$tempDistance
[
$key
]
=
$tempStore
[
'storeDistance'
];
...
@@ -873,13 +871,14 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -873,13 +871,14 @@ class StoreServiceModel extends \Business\AbstractModel{
}
}
}
}
if
(
$return
){
if
(
$return
){
/*var_dump(json_encode($return));
$tempReturn = array();
$tempReturn = array();
foreach($return as $tempVal){
foreach($return as $tempVal){
$distance = min(array_column($tempVal['stores'],'storeDistance'));
$distance = min(array_column($tempVal['stores'],'storeDistance'));
$tempReturn[$distance] = $tempVal;
$tempReturn[$distance] = $tempVal;
}
}
ksort($tempReturn);
ksort($tempReturn);
$return
=
array_values
(
$tempReturn
);
$return = array_values($tempReturn);
*/
return
$return
;
return
$return
;
}
}
}
}
...
...
conf/application.ini
View file @
364482e5
...
@@ -392,7 +392,7 @@ elastic.master.scheme="http";
...
@@ -392,7 +392,7 @@ elastic.master.scheme="http";
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.port
=
3306
resources.database.params.database
=
"
test
qmcs"
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"root"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
resources.database.params.charset
=
"UTF8"
...
@@ -402,7 +402,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
...
@@ -402,7 +402,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
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.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.charset
=
"UTF8"
...
...
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