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

application/models/Business/Order/OrderService.php

@@ -809,7 +809,6 @@ class OrderServiceModel extends \Business\AbstractModel
     }
     public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-
         //更新商品库存
         $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
         $orderGoods=array();

application/models/Business/Order/RefundService.php

@@ -187,7 +187,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
             $storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
             $orderService=\Business\Order\OrderServiceModel::getInstance();
-            $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id'],$refund['goods_id']);
+            $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id'],$refund['order_goods_id']);
             $refundReturnDao->db->doCommit();
             $push=\Our\Push::getInstance();
             $pushData=array('storeId'=>$storeId,

application/models/DAO/Order/RefundReturn.php

@@ -288,7 +288,7 @@ class RefundReturnModel extends \DAO\AbstractModel
     public function isPlatformIn($refundInfo)
     {
 
-        if (($refundInfo['isPlatformIn'] == ApiConst::platNotIn && ($refundInfo['sellerState'] == ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount'] > $refundInfo['refundAmount'])) {
+        if (($refundInfo['isPlatformIn'] == ApiConst::platNotIn && (($refundInfo['sellerState'] == ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount'] > $refundInfo['refundAmount']))) {
             return TRUE;
         } else {
             return FALSE;