Commit 66f7ff76 authored by zhz's avatar zhz

image

parent 2ce93bc2
...@@ -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_pad,h_226,w_334'; $goodsImg .= '?x-oss-process=image/resize,m_fixed,h_226,w_334';
return $goodsImg; return $goodsImg;
} }
......
...@@ -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']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment