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
c9b22e02
Commit
c9b22e02
authored
Nov 30, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
goods
parent
698d39cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Goods.php
application/controllers/Goods.php
+1
-1
Group.php
application/controllers/Group.php
+1
-1
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+2
-2
No files found.
application/controllers/Goods.php
View file @
c9b22e02
...
...
@@ -15,7 +15,7 @@ class GoodsController extends \Our\Controller_AbstractIndex {
public
function
getAction
(){
$address
=
\Business\User\AddressServiceModel
::
getInstance
()
->
getMyAddress
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
,
false
);
$goodsInfo
=
$this
->
goodsService
->
getCommonDetail
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
,
$address
);
$store
=
$this
->
goodsService
->
getStore
(
$goodsInfo
[
'storeId'
],
false
,
false
);
$store
=
$this
->
goodsService
->
getStore
(
$goodsInfo
[
'storeId'
],
false
);
$goodsInfo
[
'freeShippingPrice'
]
=
$store
[
'freeShippingPrice'
];
$goodsInfo
[
'isQuality'
]
=
$store
[
'isQuality'
];
$evaluation
=
$this
->
goodsService
->
getEvaluation
(
$this
->
req
[
\Our\NameConst
::
data
]);
...
...
application/controllers/Group.php
View file @
c9b22e02
...
...
@@ -23,7 +23,7 @@ class GroupController extends \Our\Controller_AbstractIndex {
$goods
=
$this
->
GroupSaleService
->
getGroupGoods
(
$this
->
req
[
\Our\NameConst
::
data
],
$address
);
// $data = $this->GroupSaleService->getOnePBundingCache($this->req[\Our\NameConst::data]['groupId']);
// $this->GroupSaleService->handleData($data);
$storeInfo
=
\Business\Goods\GoodsCommonServiceModel
::
getInstance
()
->
getStore
(
$goods
[
'store_id'
],
false
,
false
);
$storeInfo
=
\Business\Goods\GoodsCommonServiceModel
::
getInstance
()
->
getStore
(
$goods
[
'store_id'
],
false
);
unset
(
$storeInfo
[
'freeShippingPrice'
]);
unset
(
$storeInfo
[
'isQuality'
]);
unset
(
$storeInfo
[
'shareDesc'
]);
$otherGroups
=
\Business\Goods\GroupSaleServiceModel
::
getInstance
()
->
getOtherGroup
(
$goods
[
'store_id'
],
$this
->
req
[
\Our\NameConst
::
data
][
'groupId'
]);
\Business\Goods\GroupSaleServiceModel
::
getInstance
()
->
addBrowseRecord
(
$this
->
req
[
\Our\NameConst
::
data
],
$this
->
memberId
);
...
...
application/models/Business/Goods/GoodsCommonService.php
View file @
c9b22e02
...
...
@@ -744,8 +744,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
* @return array
* @throws \Our\Exception
*/
public
function
getStore
(
$storeId
,
$label
=
false
,
$reportError
=
false
){
$storeInfo
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$storeId
,
$label
,
$reportError
);
public
function
getStore
(
$storeId
,
$label
=
false
){
$storeInfo
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$storeId
,
$label
);
$commonInstance
=
\DAO\GoodsCommonModel
::
getInstance
();
$count
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db4\GoodsCommonRedisModel
::
getInstance
(),
array
(
&
$commonInstance
,
'getCount'
),
array
(
array
(
'store_id'
=>
$storeId
)),
\Our\ApiConst
::
oneDaySecond
);
...
...
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