Skip to content

M
my-yaf-project
Commit f3e25264 authored by zhz's avatar zhz
Browse files
Options

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

parents 185335d5 7a258e62
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 7 deletions
application/controllers/Order.php 100755 → 100644
View file @ f3e25264
File mode changed from 100755 to 100644
application/library/Order/OrderConfirmUtil.php
View file @ f3e25264
......@@ -875,6 +875,7 @@ class OrderConfirmUtil {
}
public function updateOrderToPayed($data){
\Our\Log::getInstance()->write(json_encode($data));
$errorCode = \Our\ApiConst::zero;
$dbName = \Our\DbNameConst::masterDBConnectName;
$orderModel = \DAO\Order\OrderModel::getInstance($dbName);
......@@ -891,6 +892,8 @@ class OrderConfirmUtil {
return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
}
$resultOrderPay = $orderPayModel->update(array('api_pay_state'=>\Our\ApiConst::one,'pay_type'=>$data['pay_type']),array('pay_sn'=>$paySn));
\Our\Log::getInstance()->write(json_encode($resultOrderPay).'$resultOrderPay');
if(!$resultOrderPay){
$orderModel->db->doRollback();
$errorCode = \Error\CodeConfigModel::wrongPaySnForOrder;
......@@ -901,6 +904,7 @@ class OrderConfirmUtil {
}
$orderCon = array('pay_sn'=>$paySn,'order_state'=>\Our\ApiConst::orderStateWaitPay);
\Our\Log::getInstance()->write(json_encode($orderCon));
$orderList = $orderModel->getListByCon($orderCon,'order_id,coupon_id,buyer_id');
if(!$orderList){
$errorCode = \Error\CodeConfigModel::noOrderListForPay;
......@@ -912,7 +916,11 @@ class OrderConfirmUtil {
$updateOrder['is_receive_payment'] = \Our\ApiConst::one;
$updateOrder['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);
$updateOrder['payment_type'] = $this->getOrderPaymentType($data['pay_type']);
\Our\Log::getInstance()->write(json_encode($updateOrder));
$orderUpdateResult = $orderModel->update($orderCon,$updateOrder);
\Our\Log::getInstance()->write(json_encode($orderUpdateResult).'$orderUpdateResult');
\Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon');
if(!$orderUpdateResult){
$orderModel->db->doRollback();
$errorCode = \Error\CodeConfigModel::updateOrderPayedStatusFailed;
......@@ -925,7 +933,10 @@ class OrderConfirmUtil {
if($tempOrder['coupon_id']>\Our\ApiConst::zero){
$couponIds[$tempOrder['order_id']] = $tempOrder['coupon_id'];
}
$orderModel->deleteOrderCache($tempOrder['buyer_id'],$tempOrder['order_id'],$tempOrder['store_id'],true,true);
\Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon123');
\Our\RedisHelper::memberTotalFromStateToState($tempOrder['buyer_id'],ApiConst::orderStateWaitPay,ApiConst::orderStateWaitConfirm);
}
//送券、送礼品
......@@ -933,6 +944,7 @@ class OrderConfirmUtil {
}*/
\Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon123231');
$orderModel->db->doCommit();
$this->deleteCacheInfo($memberId);
return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
......
application/library/Payment/TencentPay.php 100755 → 100644
View file @ f3e25264
......@@ -298,6 +298,7 @@ class TencentPay {
public function getNotifyInfo() {
$xml = file_get_contents("php://input");
$this->saveData($xml);
\Our\Log::getInstance()->write($xml);
$verify = false;
if($this->checkSign() == FALSE){
$this->setReturnParameter("return_msg","签名失败");//返回信息
......@@ -306,6 +307,8 @@ class TencentPay {
$this->setReturnParameter("return_code","SUCCESS");//设置返回码
}
$returnXml = $this->returnXml();
\Our\Log::getInstance()->write(json_encode($returnXml));
if($verify) {
return array(
'out_trade_no' => $this->data['out_trade_no'],
......
application/models/Business/Order/OrderService.php
View file @ f3e25264
......@@ -313,15 +313,17 @@ class OrderServiceModel extends \Business\AbstractModel
//确认收货
public function confirmRecieve($orderId, $memberId)
{
error_reporting(E_ALL);
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
// $orderDao->deleteOrderCache($memberId, $orderId);
$order = $orderDao->findByOrderId($orderId);
//$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
//判断订单目前状态是否允许取消
$isAllowConfirm = $orderDao->isAllowConfirm($order);
if ($isAllowConfirm) {
$res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE);
if ($res) {
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
return true;
} else {
ErrorModel::throwException(CodeConfigModel::receiveError);
......@@ -789,7 +791,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderId = $delivery['orderId'];
//订单
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
if (empty($order)) {
ErrorModel::throwException(CodeConfigModel::notExsitOrder);
}
......@@ -1007,7 +1009,7 @@ class OrderServiceModel extends \Business\AbstractModel
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderIdForPay);
}
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
if (!$order) {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderForPay);
}
......
application/models/Business/Order/PaymentService.php 100755 → 100644
View file @ f3e25264
......@@ -47,6 +47,7 @@ class PaymentServiceModel extends \Business\AbstractModel{
$param['pay_type'] = \Our\ApiConst::wxAppPayType;
}
$callbackInfo = $wxpay->getNotifyInfo();
\Our\Log::getInstance()->write(json_encode($callbackInfo));
if($callbackInfo) {
//验证成功
$param['paySn'] = $callbackInfo['out_trade_no'];
......
application/models/Business/Store/ShopkeeperService.php
View file @ f3e25264
......@@ -359,7 +359,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
$goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
//订单
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
if ($order['store_id'] != $storeId) {
ErrorModel::throwException(CodeConfigModel::orderError);
}
......
application/models/DAO/Cart/Cart.php 100755 → 100644
View file @ f3e25264
File mode changed from 100755 to 100644
application/models/DAO/Order/Order.php
View file @ f3e25264
......@@ -777,7 +777,7 @@ class OrderModel extends \DAO\AbstractModel
//删除订单列表缓存
public function deleteGetShopKeeperCountByStoreId($storeId)
{
return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(), array($storeId));
return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(),array($storeId));
}
//删除订单列表缓存
......@@ -821,7 +821,7 @@ class OrderModel extends \DAO\AbstractModel
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
$orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
$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;
......
public/test/order/recieve.php 100755 → 100644
View file @ f3e25264
......@@ -7,7 +7,7 @@
</head>
<body>
<form action="/order/recieve" method="post">
<form action="/order/receive" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><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