pc

application/controllers/Order.php

@@ -111,6 +111,9 @@ class OrderController extends \Our\Controller_AbstractApi {
      */
     public function applyPlatformAction(){
         $refundService =\Business\Order\RefundServiceModel::getInstance();
+        if(empty($this->req[\Our\NameConst::data]['refundId'])){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::paramsError);
+        }
         $res=$refundService->platformIn($this->memberId,$this->req[\Our\NameConst::data]['refundId']);
         if($res){
             $this->success(array(),\Our\DescribeConst::applySuccess);

application/models/Business/Order/OrderService.php

@@ -264,9 +264,14 @@ class OrderServiceModel extends \Business\AbstractModel
             $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;
+        $returnData['reciverInfo']['lng']=!empty($returnData['reciverInfo']['lng'])?$returnData['reciverInfo']['lng']:ApiConst::zero;
+        $returnData['reciverInfo']['lat']=!empty($returnData['reciverInfo']['lat'])?$returnData['reciverInfo']['lat']:ApiConst::zero;
         $refundStateName = $orderDao->getRefundText($this->order);
         $returnData['orderGoods'] = $goodsDao->convert($this->orderGoodsList, $refundStateName);
         return $returnData;

application/models/Business/Order/RefundService.php

@@ -12,6 +12,8 @@ use Our\DbNameConst;
 use Our\DescribeConst;
 use Our\ImageConst;
 use Our\ImageUtil;
+use Our\NameConst;
+use Our\OrderConst;
 
 /**
  * 店铺service
@@ -495,9 +497,21 @@ class RefundServiceModel extends \Business\AbstractModel
     public function platformIn($buyerId, $refundId, $platFormMessage = DescribeConst::unagreeSellerProccess)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
-        $res = $refundReturnDao->updateStatusByBuyerIdAndRefundId($buyerId, $refundId, $platFormMessage);
-        if ($res) {
+        $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+        $where['buyer_id']=$buyerId;
+        $where['refund_id']=$refundId;
+       $res= $refundReturnDao->find($where,$refundReturnDao->refundDetailField);
+        if(isset($res['isPlatformIn']) && !empty($res['isPlatformIn'])){
+            ErrorModel::throwException(CodeConfigModel::platFormAreadyIn);
+        }
+        $re= $refundReturnDao->updateStatusByBuyerIdAndRefundId($buyerId, $refundId, $platFormMessage);
+        if ($re) {
+            $whereOrderGoods['rec_id']=$res['orderGoodsId'];
+            $updateData['refund_state_name']=OrderConst::platFromProccess;
+            $orderGoodsDao->update($whereOrderGoods,$updateData);
             $refundReturnDao->deleteRefundCache($buyerId,$refundId);
+            $orderDao->deleteOrderCache($buyerId,$res['orderId'],$res['storeId']);
             return true;
         } else {
             return false;

application/models/DAO/Order/QmDeliverymanLog.php

@@ -95,12 +95,15 @@ 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;
         }
+        if($type==ApiConst::deliveryStateComplete){
+            $order = array('finish_time' => 'desc');
+        }
         $list = $this->lists($where, $order, $this->fieldList, $pageIndex, $pageSize);
         return $list;
     }

application/models/DAO/Order/RefundReturn.php

@@ -23,7 +23,8 @@ class RefundReturnModel extends \DAO\AbstractModel {
      * @var string
      */
     protected $_tableName = 'han_refund_return';
-    private $refundReturnField="seller_state,refund_state,is_platform_in,platform_state";
+    public $refundDetailField='is_platform_in as isPlatformIn,seller_state as sellerState,platform_state as platformState,refund_id as refundId,order_id as orderId,store_id as storeId,order_goods_id as orderGoodsId';
+    public $refundReturnField="seller_state,refund_state,is_platform_in,platform_state";
     private $sumField="buyer_id as buyerId,store_id as storeId,goods_num as goodsNum,refund_amount as refundAmount,is_suc_refund as isSucRefund,gmt_update as gmtUpdate";
     /**
      * 主键

application/models/Error/CodeConfig.php

@@ -271,6 +271,7 @@ class CodeConfigModel {
     const notExsitOrder=300112;
     const alreadyExsitRefundGoods=300113;
     const notAllowDelete=300114;
+    const platFormAreadyIn=300115;
     //店铺相关错误码
 
     //商品分类
@@ -668,6 +669,7 @@ class CodeConfigModel {
             self::notExsitOrder=>'订单不存在',
             self::alreadyExsitRefundGoods=>'退款订单已经存在',
             self::notAllowDelete=>'当前订单状态不允许删除',
+            self::platFormAreadyIn=>'您已经申请过平台介入',
             self::deleteError=>'放入回收站失败，订单状态有误',
             self::restoreError=>'永久删除、从回收站还原失败，订单状态有误',
             self::shareError=>'分享失败，订单状态有误',