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

application/library/Payment/Alipay.php

@@ -61,7 +61,7 @@ class Alipay {
         return $str;
     }
     public function refund($order){
-        $refundAmount = round($order['refundAmount']/\Our\ApiConst::hundred,\Our\ApiConst::two);
+        $refundAmount = round($order['refundFee']/\Our\ApiConst::hundred,\Our\ApiConst::two);
         if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'){
             $refundAmount = 0.01;
         }

application/models/Business/Order/OrderService.php

@@ -583,8 +583,8 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
+        $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
-
         if (!empty($orders)) {
                 foreach ($orders as $order) {
                     //更新订单信息