优惠券标题修改

application/library/Our/DescribeConst.php

@@ -109,17 +109,17 @@ class DescribeConst
     const specialCoupon = '指定券';
     const giftCoupon = '礼品券';
 
-    const couponFullAvailable = '满{0}可用';
+    const couponFullAvailable = '满{0}元可用';
     const couponFullDiscount = '满{0}享{1}折';
     const couponFullForCoupon = '满{0}送指订券';
     const couponFullForGift = '满{0}送礼品券';
-    const noLimitGoodsCouponName = '元无门槛';
+    const noLimitGoodsCouponName = '{0}元无门槛';
     const available = '可用';
     const minus = '减';
 
 
     const couponTitleFullAvailAbleNoAmountLimit = '全场减{0}';//无门槛减免券
-    const couponTitleFullAvailAble = '满{0}减{1}';
+    const couponTitleFullAvailAble = '满{0}减{1}元';
     const couponTitleFullDiscountNoAmoutLimit = '全场{0}折';
     const couponTitleFullDiscount = '满{0}享{1}折';
     const couponTitleFullForCoupon = '满{0}送券';

application/models/Business/Coupon/CouponService.php

@@ -67,9 +67,6 @@ 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);
@@ -132,9 +129,6 @@ 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']);
@@ -360,7 +354,7 @@ class CouponServiceModel extends \Business\AbstractModel{
         $couponTitles = array();
         foreach($couponTitleArray as $coupon){
             if($coupon['type'] == \Our\ApiConst::noLimitCouponType){
-                $couponTitles[] = $coupon['title'].\Our\DescribeConst::noLimitGoodsCouponName;
+                $couponTitles[] = \Our\Common::format(\Our\DescribeConst::noLimitGoodsCouponName,$coupon['title']);
             }else if($coupon['type'] == \Our\ApiConst::fullMinusCouponType){
                 $couponTitles[] = str_replace(\Our\DescribeConst::available,\Our\DescribeConst::minus.$coupon['title'],$coupon['subTitle']);
             }else{

application/models/Business/Order/OrderService.php

@@ -1031,9 +1031,6 @@ 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

@@ -225,9 +225,6 @@ class CouponModel extends \DAO\AbstractModel {
             }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,7 +262,7 @@ class CouponModel extends \DAO\AbstractModel {
                 $temp['gift_goods_ids'] = isset($coupon['gift_goods_ids'])?$coupon['gift_goods_ids']:\Our\NameConst::emptyString;
                 $orderAmount = intval($coupon['order_amount']);
                 if($coupon['type'] == \Our\ApiConst::noLimitCoupon){//无门槛优惠券
-                    $temp['title'] = intval($coupon['cash_money']).\Our\DescribeConst::noLimitGoodsCouponName;
+                    $temp['title'] = \Our\Common::format(\Our\DescribeConst::noLimitGoodsCouponName,intval($coupon['cash_money']));
                 }else if($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType){//满额减免券
                     $temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullAvailAble,$orderAmount,intval($coupon['cash_money']));
                 }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
@@ -283,9 +280,6 @@ class CouponModel extends \DAO\AbstractModel {
                 }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;
             }
 
@@ -333,9 +327,6 @@ 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'];