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

application/library/Our/ApiConst.php

@@ -152,6 +152,8 @@ class ApiConst
     //是否退款成功
     const refundSuccess = 1;
     const refundFail = 0;
+
+    const refundCompleted=3;
     //是否收到货
     const shippingOver = 1;
     const noShippingOver = 0;
@@ -162,6 +164,8 @@ class ApiConst
     //平台介入
     const platIn = 1;
     const platNotIn = 0;
+    //平台介入中
+    const platProccess=2;
     //平台审核状态
     const refundPlatformVerify = 0;
     const refundPlatformAgree = 1;

application/models/Business/Order/OrderService.php

@@ -298,6 +298,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel);
             if ($res) {
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
+                if($order['paymentTime']>ApiConst::zero){
                     $resultRefund=$refundReturnDao->refundMoney($order);
                     if($resultRefund){
                         $where['order_id']=$order['orderId'];
@@ -305,6 +306,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         $orderGoodsUpdateData['is_refund']=1;
                         $orderGoodsDao->update($where,$orderGoodsUpdateData);
                     }
+                }
                 if ($memberId) {
                     $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
                     // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);

application/models/DAO/Order/Order.php

@@ -133,14 +133,20 @@ class OrderModel extends \DAO\AbstractModel
     //判断订单是否允许取消
     public function isAllowCancel($order)
     {
+        if($order['paymentTime']==ApiConst::zero){
             if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
-            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP && $order['paymentTime']>ApiConst::zero ){
-                return false;
-            }
                 return true;
             } else {
                 return false;
             }
+        }else{
+            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
+                return false;
+            }else{
+                return true;
+            }
+        }
+
     }
 
     //列表转换
@@ -214,6 +220,7 @@ class OrderModel extends \DAO\AbstractModel
     public function update($where, $data)
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $data['gmt_update']=TIMESTAMP;
         return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
     }
 
@@ -787,14 +794,13 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     //删除订单缓存
-    public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=0)
+    public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=ApiConst::zero)
     {
 
         if (!empty($memberId)) {
             $this->deleteGetListByMemberId($memberId);
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
         }
-
         if (!empty($stroeId)) {
             if ($deleteGetShopKeeperCountByStoreId) {
                 $this->deleteGetShopKeeperCountByStoreId($stroeId);
@@ -885,7 +891,7 @@ class OrderModel extends \DAO\AbstractModel
         $limit = TIMESTAMP - $timeLimit;
         $where[$timeField] = array('lt', $limit);
         $where = $this->db->getSqlWhereByArray($where);
-        return $this->db->update($this->_tableName)->where($where)->rows(array('order_state' => $toState))->execute();
+        return $this->db->update($this->_tableName)->where($where)->rows(array('order_state' => $toState,'gmt_update'=>$toState))->execute();
 
 
     }

application/models/DAO/Order/RefundReturn.php

@@ -100,6 +100,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
         $where['refund_id'] = $refundId;
         $where['buyer_id'] = $buyerId;
         $data['is_platform_in']=ApiConst::platIn;
+        $data['refund_state']=ApiConst::platProccess;
         $data['platform_in_reason']=$applyMessage;
         return $this->update($where, $data);
     }
@@ -137,6 +138,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
     }
 
     public function getStatusExtent($returnRefund){
+        if($returnRefund['refundState']!=ApiConst::refundCompleted){
             if($returnRefund['sellerState']==ApiConst::refundSellerAgree){
                 if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
                     return OrderConst::refoundSuccess;
@@ -166,6 +168,11 @@ class RefundReturnModel extends \DAO\AbstractModel {
                     return OrderConst::sellerRefuseGoods;
                 }
             }
+        }else{
+                return OrderConst::refoundSuccess;
+        }
+
+
     }
     public function getRefundTextStatus($refundReturn){
         $refundText='';
@@ -173,6 +180,9 @@ class RefundReturnModel extends \DAO\AbstractModel {
             case ApiConst::refundSellerVerify:$refundText=OrderConst::waitVerify;break;
             case ApiConst::refundSellerAgree:$refundText=$this->getStatusExtent($refundReturn);break;
             case ApiConst::refundSellerRefuse:$refundText=$this->getStatusExtent($refundReturn);break;
+        }
+        if($refundReturn['']){
+
         }
         return $refundText;
     }