refundreturn

application/models/Business/Order/RefundService.php

@@ -263,7 +263,7 @@ class RefundServiceModel extends \Business\AbstractModel
                 }
             }
 
-            if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
+            if ($refund_array['seller_state'] == '2' && $isGiveUp) {
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
             } elseif ($refund_array['seller_state'] == '3') {
@@ -329,6 +329,7 @@ class RefundServiceModel extends \Business\AbstractModel
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
         $whereRefund  = array();
         $whereRefund['store_id']= $storeId;
         $whereRefund['refund_id']= $refundId;
@@ -338,6 +339,8 @@ class RefundServiceModel extends \Business\AbstractModel
                 $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
                 $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
                 \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
+                $storeDao->deleteStoreCache($refund['store_id'],$refund['order_id']);
+                $storeDao->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
             }
             return true;
         }else{
@@ -457,6 +460,8 @@ class RefundServiceModel extends \Business\AbstractModel
                 $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
                 $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
                 \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
+                $storeDao->deleteStoreCache($refund['store_id'],$refund['order_id']);
+                $storeDao->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
                 return true;
             }
             $refundReturnDao->db->doRollback();
@@ -542,7 +547,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param int $pageSize
      * @return \stdClass
      */
-    public function getStoreRefundList($storeId, $type=0,$pageIndex = ApiConst::zero, $pageSize = ApiConst::pageSize,$refundId=false)
+    public function getStoreRefundList($storeId, $type=ApiConst::zero,$pageIndex = ApiConst::zero, $pageSize = ApiConst::pageSize,$refundId=false)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
 

application/models/Business/Store/DeliveryService.php

@@ -58,7 +58,11 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['delivery_state'] = ApiConst::deliveryStateWait;
         $qmDeliveryManLogData['distribution_fee'] =$data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
-        $qmDeliveryManLogData['shipping_fee'] =    $orderD['shippingFee'];
+        if($data['orderType']==ApiConst::orderTypeRefund){
+            $qmDeliveryManLogData['shipping_fee']=$orderD['need_shipping_fee'];
+        }else{
+            $qmDeliveryManLogData['shipping_fee'] =    $orderD['shippingFee'];
+        }
         $qmDeliveryManLogData['order_sn'] =    $orderD['orderSn'];
         $qmDeliveryManLogData['get_time'] = TIMESTAMP;
        // $qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];

application/models/DAO/Order/RefundReturn.php

@@ -640,7 +640,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
     //获得售后待处理订单条件
     public function getProccessOrderBySeller($id){
         $where['store_id']=$id;
-        $where['refund_state']=ApiConst::refundSellerVerify;
+        $where['seller_state']=ApiConst::refundSellerVerify;
         return $where;
     }
     //获得售后待收货订单条件