Commit 9aaa6fc9 authored by christ's avatar christ

orderChangePrice

parent cb645e8a
...@@ -278,8 +278,8 @@ class Common ...@@ -278,8 +278,8 @@ class Common
$result=trim($result); $result=trim($result);
return $result; return $result;
} }
public static function getDivNum(){ public static function getDivNum($num){
return bcdiv($num,100,2);
} }
public static function mutiplicative($num){ public static function mutiplicative($num){
return intval(bcmul($num, \Our\ApiConst::oneHandred)); return intval(bcmul($num, \Our\ApiConst::oneHandred));
......
...@@ -245,10 +245,10 @@ class Push ...@@ -245,10 +245,10 @@ class Push
$messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n"; $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
$messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n"; $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
$messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n"; $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
$messageContent.='订单金额:'.$orderDetail['goodsAmount']."\n"; $messageContent.='订单金额:'.Common::getDivNum($orderDetail['goodsAmount'])."\n";
$messageContent.='运费:'.$orderDetail['shippingFee']."\n"; $messageContent.='运费:'.Common::getDivNum($orderDetail['shippingFee'])."\n";
$messageContent.='优惠金额:'.$orderDetail['couponAmount']."\n"; $messageContent.='优惠金额:'.Common::getDivNum($orderDetail['couponAmount'])."\n";
$messageContent.='应付金额:'.$orderDetail['orderAmount']."\n"; $messageContent.='应付金额:'.Common::getDivNum($orderDetail['orderAmount'])."\n";
return $messageContent; return $messageContent;
} }
......
...@@ -973,6 +973,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -973,6 +973,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName); $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName); $orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName);
$orderDetail=$orderDao->getByOrderId($orderId,$orderDao->getOrderDetailField()); $orderDetail=$orderDao->getByOrderId($orderId,$orderDao->getOrderDetailField());
$messageService=new \Business\Message\MessageServiceModel();
$orderDetail=$orderDetail[ApiConst::arrBegin]; $orderDetail=$orderDetail[ApiConst::arrBegin];
$storeDao=\DAO\StoreModel::getInstance(); $storeDao=\DAO\StoreModel::getInstance();
if($orderDetail['storeId']!=$storeId){ if($orderDetail['storeId']!=$storeId){
...@@ -986,6 +987,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -986,6 +987,7 @@ class OrderServiceModel extends \Business\AbstractModel
$push=\Our\Push::getInstance(); $push=\Our\Push::getInstance();
$push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']); $push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
$push->sendTcpMessage(); $push->sendTcpMessage();
$messageService->addMessageCenterToDb();
$orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true); $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);
$storeDao->deleteStoreCache($storeId,$orderId); $storeDao->deleteStoreCache($storeId,$orderId);
$orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']); $orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']);
......
...@@ -276,6 +276,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -276,6 +276,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
'orderId'=>$order['order_id'])); 'orderId'=>$order['order_id']));
$push->addOneToClient($pushData); $push->addOneToClient($pushData);
$push->sendTcpMessage(); $push->sendTcpMessage();
$push->addOneToClient();
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); //\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true); $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);
......
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