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
b830fbf5
Commit
b830fbf5
authored
Nov 15, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
share
parent
c2a31271
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
ApiConst.php
application/library/Our/ApiConst.php
+1
-0
PathConst.php
application/library/Our/PathConst.php
+2
-0
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+0
-1
ShareService.php
application/models/Business/User/ShareService.php
+9
-2
No files found.
application/library/Our/ApiConst.php
View file @
b830fbf5
...
...
@@ -391,6 +391,7 @@ class ApiConst
const
sharePlat
=
1
;
//平台
const
shareStore
=
2
;
//店铺
const
shareGoods
=
3
;
//商品
const
shareSaler
=
4
;
//销售员分享
const
wxAppPayType
=
1
;
//APP微信支付
const
aliPayType
=
2
;
//APP支付宝支付
...
...
application/library/Our/PathConst.php
View file @
b830fbf5
...
...
@@ -25,6 +25,8 @@ class PathConst {
const
sharePlat
=
"http://www.shenbd.com"
;
const
shareStore
=
"http://share.shenbd.com/share.html?type=store&id=
{
0
}
"
;
const
timeParam
=
'¶m='
.
TIMESTAMP
;
const
cutVertical
=
'|'
;
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
b830fbf5
...
...
@@ -281,7 +281,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$goodsDao
=
\DAO\GoodsModel
::
getInstance
();
$orderCommonDao
=
\DAO\Order\OrderCommonModel
::
getInstance
();
$returnData
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'getList'
),
array
(
$where
,
$orderDao
->
getOrderDetailField
(),
$pageIndex
,
$pageSize
,
$order
,
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
)));
//$returnData = $orderDao->getOrders($where, $this->orderListField, $pageIndex, $pageSize);
$orders
=
$returnData
[
'list'
];
if
(
!
empty
(
$orders
))
{
$orderIds
=
array_column
(
$orders
,
'orderId'
);
...
...
application/models/Business/User/ShareService.php
View file @
b830fbf5
...
...
@@ -35,7 +35,7 @@ class ShareServiceModel extends \Business\AbstractModel
$driverType
=
\Our\Common
::
getDriverType
();
$data
[
'driverType'
]
=
$driverType
;
$data
[
'qrCode'
]
=
$this
->
growQrcode
(
$data
);
if
(
$data
[
'type'
]
==
ApiConst
::
shareStore
){
if
(
$data
[
'type'
]
==
ApiConst
::
shareStore
&&
$data
[
'type'
]
==
ApiConst
::
shareSaler
){
$storeDao
=
\DAO\StoreModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$data
[
'address'
]
=
$storeDao
->
getAddress
(
$data
[
'id'
]);
}
...
...
@@ -66,6 +66,10 @@ class ShareServiceModel extends \Business\AbstractModel
));
return
$res
;
}
public
function
getQrUrl
(
$id
){
return
Common
::
format
(
PathConst
::
shareStore
,
$id
);
}
public
function
growQrcode
(
$data
){
$this
->
memberDb0Redis
=
\Redis\Db0\MemberRedisModel
::
getInstance
();
if
(
$data
[
'type'
]
==
\Our\ApiConst
::
shareStore
){
...
...
@@ -107,12 +111,15 @@ class ShareServiceModel extends \Business\AbstractModel
}
else
{
//不是微信分享就是普通下载的二维码图片
return
$this
->
getQrUrl
(
$data
[
'id'
]);
//
return PathConst::downLoadQrcode;
//
return PathConst::downLoadQrcode;
}
}
if
(
$data
[
'type'
]
==
\Our\ApiConst
::
sharePlat
){
return
PathConst
::
sharePlat
;
}
if
(
$data
[
'type'
]
==
\Our\ApiConst
::
shareSaler
){
return
$data
[
'qrCode'
];
}
}
public
function
excuteCommand
(
$key
){
$command
=
\Bootstrap
::
getUrlIniConfig
(
"convert"
);
...
...
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