Skip to content

M
my-yaf-project
Commit 0b1b8056 authored by wwccw0591's avatar wwccw0591
Browse files
Options

pc

parent a91c1198
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
application/controllers/Order.php 100755 → 100644
View file @ 0b1b8056
File mode changed from 100755 to 100644
application/models/Business/Order/OrderService.php
View file @ 0b1b8056
...@@ -313,15 +313,17 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -313,15 +313,17 @@ class OrderServiceModel extends \Business\AbstractModel
//确认收货 //确认收货
public function confirmRecieve($orderId, $memberId) public function confirmRecieve($orderId, $memberId)
{ {
error_reporting(E_ALL);
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName); $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
// $orderDao->deleteOrderCache($memberId, $orderId); // $orderDao->deleteOrderCache($memberId, $orderId);
$order = $orderDao->findByOrderId($orderId); $order = $orderDao->findByOrderId($orderId);
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
//判断订单目前状态是否允许取消 //判断订单目前状态是否允许取消
$isAllowConfirm = $orderDao->isAllowConfirm($order); $isAllowConfirm = $orderDao->isAllowConfirm($order);
if ($isAllowConfirm) { if ($isAllowConfirm) {
$res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE); $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE);
if ($res) { if ($res) {
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true); $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
return true; return true;
} else { } else {
ErrorModel::throwException(CodeConfigModel::receiveError); ErrorModel::throwException(CodeConfigModel::receiveError);
......
application/models/DAO/Order/Order.php
View file @ 0b1b8056
...@@ -821,7 +821,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -821,7 +821,7 @@ class OrderModel extends \DAO\AbstractModel
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName); $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
$orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId); $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
$orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName); $orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
\Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array(),$orderId); \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array(),array($orderId));
} }
return true; return true;
......
public/test/order/recieve.php 100755 → 100644
View file @ 0b1b8056
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<form action="/order/recieve" method="post"> <form action="/order/receive" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br /> 用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
订单id:<input name="data[orderId]" value="865"/><br /> 订单id:<input name="data[orderId]" value="865"/><br />
......
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