Commit c64a62d4 authored by wwccw0591's avatar wwccw0591

pc

parent ababbee2
...@@ -195,7 +195,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -195,7 +195,7 @@ class RefundServiceModel extends \Business\AbstractModel
* 退货审核页 * 退货审核页
* *
*/ */
public function returnGoods($storeId,$refundId,$sellerState,$sellerMessage,$isGiveUp=ApiConst::zero) { public function returnGoods($storeId,$refundId,$sellerState,$refundAmount,$sellerMessage,$isGiveUp=ApiConst::zero) {
$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName); $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
$orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName); $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName); $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
...@@ -267,12 +267,14 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -267,12 +267,14 @@ class RefundServiceModel extends \Business\AbstractModel
$refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
$refund_array['goods_state']=2; $refund_array['goods_state']=2;
} elseif ($refund_array['seller_state'] == '3') { } elseif ($refund_array['seller_state'] == '3') {
$refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成 $refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成
} else { } else {
$refund_array['seller_state'] = '2'; $refund_array['seller_state'] = '2';
$refund_array['refund_state'] = '2'; $refund_array['refund_state'] = '2';
$refund_array['return_type'] = '1';//选择弃货 $refund_array['return_type'] = '1';//选择弃货
} }
$refund_array['refund_amount']=$refundAmount;
$state = $refundReturnDao->update($condition, $refund_array); $state = $refundReturnDao->update($condition, $refund_array);
if ($state) { if ($state) {
$sellerLogDao=\DAO\SellerLogModel::getInstance(DbNameConst::masterDBConnectName); $sellerLogDao=\DAO\SellerLogModel::getInstance(DbNameConst::masterDBConnectName);
...@@ -334,7 +336,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -334,7 +336,7 @@ class RefundServiceModel extends \Business\AbstractModel
$whereRefund['refund_id']= $refundId; $whereRefund['refund_id']= $refundId;
$refund = $refundReturnDao->find($whereRefund); $refund = $refundReturnDao->find($whereRefund);
if($refund['refund_type']==ApiConst::refundTypeGoods){ if($refund['refund_type']==ApiConst::refundTypeGoods){
if($this->returnGoods($storeId,$refundId,$refund['sellerState'],$text,$isGiveUp)){ if($this->returnGoods($storeId,$refundId,$refund['sellerState'],$refundAmount,$text,$isGiveUp)){
$refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']); $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
$orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_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'])); \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment