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

application/library/Our/ApiConst.php

@@ -96,6 +96,8 @@ class ApiConst
     const memberMessageType = 5;
 
     const diliveryMessageOrder=9;
+
+    const messageReceiveOrderType=301;
     //配送员用户消息类型
     //快递消息
     const deliveryUserMessageType = 8;

application/library/Our/PathConst.php

@@ -53,8 +53,7 @@ class PathConst {
     const storeStatTime="/storeStat.conf";
 
     const orderCancelTime="/orderCancelTime.conf";
-
-
+    const ktestTime="/ktestTime.conf";
 
     //const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
 

application/library/Payment/Pay.php

@@ -46,7 +46,9 @@ class Pay {
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
             $prepayId = $wxLitePay->getPrepayId();
+            file_put_contents($this->baseDir . \Our\PathConst::ktestTime, $prepayId.'|'.$orderInfo['paySn'] );
             if($prepayId) {
+
                 $dbName = \Our\DbNameConst::masterDBConnectName;
                 \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
             }
@@ -92,7 +94,7 @@ class Pay {
         $orderInfo['orderAmount'] = $this->orderAmount;
         if($this->channel == \Our\NameConst::wxLiteChannel){
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
-            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn,$this->memberId);
+            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn, $this->memberId);
             $this->paySn = $newPaySn;
         }
         $orderInfo['paySn'] = $this->paySn;

application/models/Business/Order/OrderService.php

@@ -333,7 +333,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
-        $isAllowCance = true;
+        //$isAllowCance = true;
         if ($isAllowCancel) {
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
             if ($res) {

scripts/crontab/push/jpush.php

@@ -60,7 +60,7 @@ class cliOrderClose extends basecli
 //            else{
 //                if(!empty($res['timeDiff'])){
 //                    $timeArr=explode('-',$res['timeDiff']);
-//                    if(!empty($timeArr)){v
+//                    if(!empty($timeArr)){
 //                        if(\Our\Common::isCurentTimeInSection($timeArr[0],$timeArr[1])){
 //                            continue;
 //                        }
@@ -75,6 +75,10 @@ class cliOrderClose extends basecli
     protected function autoPushClient(){
         $push=\Our\Push::getInstance();
         while($pushData=\Our\RedisHelper::lpop('client_push')){
+            if($pushData['type']==\Our\ApiConst::messageReceiveOrderType){
+                $push->recievedOrder($pushData['storeId'],$pushData['orderId']);
+                continue;
+            }
             $push->addOneToClient($pushData);
         }
         $goodsCommonService=\Business\Goods\GoodsCommonServiceModel::getInstance();