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
0b41a8b0
Commit
0b41a8b0
authored
Oct 22, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
店铺问题
parent
ee8528af
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
ApiConst.php
application/library/Our/ApiConst.php
+1
-1
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+4
-5
No files found.
application/library/Our/ApiConst.php
View file @
0b41a8b0
...
...
@@ -63,7 +63,7 @@ class ApiConst
const
cannotSendMsg
=-
1
;
const
canSendMsg
=
1
;
const
defaultIntervalTime
=
20
00
;
const
defaultIntervalTime
=
15
00
;
const
getExpressSuccess
=
0
;
...
...
application/models/Business/Goods/GoodsClassService.php
View file @
0b41a8b0
...
...
@@ -192,7 +192,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$inAreaFlag
=
\Our\CommonExtension
::
locationInArea
(
$lat
,
$lng
,
$signClass
[
'sign_scope'
]);
//判断签约分类是否可以为当前用户提供服务,并且记录这些店铺对应的store_id
if
(
$inAreaFlag
){
$store
=
$storeDao
->
get
(
$signClass
[
'store_id'
],
false
);
$store
=
$storeDao
->
get
StoreInfoCache
(
$signClass
[
'store_id'
]
);
$class_distance
=
\Our\CommonExtension
::
getDistance
(
$lat
,
$lng
,
$store
[
'store_latitude'
],
$signClass
[
'store_latitude'
],
1
);
$class
=
$signClass
;
$class
[
'class_distance'
]
=
$class_distance
;
...
...
@@ -364,12 +364,11 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$adv
[
'isSwiper'
]
=
\Our\ApiConst
::
zero
;
$adv
[
'intervalTime'
]
=
\Our\ApiConst
::
zero
;
if
(
isset
(
$goodsClassImage
[
'gc_images_name'
])
&&
$goodsClassImage
[
'gc_images_name'
]){
$
adv
[
'intervalTime'
]
=
\Our\ApiConst
::
defaultIntervalTime
;
if
(
$goodsClassImage
[
'interval_time'
]
&&
$goodsClassImage
[
'is_images'
]
==
1
){
$
classImage
=
unserialize
(
$goodsClassImage
[
'gc_images_name'
])
;
if
(
count
(
$classImage
)
>
1
){
$adv
[
'isSwiper'
]
=
\Our\ApiConst
::
one
;
$adv
[
'intervalTime'
]
=
$goodsClassImage
[
'interval_time'
]
;
$adv
[
'intervalTime'
]
=
\Our\ApiConst
::
defaultIntervalTime
;
}
$classImage
=
unserialize
(
$goodsClassImage
[
'gc_images_name'
]);
foreach
(
$classImage
as
&
$val
){
$val
[
'image'
]
=
\Our\Common
::
getStaticFile
(
$val
[
'image'
],
\Our\ImageConst
::
storeClassAdvImagePrefix
);
}
...
...
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