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
0bcc5497
Commit
0bcc5497
authored
Oct 08, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
指定商品优惠券是否展示问题
parent
a4afcd05
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
2 deletions
+66
-2
Coupon.php
application/models/DAO/Coupon/Coupon.php
+1
-1
GoodsCommon.php
application/models/DAO/GoodsCommon.php
+3
-1
application.ini
conf/application.ini
+45
-0
url.ini
conf/url.ini
+17
-0
No files found.
application/models/DAO/Coupon/Coupon.php
View file @
0bcc5497
...
...
@@ -185,7 +185,7 @@ class CouponModel extends \DAO\AbstractModel {
}
}
if
(
$coupon
[
'type'
]
==
\Our\ApiConst
::
goodsCoupon
){
//指定商品优惠券,判断商品是否在线,在线才能展示
$goodsCommmonIds
=
array_filter
(
explode
(
','
,
$coupon
[
'
gift_goods_common
ids'
]));
$goodsCommmonIds
=
array_filter
(
explode
(
','
,
$coupon
[
'ids'
]));
if
(
!
$goodsCommmonIds
){
continue
;
}
...
...
application/models/DAO/GoodsCommon.php
View file @
0bcc5497
...
...
@@ -35,7 +35,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
if
(
is_array
(
$where
)){
$where
=
$this
->
db
->
getSqlWhereByArray
(
$where
);
}
return
$this
->
db
->
select
(
$field
)
->
from
(
$this
->
_tableName
)
->
where
(
$where
)
->
fetchOne
();
$result
=
$this
->
db
->
select
(
$field
)
->
from
(
$this
->
_tableName
)
->
where
(
$where
)
->
fetchOne
();
return
$result
;
}
...
...
conf/application.ini
View file @
0bcc5497
...
...
@@ -369,3 +369,48 @@ push.user.service.type=7
elastic.master.host
=
"192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[lyztest : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.database
=
"testqmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"testqmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
redis.database.params.host
=
"127.0.0.1"
redis.database.params.port
=
"6379"
redis.database.params.prefix
=
"qm_"
;redis.database.params.password = "23456ertyu"
out.config
=
"/data/config"
;
;锁文件
out.locks="/data/locks";
; redis配置
;redis.database.params.password = "test"
;推送配置
push.clientHost
=
"ws://192.168.80.134:9502"
push.host
=
"192.168.134.18"
push.port
=
"9503"
push.open
=
1
push.user.service.id
=
293
push.user.service.type
=
7
elastic.master.host
=
"192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http";
\ No newline at end of file
conf/url.ini
View file @
0bcc5497
...
...
@@ -151,3 +151,20 @@ config.url.convert="/usr/local/bin/wkhtmltoimage";
config.url.indexUrl="/www/local.qm.com/application/library/React"
config.url.libary
=
"/www/local.qm.com/application/library"
; 文件目录
[lyztest : common]
; url相关配置
config.url.resourcesHost
=
"http://local.qm.com"
; 用户中心host
config.url.userHost
=
""
; oss 域名
config.url.ossHost
=
"http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost
=
"127.0.0.1:9503"
;
config.url.convert
=
"/usr/local/bin/wkhtmltoimage"
;
config.url.indexUrl="/www/local.qm.com/application/library/React"
config.url.libary
=
"/www/local.qm.com/application/library"
\ No newline at end of file
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