Merge branch 'master' of http://git.shenbd.com/api-project-dev/api.shenbd.com into zhz_marketing

.gitignore

-<<<<<<< HEAD
-dea
-=======
 /nbproject/
 .idea
->>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9
 *.DS_Store
 upload
 /data/log
 /data/images
 /scripts/crontab/push/nohup.out
 /lib
-<<<<<<< HEAD
-=======
-
->>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9

application/library/Our/Controller/Abstract.php

@@ -14,7 +14,7 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
         if($version){
             define('CURRENTVERSION',$version);
         }else{
-            define('CURRENTVERSION',\Our\NameConst::versionDefault);
+            define('CURRENTVERSION',\Our\NameConst::versionOne);
         }
     }
 

application/library/Payment/WxPay.php

@@ -61,6 +61,8 @@ class WxPay extends \Payment\TencentPay
 
 
     public function refund($param){
+      //  return  $this->commonRefund($param);
+       // return $this->serviceRefund($param);
         if($param['subMchId']){
             return $this->serviceRefund($param);
         }else{

application/models/Business/Order/OrderService.php

@@ -575,6 +575,22 @@ class OrderServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $order = $orderDao->findByOrderId($orderId,$orderDao->getOrderDetailField());
+        $waitReceiveCount=ApiConst::zero;
+        $waitDeliveryCount=ApiConst::zero;
+        $waitGetCount=ApiConst::zero;
+        if(in_array($order['orderState'],array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve))){
+            if($order['shippingType']==ApiConst::bySelf){
+                $waitGetCount=ApiConst::reduceOne;
+            }
+            if($order['shippingType']==ApiConst::bySeller){
+                $waitDeliveryCount=ApiConst::reduceOne;
+            }
+        }
+        if($order['orderState']==ApiConst::orderStateWaitConfirm){
+            $waitReceiveCount=-1;
+        }
+
+
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
@@ -607,9 +623,9 @@ class OrderServiceModel extends \Business\AbstractModel
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['storeId'],
                     'type'=>ApiConst::messageWaitReceive,
-                    'waitReceiveCount'=>ApiConst::reduceOne,
-                    'waitDeliveryCount'=>ApiConst::zero,
-                    'waitGetCount'=>ApiConst::zero,
+                    'waitReceiveCount'=>$waitReceiveCount,
+                    'waitDeliveryCount'=>$waitDeliveryCount,
+                    'waitGetCount'=>$waitGetCount,
                     'orderCount'=>ApiConst::reduceOne,
                     'waitRefundProccessCount'=>ApiConst::zero,
                     'waitRefundReceiveCount'=>ApiConst::zero,

application/models/DAO/Order/RefundReturn.php

@@ -419,6 +419,7 @@ class RefundReturnModel extends \DAO\AbstractModel
         $param['refundFee'] = $orderInfo['refund_amount'];//退款金额
         $param['storeId'] = $orderInfo['store_id'];
         $param['buyerId'] = $orderInfo['buyer_id'];
+
         if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) {
             $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
             if ($mchIdArray['errorCode'] > 0) {

conf/application.ini

@@ -285,21 +285,21 @@ elastic.master.scheme="http";
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs_ccw"
+resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "root"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs_ccw"
+resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "root"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -316,10 +316,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
 
-redis.database.params.host = "192.168.1.180"
+redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-redis.database.params.password = "23456ertyu"
+redis.database.params.password = ""
 
 out.config="/data/config";
 ;锁文件
@@ -328,13 +328,13 @@ out.locks="/data/locks";
 
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.1.180:9502"
-push.host="192.168.1.180"
+push.clientHost="ws://127.0.0.1:9502"
+push.host="127.0.0.1"
 push.port="9503"
 push.open=1
 push.user.service.id=293
 push.user.service.type=7
-elastic.master.host="192.168.1.180"
+elastic.master.host="127.0.0.1"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 ;resources.database.params.hostname = "127.0.0.1"