Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Our/Common.php

@@ -115,7 +115,7 @@ class Common
 
     public static function getBaseUrl(){
         $prefix = 'http';
-        if(self::is_https() || $_SERVER['SERVER_NAME'] == 'apiceshi.shenbd.com'){
+        if(self::is_https()){
             $prefix = 'https';
         }
         $url = $prefix.'://'.$_SERVER['SERVER_NAME'];

application/library/Our/DescribeConst.php

@@ -113,6 +113,7 @@ class DescribeConst
     const couponFullForGift = '满{0}送礼品券';
     const noLimitGoodsCouponName = '元无门槛';
     const available = '可用';
+    const minus = '减';
 
 
     const couponTitleFullAvailAbleNoAmountLimit = '全场减{0}';//无门槛减免券

application/models/Business/Coupon/CouponService.php

@@ -304,7 +304,7 @@ class CouponServiceModel extends \Business\AbstractModel{
                 if($coupon['type'] == \Our\ApiConst::noLimitCouponType){
                     $couponTitles[] = $coupon['title'].\Our\DescribeConst::noLimitGoodsCouponName;
                 }else if($coupon['type'] == \Our\ApiConst::fullMinusCouponType){
-                    $couponTitles[] = str_replace(\Our\DescribeConst::available,$coupon['title'],$coupon['subTitle']);
+                    $couponTitles[] = str_replace(\Our\DescribeConst::available,\Our\DescribeConst::minus.$coupon['title'],$coupon['subTitle']);
                 }else{
                     $couponTitles[] = $coupon['subTitle'];
                 }

application/models/Business/User/AddressService.php

@@ -70,6 +70,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                 if($currentAddress['addressId']&&$currentAddress['chooseFlag']){
                     $address['addressId'] = $currentAddress['addressId'];
                     $address['address'] = $currentAddress['address'];
+                    $address['name'] = $currentAddress['name'];
                     $address['tagType'] = $currentAddress['tagType'];
                     $addresses[] = $address;
                     $returnAddress = array('returnAddressId'=>$currentAddress['addressId'],'choosedAddressFlag'=>$currentAddress['chooseFlag'],'addresses'=>$addresses);
@@ -105,6 +106,7 @@ class AddressServiceModel extends \Business\AbstractModel {
         $sess = \Yaf\Session::getInstance();
         $newAddress['addressId'] = $address['addressId'];
         $newAddress['address'] = $address['address'];
+        $newAddress['name'] = $address['name'];
         $newAddress['tagType'] = $address['tagType'];
         $returnAddresses[] = $newAddress;
         $choosedAddressId = $address['addressId'];
@@ -246,6 +248,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                     $temp = array();
                     $temp['addressId'] = $tempAddr['addressId'];
                     $temp['address'] = $tempAddr['address'];
+                    $temp['name'] = $tempAddr['name'];
                     $temp['tagType'] = $tempAddr['tagType'];
                     $returnAddressList[] = $temp;
                 }
@@ -369,6 +372,7 @@ class AddressServiceModel extends \Business\AbstractModel {
             'lng',
             'lat',
             'address',
+            'name',
             'citycode',
             'tag_type'
         );