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
4c1e70b5
Commit
4c1e70b5
authored
Sep 12, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
footprint
parent
7fb88b0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+1
-1
FootprintService.php
application/models/Business/User/FootprintService.php
+4
-2
No files found.
application/models/Business/Goods/GoodsCommonService.php
View file @
4c1e70b5
...
...
@@ -333,7 +333,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$productData
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db4\GoodsAttributeRedisModel
::
getInstance
(),
array
(
&
$attrbuteDAO
,
'option'
),
array
(
'attribute,attribute_value'
,
array
(
'goods_commonid'
=>
$goodsCommonId
)),
\Our\ApiConst
::
oneDaySecond
,
array
(
$goodsCommonId
));
$html
=
array
(
'width'
=>
750
,
'height'
=>
$commonInfo
[
'goods_height'
],
'url'
=>
\Our\Common
::
getBaseUrl
()
.
'/index/goodsDetail?goodsCommonId='
.
$goodsCommonId
);
if
(
$commonInfo
[
'is_del'
]
==
1
)
$commonInfo
[
'goods_state'
]
=
=
0
;
if
(
$commonInfo
[
'is_del'
]
==
1
)
$commonInfo
[
'goods_state'
]
=
0
;
unset
(
$attrs
[
'commonInfo'
]);
return
array_merge
(
array
(
'storeId'
=>
$commonInfo
[
'store_id'
],
'goodsId'
=>
$commonInfo
[
'goodsId'
],
'goodsName'
=>
$commonInfo
[
'goods_name'
],
'goodsVerify'
=>
$commonInfo
[
'goods_verify'
],
'goodsState'
=>
$commonInfo
[
'goods_state'
],
'saleCount'
=>
$commonInfo
[
'sale_num'
],
'collectionState'
=>
$collectionState
,
'isOwn'
=>
$isOwn
,
'isHot'
=>
$commonInfo
[
'goods_hot'
],
'isRecoment'
=>
$commonInfo
[
'goods_commend'
],
'isFree'
=>
$commonInfo
[
'goods_free'
],
'isVirtual'
=>
$commonInfo
[
'is_virtual'
],
'goodsMostLimit'
=>
$commonInfo
[
'goods_most_limit'
],
'goodsLeastLimit'
=>
$commonInfo
[
'goods_least_limit'
],
'goodsTotalLimit'
=>
$commonInfo
[
'goods_total_limit'
],
'address'
=>
$area
,
'range'
=>
$rangePrice
,
'productData'
=>
$productData
,
'htmlContent'
=>
$html
,
'videoUrl'
=>
$commonInfo
[
'goods_youku_url'
]),
$attrs
);
}
...
...
application/models/Business/User/FootprintService.php
View file @
4c1e70b5
...
...
@@ -17,8 +17,10 @@ class FootprintServiceModel extends \Business\AbstractModel
* @param $memberId
*/
public
function
getDate
(
$param
,
$memberId
){
$month
=
isset
(
$param
[
'month'
])
?
(
int
)
$param
[
'month'
]
:
date
(
'm'
);
$year
=
isset
(
$param
[
'year'
])
?
(
int
)
$param
[
'year'
]
:
date
(
'Y'
);
// $month = isset($param['month']) ? (int)$param['month'] : date('m');
// $year = isset($param['year']) ? (int)$param['year'] : date('Y');
$month
=
date
(
'm'
);
$year
=
date
(
'Y'
);
$sort
=
isset
(
$param
[
'sort'
])
?
(
int
)
$param
[
'sort'
]
:
1
;
$sort
==
1
?
$order
=
[
'browsedate'
,
'ASC'
]
:
$order
=
[
'browsedate'
,
'DESC'
];
$startTime
=
mktime
(
0
,
0
,
0
,
$month
-
2
,
1
,
$year
);
...
...
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