Skip to content

M
my-yaf-project
Commit 44ad581d authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

优惠券标题问题

parent a9688f59
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 6 deletions
application/library/Our/DescribeConst.php
View file @ 44ad581d
......@@ -124,6 +124,8 @@ class DescribeConst
const couponTitleFullDiscount = '满{0}享{1}折';
const couponTitleFullForCoupon = '满{0}送券';
const couponTitleFullForGift = '满{0}送礼品';
const couponDiscount = '{0}折';
const couponGoodsName = '指定商品';
//平台介入
const unagreeSellerProccess = '对商家处理不满意';
//添加日志的角色
......
application/models/Business/Coupon/CouponService.php
View file @ 44ad581d
......@@ -54,7 +54,11 @@ class CouponServiceModel extends \Business\AbstractModel{
if($orderAmount>0){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponDiscount,$coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
}
}
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
$temp['title'] = \Our\DescribeConst::specialCoupon;
......@@ -63,6 +67,9 @@ class CouponServiceModel extends \Business\AbstractModel{
$temp['title'] = \Our\DescribeConst::giftCoupon;
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\DescribeConst::couponGoodsName.$temp['subTitle'];
}
$temp['storeId'] = $coupon['store_id'];
if($temp['storeId']){
$storeInfo = $storeDao->get($temp['storeId'],false);//\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDao, 'getInfoById'),array($temp['storeId'],'store_name'),\Our\ApiConst::oneHour);
......@@ -112,7 +119,11 @@ class CouponServiceModel extends \Business\AbstractModel{
if($orderAmount>0){
$result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponDiscount,$coupon['discount']);
}else{
$result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
}
}
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
$result['title'] = \Our\DescribeConst::specialCoupon;
......@@ -121,6 +132,9 @@ class CouponServiceModel extends \Business\AbstractModel{
$result['title'] = \Our\DescribeConst::giftCoupon;
$result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$result['subTitle'] = \Our\DescribeConst::couponGoodsName.$result['subTitle'];
}
$result['useMemo'] = $coupon['use_memo'];
$result['isGet'] = \Our\ApiConst::zero;
$result['couponType'] = intval($coupon['type']);
......
application/models/Business/Order/OrderService.php
View file @ 44ad581d
......@@ -1018,7 +1018,11 @@ class OrderServiceModel extends \Business\AbstractModel
if($orderAmount>0){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit , $coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponDiscount , $coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit , $coupon['discount']);
}
}
} else if ($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType) {
$temp['title'] = \Our\DescribeConst::specialCoupon;
......@@ -1027,6 +1031,9 @@ class OrderServiceModel extends \Business\AbstractModel
$temp['title'] = \Our\DescribeConst::specialCoupon;
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift, $orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\DescribeConst::couponGoodsName.$temp['subTitle'];
}
$temp['storeId'] = $coupon['store_id'];
if ($temp['storeId']) {
$storeInfo = $storeDao->get($temp['storeId'],false);
......
application/models/DAO/Coupon/Coupon.php
View file @ 44ad581d
......@@ -214,13 +214,20 @@ class CouponModel extends \DAO\AbstractModel {
if($orderAmount>0){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponDiscount,$coupon['discount']);
}else{
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
}
}
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullForCoupon,$orderAmount);
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForGiftCouponType){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullForGift,$orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['title'] = \Our\DescribeConst::couponGoodsName.$temp['title'];
}
$result[] = $temp;
}
return $result;
......@@ -265,13 +272,20 @@ class CouponModel extends \DAO\AbstractModel {
if($orderAmount>0){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponDiscount,$coupon['discount']);
}else{
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
}
}
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForGiftCouponType){
$temp['title'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['title'] = \Our\DescribeConst::couponGoodsName.$temp['title'];
}
$result[$coupon['id']] = $temp;
}
......@@ -306,7 +320,11 @@ class CouponModel extends \DAO\AbstractModel {
if($orderAmount>0){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscount,$orderAmount,$coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponDiscount,$coupon['discount']);
}else{
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullDiscountNoAmoutLimit,$coupon['discount']);
}
}
}else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
$temp['title'] = \Our\DescribeConst::specialCoupon;
......@@ -315,6 +333,9 @@ class CouponModel extends \DAO\AbstractModel {
$temp['title'] = \Our\DescribeConst::giftCoupon;
$temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForGift,$orderAmount);
}
if(in_array($coupon['type'],array(\Our\ApiConst::goodsCoupon,\Our\ApiConst::goodsClassCoupon))){
$temp['subTitle'] = \Our\DescribeConst::couponGoodsName.$temp['subTitle'];
}
$temp['title'] = $temp['title'].'';
if($timeFlag){
$temp['startTime'] = $coupon['start_time'];
......
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