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

application/models/Business/Order/RefundService.php

@@ -780,7 +780,7 @@ class RefundServiceModel extends \Business\AbstractModel
                 if($value['goodsState']>ApiConst::goodsStateWaitRecieve){
                     $value['shippingOver']=ApiConst::shippingOver;
                 }
-                if($value['isSucRefund']==ApiConst::isNotSuccessRefund &&  ($value['sellerState']==ApiConst::refundSellerAgree || $value['platformState']==ApiConst::platAgree) ){
+                if($value['isSucRefund']==ApiConst::isNotSuccessRefund &&  ($value['sellerState']==ApiConst::refundSellerAgree || (!in_array($value['paymentType'],ArrayConst::payTypeOnlines))&&($value['platformState']==ApiConst::platAgree))){
                     $value['markRefundButton']=ApiConst::one;
                 }else{
                     $value['markRefundButton']=ApiConst::zero;;
@@ -1373,6 +1373,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+        $storeDao=\DAO\StoreModel::getInstance();
         $where['buyer_id']=$buyerId;
         $where['refund_id']=$refundId;
         $res= $refundReturnDao->find($where,$refundReturnDao->refundDetailField);
@@ -1386,6 +1387,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $orderGoodsDao->update($whereOrderGoods,$updateData);
             $refundReturnDao->deleteRefundCache($buyerId,$refundId);
             $orderDao->deleteOrderCache($buyerId,$res['orderId'],$res['storeId']);
+            $storeDao->deleteStoreRefundCache($res['storeId']);
             return true;
         } else {
             return false;