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
66f7ff76
Commit
66f7ff76
authored
Aug 27, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image
parent
2ce93bc2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ImageUtil.php
application/library/Our/ImageUtil.php
+1
-1
CouponService.php
application/models/Business/Coupon/CouponService.php
+1
-1
No files found.
application/library/Our/ImageUtil.php
View file @
66f7ff76
...
@@ -129,7 +129,7 @@ class ImageUtil {
...
@@ -129,7 +129,7 @@ class ImageUtil {
//$goodsImg .= '?x-oss-process=image/resize,m_pad,h_226,w_334';
//$goodsImg .= '?x-oss-process=image/resize,m_pad,h_226,w_334';
}
}
$goodsImg
=
\Our\Common
::
getStaticFile
(
$goodsImg
,
$directory
);
$goodsImg
=
\Our\Common
::
getStaticFile
(
$goodsImg
,
$directory
);
$goodsImg
.=
'?x-oss-process=image/resize,m_
pa
d,h_226,w_334'
;
$goodsImg
.=
'?x-oss-process=image/resize,m_
fixe
d,h_226,w_334'
;
return
$goodsImg
;
return
$goodsImg
;
}
}
...
...
application/models/Business/Coupon/CouponService.php
View file @
66f7ff76
...
@@ -90,7 +90,7 @@ class CouponServiceModel extends \Business\AbstractModel{
...
@@ -90,7 +90,7 @@ class CouponServiceModel extends \Business\AbstractModel{
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyCouponId
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyCouponId
);
}
}
$coupon
=
$couponDao
->
findById
(
$where
[
'couponId'
]);
$coupon
=
$couponDao
->
findById
(
$where
[
'couponId'
]);
if
(
!
$coupon
){
if
(
!
$coupon
||
$coupon
[
'is_del'
]
==
1
||
time
()
>
$coupon
[
'end_time'
]
||
time
()
<
$coupon
[
'start_time'
]
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
couponNotExist
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
couponNotExist
);
}
}
$orderAmount
=
intval
(
$coupon
[
'order_amount'
]);
$orderAmount
=
intval
(
$coupon
[
'order_amount'
]);
...
...
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