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

application/library/Our/DescribeConst.php

@@ -95,6 +95,7 @@ class DescribeConst
     const afterPay = '货到付款';
     const alipay = '支付宝支付';
     const tenPay = 'qq支付';
+    const wxProgrom = '微信小程序支付';
     //运费类型
     const serviceFee = '服务费';
     const freightFee = '运费';

application/models/Business/Order/RefundService.php

@@ -461,6 +461,7 @@ class RefundServiceModel extends \Business\AbstractModel
             }
             if(!empty($address)){
                 $address['isDefault'] = (int)$address['isDefault'];
+                $address['company']=isset( $address['company'])? $address['company']:'';
                 $info['dAddressInfo'] = $address;
             }else{
                 $info['dAddressInfo'] =new \stdClass();

application/models/Business/Store/ShopkeeperService.php

@@ -73,6 +73,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $data['todayOrderCount'] = $storeStats['todayOrderCount'];
         $data['todayOrderTotal'] = $storeStats['todayOrderTotal'];
         $data['tadayFavCount'] = $storeFavariteCount['todayFavCount'];
+        $data['todayFavCount'] = $storeFavariteCount['todayFavCount'];
         return $data;
     }
 

application/models/DAO/Order/Order.php

@@ -279,9 +279,11 @@ class OrderModel extends \DAO\AbstractModel
             case ApiConst::alipay:
                 $payName = DescribeConst::alipay;
                 break;
-            case
-            $payName = ApiConst::tenpay:
-                DescribeConst::tenPay;
+            case ApiConst::tenpay:
+                $payName = DescribeConst::tenPay;
+                break;
+            case ApiConst::wxProgram:
+                $payName =  DescribeConst::wxProgrom;
                 break;
             default:
                 break;