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

application/library/Order/OrderConfirmUtil.php

@@ -1202,11 +1202,13 @@ class OrderConfirmUtil {
         }
 
         $orderCon = array('pay_sn'=>$paySn,'order_state'=>array('in',array(\Our\ApiConst::orderStateWaitPay,ApiConst::orderStateCancel)));
-        $orderList = $orderModel->getListByCon($orderCon,'order_id,coupon_id,buyer_id,store_id,order_sn');
+        $orderList = $orderModel->getListByCon($orderCon,'order_id,order_sn, store_name, buyer_id, order_amount, payment_time, order_state, prepay_id,coupon_id');
         if(!$orderList){
             $errorCode = \Error\CodeConfigModel::noOrderListForPay;
             return array('flag'=>\Our\ApiConst::zero,'errorCode'=>$errorCode,'data'=>$data);
         }
+        $order = $orderList[0];
+        $order['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);//更新付款时间
         $memberId = $orderList[0]['buyer_id'];
         $updateOrder = array();
         $updateOrder['order_state'] = \Our\ApiConst::orderStateWaitConfirm;
@@ -1242,6 +1244,12 @@ class OrderConfirmUtil {
         }*/
 
         $orderModel->db->doCommit();
+        //支付支付成功微信小程序模板消息
+        $settingDAO = \DAO\SettingModel::getInstance();
+        $msg_tpl = $settingDAO->getListCache(array('wxapp_order_paysucc_tpl'))['wxapp_order_paysucc_tpl'];
+        \Business\Order\OrderServiceModel::getInstance()->sendPaymentMessage($order, $msg_tpl);
+
+        //发送订单消息
         $this->deleteCacheInfo($memberId);
         $this->pushMessage();
         return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);

application/models/Business/Order/OrderService.php

@@ -123,14 +123,16 @@ class OrderServiceModel extends \Business\AbstractModel
                     'keyword5'=>array('value'=>date('Y-m-d H:i',$order['payment_time'])),
                     'keyword6'=>array('value'=>'已付款'),
                 ));
-//                    \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
             $json = $wechatCommon->sendTemplateMessage($access_token, $req_data);
+
+            \Our\Log::getInstance()->write($order['order_id'].'payment'.json_encode($json), '/data/log/apptest');
             if($json['errmsg']=='ok') {
                 $model->updateByOrderId(array('msg_status'=>2), $order['order_id']);
 //                echo 'order[' . $order['order_id'] .'] send payment succ'."\n";
+                return true;
             }
-
         }
+        return false;
     }
 
     public function sendShippingMessage($order, $msg_tpl) {
@@ -174,9 +176,11 @@ class OrderServiceModel extends \Business\AbstractModel
             if($json['errmsg']=='ok') {
                 $model->updateByOrderId(array('msg_status'=>3), $order['order_id']);
 //                echo 'order[' . $order['order_id'] .'] send shipping succ'."\n";
+                return true;
             }
 
         }
+        return false;
 
     }
 
@@ -230,9 +234,11 @@ class OrderServiceModel extends \Business\AbstractModel
             if($json['errmsg']=='ok') {
                 $model->updateByOrderId(array('msg_status'=>4), $order['order_id']);
 //                echo 'order[' . $order['order_id'] .'] send reciver succ'."\n";
+                return true;
             }
 
         }
+        return false;
     }
 
     /**
@@ -251,7 +257,7 @@ class OrderServiceModel extends \Business\AbstractModel
         //付款7天内付款消息通知
         $where  = array('msg_status'=>array('elt', 1), 'payment_type'=>5, 'order_state'=>array('egt',20), 'prepay_id'=>
             array('neq',
-            ''), 'payment_time'=>array('gt', TIMESTAMP-7*24*60*60));
+            ''), 'payment_time'=>array('between', TIMESTAMP-7*24*60*60, TIMESTAMP-10));
         if($list = $model->getList($where, 'order_id,order_sn, store_name, buyer_id, order_amount, payment_time, order_state, prepay_id', 0, 10, array('payment_time'=>'asc'))) {
             echo 'order count: '.count($list['list'])."\n";
             $msg_tpl = $wxapp_templates['wxapp_order_paysucc_tpl'];
@@ -286,6 +292,9 @@ class OrderServiceModel extends \Business\AbstractModel
             echo ' order num: '.count($list['list'])."\n";
             $msg_tpl = $wxapp_templates['wxapp_order_receive_tpl'];
             foreach ($list['list'] as $order) {
+                if($order['shipping_type']==0) {
+                    $order['send_time'] = $order['finnshed_time'];
+                }
                 $this->sendReceiveMessage($order, $msg_tpl);
             }
         }
@@ -665,13 +674,17 @@ class OrderServiceModel extends \Business\AbstractModel
                         'orderId'=>$order['order_id']));
                 $push->addOneToClient($pushData);
                 $push->sendTcpMessage();
-
+                if($order['prepay_id'] != '') {
                     $order['finnshed_time'] =TIMESTAMP;
+                    if($order['shipping_type']==0) {
+                        $order['send_time'] =TIMESTAMP;
+                    }
                     $settingDAO = \DAO\SettingModel::getInstance();
                     $wxapp_templates = $settingDAO->getListCache(array('wxapp_order_receive_tpl'));
                     $msg_tpl = $wxapp_templates['wxapp_order_receive_tpl'];
 
                     $this->sendReceiveMessage($order, $msg_tpl);    //发送收货小程序模板消息
+                }
 
                 //  \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
                 $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
@@ -687,7 +700,6 @@ class OrderServiceModel extends \Business\AbstractModel
 
     public function getOrderExpressField()
     {
-
         return $this->orderField . ',shipping_html as shippingHtml,shipping_code as shippingCode,send_time as sendTime,shipping_sign as shippingSign,shipping_status as shippingStatus,shipping_arrival_time as shippingArrivalTime';
     }