Commit a09fd4d5 authored by wwccw0591's avatar wwccw0591

pc

parent 305d122d
...@@ -156,7 +156,7 @@ class NameConst { ...@@ -156,7 +156,7 @@ class NameConst {
const rightBracket = ']'; const rightBracket = ']';
const elasticName='elastic.master'; const elasticName='elastic.master';
const shopkeeper='orders'; const shopkeeper='shenbdindex';
const cancelUnPayedOrderTimePrefix = 'cancelUnPayedOrderTime'; const cancelUnPayedOrderTimePrefix = 'cancelUnPayedOrderTime';
const cancelUnReceivedOrderTimePrefix = 'cancelUnReceivedOrderTime'; const cancelUnReceivedOrderTimePrefix = 'cancelUnReceivedOrderTime';
......
...@@ -398,14 +398,15 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -398,14 +398,15 @@ class RefundServiceModel extends \Business\AbstractModel
$refundArrayUnLine=Common::convertUnderline($refundArray); $refundArrayUnLine=Common::convertUnderline($refundArray);
$state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods); $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
if ($state) { if ($state) {
$orderDao->deleteOrderCache($memberId,$refund['orderId'],$refund['storeId'],true);
$refundReturnDao->deleteRefundCache($memberId);
$refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine); $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
$orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state)); $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
$orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']); $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) { if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
$orderDao->editOrderLock($orderInfo['orderId']); $orderDao->editOrderLock($orderInfo['orderId']);
} }
$orderDao->deleteOrderCache($memberId,$orderInfo['orderId'],$orderInfo['storeId'],true);
$refundReturnDao->deleteRefundCache($memberId);
return $state; return $state;
} else { } else {
ErrorModel::throwException(CodeConfigModel::refundRefuseByStore); ErrorModel::throwException(CodeConfigModel::refundRefuseByStore);
......
...@@ -529,7 +529,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -529,7 +529,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
{ {
$elasticsTool = ElasticsToolModel::getInstance('orders'); $elasticsTool = ElasticsToolModel::getInstance('orders');
// $elasticsTool->deleteIndex(); $elasticsTool->deleteIndex();
$indexsFiled = array( $indexsFiled = array(
'goodsName' => array( 'goodsName' => array(
'type' => 'string', 'type' => 'string',
......
...@@ -108,14 +108,11 @@ class OrderGoodsModel extends \DAO\AbstractModel { ...@@ -108,14 +108,11 @@ class OrderGoodsModel extends \DAO\AbstractModel {
} }
public function deleteOrderGoodsCache($memberId,$orderIds,$storeId=false){ public function deleteOrderGoodsCache($memberId,$orderIds,$storeId=false){
if($memberId){
return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($memberId));
}
if($orderIds){ if($orderIds){
return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds)); return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds),array($orderIds));
} }
if(!empty($storeId)){ if(!empty($storeId)){
return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array($storeId)); return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array($storeId),array($storeId));
} }
} }
public function getIsRefundMoney($orderGoodses,$promotionsId){ public function getIsRefundMoney($orderGoodses,$promotionsId){
......
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