优惠券标题展示问题

application/models/Business/Coupon/CouponService.php

@@ -51,7 +51,11 @@ class CouponServiceModel extends \Business\AbstractModel{
                             $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
                         }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
                             $temp['title'] = $coupon['discount'];
-                            $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount,$orderAmount,$coupon['discount']);
+                            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']);
+                            }
                         }else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
                             $temp['title'] = \Our\DescribeConst::specialCoupon;
                             $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);
@@ -105,7 +109,11 @@ class CouponServiceModel extends \Business\AbstractModel{
             $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
         }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
             $result['title'] = $coupon['discount'];
-            $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount,$orderAmount,$coupon['discount']);
+            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']);
+            }
         }else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
             $result['title'] = \Our\DescribeConst::specialCoupon;
             $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);

application/models/Business/Order/OrderService.php

@@ -1015,7 +1015,11 @@ class OrderServiceModel extends \Business\AbstractModel
                                 $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable, $orderAmount);
                             } else if ($coupon['coupon_type'] == \Our\ApiConst::discountCouponType) {
                                 $temp['title'] = $coupon['discount'];
-                                $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount, $orderAmount, $coupon['discount']);
+                                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']);
+                                }
                             } else if ($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType) {
                                 $temp['title'] = \Our\DescribeConst::specialCoupon;
                                 $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon, $orderAmount);

application/models/DAO/Coupon/Coupon.php

@@ -262,7 +262,11 @@ class CouponModel extends \DAO\AbstractModel {
                 }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){
-                    $temp['title'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount,$orderAmount,$coupon['discount']);
+                    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']);
+                    }
                 }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){
@@ -299,7 +303,11 @@ class CouponModel extends \DAO\AbstractModel {
                     $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
                 }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
                     $temp['title'] = $coupon['discount'];
-                    $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount,$orderAmount,$coupon['discount']);
+                    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']);
+                    }
                 }else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
                     $temp['title'] = \Our\DescribeConst::specialCoupon;
                     $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullForCoupon,$orderAmount);