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

application/controllers/Index.php

@@ -8,7 +8,19 @@ class IndexController extends \Our\Controller_Abstract  {
     public function init(){
 
     }
+    public function is_https() {
+        if ( !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+            return true;
+        } elseif ( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ) {
+            return true;
+        } elseif ( !empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
+            return true;
+        }elseif($_SERVER['SERVER_PORT'] == 89){
+            return true;
+        }
 
+        return false;
+    }
     public function getHtmlAction(){
         $this->req=$this->getRequest()->getQuery();
         $postData=$this->req;
@@ -40,6 +52,7 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
+        json_encode($_SERVER);exit;
         $elasticConfig=\Our\Common::getConfig('elastic.master');
         $configArray=array(
             $elasticConfig->host.':'.$elasticConfig->port,

application/library/Our/ArrayConst.php

@@ -35,6 +35,12 @@ class ArrayConst
         ApiConst::qqPayType,
         ApiConst::wxLitePayType
     );
+    const orderPayTypeOnlines=array(
+        ApiConst::wxpay,
+        ApiConst::alipay,
+        ApiConst::tenpay,
+        ApiConst::wxProgram
+    );
 //退货方式
     const refundTypes=array(
         ApiConst::refundTypeMoney=>array('id'=>ApiConst::refundTypeMoney,'name'=>"退款",'desc'=>'未收到货(包含未签收),或卖家协商同意前提下'),

application/models/Business/Order/OrderService.php

@@ -398,11 +398,11 @@ class OrderServiceModel extends \Business\AbstractModel
 
     public function changeOrderStateCancelUnconditional($orderInfo)
     {
-        echo json_encode($orderInfo);exit;
+        echo 234234;exit;
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         //$orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance();
-       // $orderGoods=$orderGoodsDao->getOrderGoodsByOrderIds($orderInfo['orderId']);
+        // $orderGoods=$orderGoodsDao->getOrderGoodsByOrderIds($orderInfo['orderId']);
         try {
             $orderId = $orderInfo['orderId'];
             //更新订单信息
@@ -413,6 +413,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 echo '订单:' . json_encode($orderInfo) . '关闭失败!!' . "\r\n";
 
             }else{
+                echo 2134234;exit;
                 $refundSn = $refundReturnDao->getRefundsn($orderInfo['storeId']);
                 //生成退款记录
                 $update['order_id'] = $orderInfo['orderId'];
@@ -493,6 +494,15 @@ class OrderServiceModel extends \Business\AbstractModel
         if (!empty($orders)) {
             $orderIds = array_column($orders, 'orderId');
             $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+                foreach ($orders as $order) {
+                    $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId']);
+                    if ($order['paymentTime'] > ApiConst::zero && in_array($orders['paymentType'], ArrayConst::orderPayTypeOnlines)) {
+                        $this->changeOrderStateCancelUnconditional($order);
+                    }
+                }
+
+            $push = Push::getInstance();
+            $push->pushOrderCloseMessage($orders);
             $storeCartsList=array();
             $storeCarts=array();
             $storeCarts['storeCarts']=array();
@@ -505,22 +515,12 @@ class OrderServiceModel extends \Business\AbstractModel
             if(!empty($storeCarts['storeCarts'])){
                 array_push($storeCartsList,$storeCarts);
             }
-            //$res = $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
-            if(!empty($orders)){
-                foreach ($orders as $order) {
-                    $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId']);
-//                    if ($order['paymentTime'] > ApiConst::zero && in_array($orders['paymentType'], ArrayConst::payTypeOnlines)) {
-//                        $this->changeOrderStateCancelUnconditional($order);
-//                    }
-                }
+           // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
+            try{
+                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList);
+            }catch(\Exception $ex){
+                throw new \Exception('商品库存更新失败:'.$ex->getMessage(),$ex->getCode());
             }
-            $push = Push::getInstance();
-            $push->pushOrderCloseMessage($orders);
-//            try{
-//                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList);
-//            }catch(\Exception $ex){
-//                throw new \Exception('商品库存更新失败:'.$ex->getMessage(),$ex->getCode());
-//            }
         }
     }
 

scripts/crontab/push/news_server.php

@@ -189,7 +189,6 @@ $tcp_server->on('connect', function($serv, $fd) use($conf){
 $tcp_server->on('receive', function($serv, $fd, $from_id, $data) use($conf) {
    // echo $data;
     $data = json_decode($data, true);
-    var_dump($data);
     if(empty($data['data']) && !isset($data['data'])){
         $serv->send($fd, responseJson(1,"fail", ['method' => 'receive', 'error_code' => 1, 'status' => 0]));
         $serv->close($fd);