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

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

@@ -45,10 +45,12 @@ class Pay {
             $orderInfo['openid'] = $authInfo['openid'];
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
-            $prepayId = $wxLitePay->getPrepayId();
+            $prepayId = $return['prepay_id'];
+            unset($return['prepay_id']);
+//            \Our\Log::getInstance()->write($prepayId,'/data/log/apptest');
             if($prepayId) {
                 $dbName = \Our\DbNameConst::masterDBConnectName;
-                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
             }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();
@@ -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/library/Payment/TencentPay.php

@@ -445,4 +445,4 @@ class TencentPay {
     }
 
 
-}
+}
\ No newline at end of file

application/library/Payment/WxLitePay.php

@@ -35,9 +35,12 @@ class WxLitePay extends \Payment\TencentPay{
         }
         //$this->setRequestParams($orderInfo);
         $wxAppParameters = $this->getParameters();
+        $prepayId = $wxAppParameters['prepay_id'];
+        unset($wxAppParameters['prepay_id']);
         $returnData = array(
             'credential'=>array(\Our\NameConst::wxLiteChannel=>$wxAppParameters),
-            'app_id'=>$this->appid
+            'app_id'=>$this->appid,
+            'prepay_id'=>$prepayId
         );
         return $returnData;
     }
@@ -50,6 +53,8 @@ class WxLitePay extends \Payment\TencentPay{
         $wxApiObj['package'] = 'prepay_id='.$this->prepay_id;
         $wxApiObj['signType'] = 'MD5';
         $wxApiObj["paySign"] = $this->getSign($wxApiObj);
+        $wxApiObj["prepay_id"] = $this->prepay_id;
+
         return $wxApiObj;
     }
 
@@ -143,4 +148,4 @@ class WxLitePay extends \Payment\TencentPay{
         return self::$_instance;
     }
 
-}
+}
\ No newline at end of file

application/models/Business/Order/OrderService.php

@@ -333,13 +333,13 @@ 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) {
                 $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
-                if($order['paymentTime']>ApiConst::zero){
+                if($order['paymentTime']>ApiConst::zero && in_array($order['paymentType'],ArrayConst::orderPayTypeOnlines)){
                     $resultRefund=$refundReturnDao->refundMoney($order);
                     if($resultRefund){
                         $where['order_id']=$order['orderId'];
@@ -405,6 +405,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $type=ApiConst::messageWaitGet;
                 }else{
                     $type=ApiConst::messageWaitSend;
+
                 }
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['store_id'],
@@ -521,6 +522,7 @@ class OrderServiceModel extends \Business\AbstractModel
     {
         $baseConfDir = \Our\Common::getConfig('out.config');
         $savePath = $baseConfDir . \Our\PathConst::orderWaitRecieveTaskAddTime;
+        $messageService=\Business\Message\MessageServiceModel::getInstance();
         $addTime = file_get_contents($savePath);
         $addTime = $addTime ? $addTime : ApiConst::zero;
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -535,6 +537,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $pageBegin++;
         } while (!empty($orders['list']));
         $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
         file_put_contents($savePath, TIMESTAMP);
     }
 

application/models/Business/Store/StoreService.php

@@ -320,13 +320,13 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @return array
      * @throws \Our\Exception
      */
-    public function getStoreDetail($param){
+    public function getStoreDetail($param,$flag=true){
         $storeId = intval($param['storeId']);
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
 
-        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId);
+        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId,true,$flag);
         //展示图片
 //        $detailImg = [];
 //        if($storeInfo['store_detail_image']){

application/modules/Client/controllers/User.php

@@ -43,7 +43,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeIsRefuse);
                 }
                 $storeService =\Business\Store\StoreServiceModel::getInstance();
-                $storeOne=$storeService->getStoreDetail($seller);
+                $storeOne=$storeService->getStoreDetail($seller,false);
             }else{
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::errorUsernameOrPassword);
             }

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;
 //                        }
@@ -74,7 +74,12 @@ class cliOrderClose extends basecli
     }
     protected function autoPushClient(){
         $push=\Our\Push::getInstance();
+        $messageService=\Business\Message\MessageServiceModel::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();
@@ -103,8 +108,8 @@ class cliOrderClose extends basecli
 
             }
         }
-
         $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
     }
     protected function _runCli()
     {