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
b55e35fd
Commit
b55e35fd
authored
Dec 06, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券领取bug修复
parent
d0125c61
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
CouponService.php
application/models/Business/Coupon/CouponService.php
+1
-1
application.ini
conf/application.ini
+4
-4
No files found.
application/models/Business/Coupon/CouponService.php
View file @
b55e35fd
...
@@ -267,7 +267,7 @@ class CouponServiceModel extends \Business\AbstractModel{
...
@@ -267,7 +267,7 @@ class CouponServiceModel extends \Business\AbstractModel{
}
}
$memberCouponDao
=
\DAO\Coupon\MemberCouponModel
::
getInstance
(
$dbName
);
$memberCouponDao
=
\DAO\Coupon\MemberCouponModel
::
getInstance
(
$dbName
);
if
(
$coupon
[
'is_overlay'
]){
//允许领用多张的优惠券是否存在已经领取的未使用有效优惠券
if
(
$coupon
[
'is_overlay'
]){
//允许领用多张的优惠券是否存在已经领取的未使用有效优惠券
$whereSql
=
' coupon_state = '
.
\Our\ApiConst
::
couponUnused
.
' member_id ='
.
$memberId
.
' and coupon_id='
.
$coupon
[
'id'
]
.
' and out_time > '
.
time
();
$whereSql
=
' coupon_state = '
.
\Our\ApiConst
::
couponUnused
.
'
and
member_id ='
.
$memberId
.
' and coupon_id='
.
$coupon
[
'id'
]
.
' and out_time > '
.
time
();
//$memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array($whereSql),\Our\ApiConst::oneHour,array($where['couponId']));
//$memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array($whereSql),\Our\ApiConst::oneHour,array($where['couponId']));
$memberCoupons
=
$memberCouponDao
->
getList
(
$whereSql
);
$memberCoupons
=
$memberCouponDao
->
getList
(
$whereSql
);
if
(
$memberCoupons
&&
count
(
$memberCoupons
)
>
\Our\ApiConst
::
zero
){
if
(
$memberCoupons
&&
count
(
$memberCoupons
)
>
\Our\ApiConst
::
zero
){
...
...
conf/application.ini
View file @
b55e35fd
...
@@ -399,12 +399,12 @@ elastic.master.host="192.168.1.201"
...
@@ -399,12 +399,12 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
elastic.master.scheme
=
"http"
;
[lyz : common]
[lyz
test
: common]
; 数据库配置
; 数据库配置
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"
...
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
...
@@ -414,7 +414,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"
...
@@ -446,7 +446,7 @@ elastic.master.host="192.168.1.201"
...
@@ -446,7 +446,7 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
elastic.master.scheme
=
"http"
;
[lyz
test
: common]
[lyz : common]
; 数据库配置
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"106.14.14.233"
resources.database.params.hostname
=
"106.14.14.233"
...
...
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