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

application/models/Business/Order/OrderService.php

@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel
      */
     public function getOrderDetail($orderId)
     {
+       // error_reporting(E_ALL);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
@@ -260,13 +261,14 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['shippingTime'] = $this->orderCommon['shippingTime'];
         if ($returnData['diliverymanId']) {
             $returnData['deliveryman'] = $diliverymanDao->convert($this->diliveryman, $this->getDeliveryManFields());
+            if(empty($returnData['deliveryman']['qrcodePath'])){
+                $returnData['deliveryman']['qrcodePath']='';
+            }
         } else {
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();
         }
-        if(empty($returnData['deliveryman']['qrcodePath'])){
-            $returnData['deliveryman']['qrcodePath']='';
-        }
+
         $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
         $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
         $returnData['reciverInfo'] = $this->address;

application/models/Business/Order/RefundService.php

@@ -335,6 +335,13 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReasonDao = \DAO\Order\RefundReasonModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderInfo = $orderDao->findByMemberIdAndOrderId($memberId, $refund['orderId'], $this->orderField);
+        $whereRefund['goods_id']=$refund['goodsId'];
+        $whereRefund['buyer_id']=$memberId;
+        $whereRefund['order_id']=$orderInfo['orderId'];
+        $refundOne=$refundReturnDao->find($whereRefund);
+        if(!empty($refundOne)){
+            ErrorModel::throwException(CodeConfigModel::alreadyExsitRefundGoods);
+        }
         $refundReasonList = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$refundReasonDao, 'getAll'), array($this->refunReasonField), \Our\ApiConst::oneDaySecond);
         $refundReasonList = $refundReasonDao->convertToKey($refundReasonList);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);

application/models/DAO/Order/QmDeliverymanLog.php

@@ -95,8 +95,8 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
         }
         if ($type == ApiConst::orderTypeRefund) {
             $where=Common::format(" diliveryman_id={0} and order_type={1} and (delivery_state={2} or delivery_state={3})",$diliveryId,ApiConst::orderTypeRefund,ApiConst::deliveryStateWait,ApiConst::deliveryStateWaitTen);
-            $where['order_type'] = ApiConst::orderTypeRefund;
-            $where['delivery_state'] = ApiConst::deliveryStateWait;
+//            $where['order_type'] = ApiConst::orderTypeRefund;
+//            $where['delivery_state'] = ApiConst::deliveryStateWait;
         }
         if ($type == ApiConst::deliveryStateWait) {
             $where['delivery_state'] = ApiConst::deliveryStateComplete;

application/models/DAO/Order/RefundReturn.php

@@ -83,10 +83,10 @@ class RefundReturnModel extends \DAO\AbstractModel {
             $this->errorCode=CodeConfigModel::isNotExpressType;
             $isReturn=FALSE;
         }
-//        if($refundReturn['addressId']>ApiConst::zero){
-//            $this->errorCode=CodeConfigModel::isNotExpressType;
-//            $isReturn=FALSE;
-//        }
+        if($refundReturn['expressId']>ApiConst::zero){
+            $this->errorCode=CodeConfigModel::isNotExpressType;
+            $isReturn=FALSE;
+        }
         return $isReturn;
     }
     /**