订单锁

application/controllers/Cart.php

@@ -161,7 +161,7 @@ class CartController extends \Our\Controller_AbstractApi{
         $sess=\Yaf\Session::getInstance();
         $currentAddress = $sess->get('currentAddress');
 
-        $result = $cartService->addOrder($data,$this->memberId,$currentAddress);
+        $result = $cartService->addOrder($data, $this->memberId,$currentAddress);
         $this->success($result);
     }
 

application/library/Order/OrderConfirmUtil.php

@@ -152,10 +152,10 @@ class OrderConfirmUtil {
             $cartList = $pBundlingService->getFormatCartListForOrder($storeCartList,$this->memberId,true,$dbName);
 			$gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
 			$storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$storeCartList['goodsIds'],'goodsCommonIds'=>$storeCartList['goodsCommonIds'],'blIds'=>$storeCartList['blIds'],'gcIds'=>$gcIds);
-        
+
         }
-        if($this->storeCouponIds&&$this->couponIds){
-            $storeCartData = $this->checkCouponForOrder($storeCartData,$this->memberId);
+        if ($this->storeCouponIds&&$this->couponIds) {
+            $storeCartData = $this->checkCouponForOrder($storeCartData, $this->memberId);
         }
         return $storeCartData;
 
@@ -484,7 +484,7 @@ class OrderConfirmUtil {
         return $paySn;
     }
 
-    public function saveOrderInfo($storeCartData){
+    public function saveOrderInfo($storeCartData, $formId = ''){
         $dbName = \Our\DbNameConst::masterDBConnectName;
         $orderModel  = \DAO\Order\OrderModel::getInstance($dbName);
         $orderModel->setDb($dbName);
@@ -529,6 +529,7 @@ class OrderConfirmUtil {
                     $order['buyer_email'] = $this->address['mob_phone'];
                 }
             }
+            $order['form_id'] = $formId;
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
             $order['order_amount'] = $storeCarts['orderAmount'];
@@ -1266,4 +1267,4 @@ class OrderConfirmUtil {
 
         return self::$_instance;
     }
-}
+}
\ No newline at end of file

application/library/Our/ApiConst.php

@@ -96,6 +96,8 @@ class ApiConst
     const memberMessageType = 5;
 
     const diliveryMessageOrder=9;
+
+    const messageReceiveOrderType=301;
     //配送员用户消息类型
     //快递消息
     const deliveryUserMessageType = 8;

application/library/Our/PathConst.php

@@ -53,8 +53,7 @@ class PathConst {
     const storeStatTime="/storeStat.conf";
 
     const orderCancelTime="/orderCancelTime.conf";
-
-
+    const ktestTime="/ktestTime.conf";
 
     //const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
 

application/library/Payment/Pay.php

@@ -45,6 +45,13 @@ class Pay {
             $orderInfo['openid'] = $authInfo['openid'];
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
+            $prepayId = $return['prepay_id'];
+            unset($return['prepay_id']);
+//            \Our\Log::getInstance()->write($prepayId,'/data/log/apptest');
+            if($prepayId) {
+                $dbName = \Our\DbNameConst::masterDBConnectName;
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
+            }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();
             $return = $qPay->doPay($orderInfo);
@@ -87,7 +94,7 @@ class Pay {
         $orderInfo['orderAmount'] = $this->orderAmount;
         if($this->channel == \Our\NameConst::wxLiteChannel){
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
-            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn,$this->memberId);
+            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn, $this->memberId);
             $this->paySn = $newPaySn;
         }
         $orderInfo['paySn'] = $this->paySn;
@@ -145,4 +152,4 @@ class Pay {
 
         return self::$_instance;
     }
-}
+}
\ No newline at end of file

application/library/Payment/TencentPay.php

@@ -445,4 +445,4 @@ class TencentPay {
     }
 
 
-}
+}
\ No newline at end of file

application/library/Payment/WxLitePay.php

@@ -35,9 +35,12 @@ class WxLitePay extends \Payment\TencentPay{
         }
         //$this->setRequestParams($orderInfo);
         $wxAppParameters = $this->getParameters();
+        $prepayId = $wxAppParameters['prepay_id'];
+        unset($wxAppParameters['prepay_id']);
         $returnData = array(
             'credential'=>array(\Our\NameConst::wxLiteChannel=>$wxAppParameters),
-            'app_id'=>$this->appid
+            'app_id'=>$this->appid,
+            'prepay_id'=>$prepayId
         );
         return $returnData;
     }
@@ -50,6 +53,8 @@ class WxLitePay extends \Payment\TencentPay{
         $wxApiObj['package'] = 'prepay_id='.$this->prepay_id;
         $wxApiObj['signType'] = 'MD5';
         $wxApiObj["paySign"] = $this->getSign($wxApiObj);
+        $wxApiObj["prepay_id"] = $this->prepay_id;
+
         return $wxApiObj;
     }
 
@@ -143,4 +148,4 @@ class WxLitePay extends \Payment\TencentPay{
         return self::$_instance;
     }
 
-}
+}
\ No newline at end of file

application/models/Business/Cart/CartService.php

@@ -1269,7 +1269,8 @@ class CartServiceModel extends \Business\AbstractModel{
     function addOrder($data,$memberId,$currentAddress){
         $postData = json_decode($data['param'],true);
         $orderUtil =\Order\OrderConfirmUtil::getInstance();
-        $return = $orderUtil->addOrder($data,$memberId,$currentAddress);
+        $formId = $data['formId'] ? $data['formId'] : '';
+        $return = $orderUtil->addOrder($data, $memberId, $currentAddress, $formId);
         //删除订单列表缓存
         $orderDao=\DAO\Order\OrderModel::getInstance();
         $orderDao->deleteOrderCache($memberId,false,($postData['storeId'])?$postData['storeId']:$postData[0]['storeId']);
@@ -1293,4 +1294,4 @@ class CartServiceModel extends \Business\AbstractModel{
 
         return self::$_instance;
     }
-}
+}
\ No newline at end of file

application/models/Business/Goods/GoodsCommonService.php

@@ -319,32 +319,37 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $endTime = TIMESTAMP;
 
         $where = 'goods_edittime > '.$beginTime.' and goods_edittime<=' . $endTime . ' and goods_id in (select sg.goods_id from han_stat_goods sg)';
-        $field = 'goods_id,is_del,goods_name,goods_storage,goods_price,store_id';
+        $field = 'goods_id,goods_commonid,is_del,goods_name,goods_storage,goods_price,store_id';
 
         $result = true;
         $goodsDao = \DAO\GoodsModel::getInstance();
         $storeDao = \DAO\StoreModel::getInstance();
         $statGoodsDao = \DAO\StatGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $store_tmp = array();
-        if($datas = $goodsDao->getList($where, $field)) {   //更新商品报表
-            echo 'in:'.count($datas);
-            foreach ($datas as $key=>$val) {
-                if(isset($store_tmp[$val['store_id']])) {
-                    $store_info = $store_tmp[$val['store_id']];
-                } else {
-                    $store_info = $storeDao->getFieldsInfo(array('store_id'=>$val['store_id']), 'province_id, city_id, area_id');
-                }
-                $update_stat_goods = $val;
-                $update_stat_goods['upd_time'] = $endTime;
-                $update_stat_goods['province_id'] = $store_info['province_id'];
-                $update_stat_goods['city_id'] = $store_info['city_id'];
-                $update_stat_goods['area_id'] = $store_info['area_id'];
-                unset($update_stat_goods['goods_id']);
-                $where = 'goods_id='.$val['goods_id']. ' and upd_time <'.$beginTime;
-                if(!$statGoodsDao->update($where, $update_stat_goods)){
-                    $result = false;
+        $count = $statGoodsDao->getCountByWhere('1=1');
+        if($count > 0) {
+            if($datas = $goodsDao->getList($where, $field)) {   //更新商品报表
+                echo 'in:'.count($datas);
+                foreach ($datas as $key=>$val) {
+                    if(isset($store_tmp[$val['store_id']])) {
+                        $store_info = $store_tmp[$val['store_id']];
+                    } else {
+                        $store_info = $storeDao->getFieldsInfo(array('store_id'=>$val['store_id']), 'province_id, city_id, area_id');
+                    }
+                    $update_stat_goods = $val;
+                    $update_stat_goods['upd_time'] = $endTime;
+                    $update_stat_goods['province_id'] = $store_info['province_id'];
+                    $update_stat_goods['city_id'] = $store_info['city_id'];
+                    $update_stat_goods['area_id'] = $store_info['area_id'];
+                    unset($update_stat_goods['goods_id']);
+                    $where = 'goods_id='.$val['goods_id']. ' and upd_time <'.$beginTime;
+                    if(!$statGoodsDao->update($where, $update_stat_goods)){
+                        $result = false;
+                    }
                 }
             }
+        } else {
+            file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, '0');
         }
 
         $where = 'goods_id not in (select sg.goods_id from han_stat_goods sg)';
@@ -368,9 +373,13 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 }
             }
         }
+        echo "\n";
 
         if($result) {   //商品报表更新成功
             file_put_contents($this->baseDir . \Our\PathConst::goodsStatTime, $endTime);
+            echo "upd goods succ";
+        } else {
+            echo "upd goods fail";
         }
         return $result;
     }
@@ -382,7 +391,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
      * Time: 下午 6:19
      */
     public function updateStatGoodsSell(){
-        file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, '');
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP;
@@ -419,8 +427,12 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 }
             }
             if(!$result) {
+                echo "\n";
+                echo 'upd sell fail';
                 $statGoodsDao->db->doRollback();
             } else {   //商品报表更新成功
+                echo "\n";
+                echo 'upd sell succ';
 				$statGoodsDao->db->doCommit();
 				file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, $endTime);
 			}

application/models/Business/Order/OrderService.php

@@ -333,19 +333,25 @@ class OrderServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
-        $isAllowCance = true;
+        //$isAllowCance = true;
         if ($isAllowCancel) {
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
+            $orderDao->setDb($orderDao->dbName);
+            $orderDao->db->doTransaction();
             if ($res) {
                 $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
-                if($order['paymentTime']>ApiConst::zero){
+                if($order['paymentTime']>ApiConst::zero && in_array($order['paymentType'],ArrayConst::orderPayTypeOnlines)){
                     $resultRefund=$refundReturnDao->refundMoney($order);
                     if($resultRefund){
                         $where['order_id']=$order['orderId'];
                         //$orderGoodsUpdateData['refund_state_name']='退款成功';
                         $orderGoodsUpdateData['is_refund']=ApiConst::refundSuccess;
                         $orderGoodsDao->update($where,$orderGoodsUpdateData);
+                        $orderDao->db->doCommit();
+                    }else{
+                        $orderDao->db->doRollback();
+                        ErrorModel::throwException(CodeConfigModel::cancelRefundMoneyError);
                     }
                 }
                 $push=\Our\Push::getInstance();
@@ -405,6 +411,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $type=ApiConst::messageWaitGet;
                 }else{
                     $type=ApiConst::messageWaitSend;
+
                 }
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['store_id'],
@@ -521,6 +528,7 @@ class OrderServiceModel extends \Business\AbstractModel
     {
         $baseConfDir = \Our\Common::getConfig('out.config');
         $savePath = $baseConfDir . \Our\PathConst::orderWaitRecieveTaskAddTime;
+        $messageService=\Business\Message\MessageServiceModel::getInstance();
         $addTime = file_get_contents($savePath);
         $addTime = $addTime ? $addTime : ApiConst::zero;
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -535,6 +543,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $pageBegin++;
         } while (!empty($orders['list']));
         $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
         file_put_contents($savePath, TIMESTAMP);
     }
 
@@ -849,8 +858,9 @@ class OrderServiceModel extends \Business\AbstractModel
     public function canformRecieveOrder()
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
         $qmDeliverymanLogsDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
-        $orders = $orderDao->getOrdersByOrderState(ApiConst::orderStateWaitRecieve, 'accept_time', ApiConst::orderWaitRecieveTwentyFourHours, $this->orderMessageField, array(ApiConst::bySeller, ApiConst::express));
+        $orders = $orderDao->getOrdersByOrderState(ApiConst::orderStateWaitRecieve, 'accept_time', ApiConst::orderWaitRecieveTwentyFourHours, $this->orderMessageField, array(ApiConst::bySeller, ApiConst::bySelf));
         if (!empty($orders)) {
             $sellerTypeOrderIds = $orderDao->getShippingTypeSellerOrdersByOrders($orders);
             $qmDeliverymanLogs = $qmDeliverymanLogsDao->getFinishDeliveryByOrderId($sellerTypeOrderIds);
@@ -864,15 +874,24 @@ class OrderServiceModel extends \Business\AbstractModel
                 if ($order['shippingType'] == ApiConst::bySeller) {
                     if (isset($qmDeliverymanLogsOrderIds[$order['orderId']])) {
                         array_push($sellerOrderIds, $order['orderId']);
-                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
+                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'], true);
                     }
-                } else {
+                }
+                if($order['shippingType'] == ApiConst::bySelf){
                     $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
                     if ($order['acceptTime'] < $limitTime) {
                         array_push($expressOrderIds, $order['orderId']);
                         $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
                     }
                 }
+//                } else {
+//                    $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
+//                    if ($order['acceptTime'] < $limitTime) {
+//                        array_push($expressOrderIds, $order['orderId']);z
+//                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
+//                    }
+//                }
+                $memberDao->deleteTotalCache($order['buyerId']);
                 \Our\RedisHelper::memberTotalFromStateToState($order['buyerId'], $order['orderState'], ApiConst::orderStateComplete);
             }
             $updateOrderIds = array_merge($sellerOrderIds, $expressOrderIds);

application/models/Business/Store/DeliveryService.php

@@ -76,7 +76,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['distribution_fee'] =$data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
         if($data['orderType']==ApiConst::orderTypeRefund){
-            $qmDeliveryManLogData['shipping_fee']=$orderD['need_shipping_fee'];
+            $qmDeliveryManLogData['shipping_fee']=$orderD['needShippingFee'];
         }else{
             $qmDeliveryManLogData['shipping_fee'] =    $orderD['shippingFee'];
         }
@@ -104,6 +104,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true,false,$deliveryManMemberIds);
         $storeDao->deleteStoreCache($data['storeId'],$data['orderId']);
         $storeDao->deleteStoreRefundCache($data['storeId'],$data['orderId']);
+        $orderDao->deleteOrderCache($orderD['buyerId'],$orderD['orderId']);
         //配送员推送
         $push=\Our\Push::getInstance();
         if($data['orderType']==ApiConst::orderTypeRefund){
@@ -120,6 +121,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
         $deliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::masterDBConnectName);
         $member=$memberDao->getByMemberMobile($memberMobile);
+        $storeDao=\DAO\StoreModel::getInstance();
         $memberMobile=$member['memberMobile'];
         if(strlen($memberMobile)>ApiConst::telephoneLen || !$memberMobile){
                 ErrorModel::throwException(CodeConfigModel::notExsitDeliveryMan);
@@ -128,25 +130,39 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $where['member_id']=$member['memberId'];
         $res=$deliveryManDao->getByWhere($where);
         if($res){
+            $res=$res[ApiConst::zero];
+        }
+        if($res && !$res['isDel']){
             ErrorModel::throwException(CodeConfigModel::alreadyExsitDeliveryMan);
         }
-        $trueName=$trueName?$trueName:$member['memberName'];
-        $deliveryManData['true_name']=$trueName;
-        $deliveryManData['mobile']=$memberMobile;
-        $deliveryManData['scores']=ApiConst::five;
-        $deliveryManData['store_id']=$storeId;
-        $deliveryManData['add_time']=TIMESTAMP;
-        $deliveryManData['update_time']=TIMESTAMP;
-        $deliveryManData['member_id']=$member['memberId'];
-        $deliveryManData['bind_status']=ApiConst::one;
-        $deliveryManData['is_del']=ApiConst::zero;
-        $resData=$deliveryManDao->insert($deliveryManData);
+        if($res['isDel']==ApiConst::deleteStateOne){
+            $updateData['is_del']=ApiConst::zero;
+            $updateData['true_name']=$trueName;
+            $updateData['update_time']=TIMESTAMP;
+            $deliveryManWhere['id']=$res['id'];
+            $resData= $deliveryManDao->update($deliveryManWhere,$updateData);
+            $memberData['diliveryman_id'] =$res['id'];
+            $resData=$res['id'];
+        }else{
+            $trueName=$trueName?$trueName:$member['memberName'];
+            $deliveryManData['true_name']=$trueName;
+            $deliveryManData['mobile']=$memberMobile;
+            $deliveryManData['scores']=ApiConst::five;
+            $deliveryManData['store_id']=$storeId;
+            $deliveryManData['add_time']=TIMESTAMP;
+            $deliveryManData['update_time']=TIMESTAMP;
+            $deliveryManData['member_id']=$member['memberId'];
+            $deliveryManData['bind_status']=ApiConst::one;
+            $deliveryManData['is_del']=ApiConst::zero;
+            $resData=$deliveryManDao->insert($deliveryManData);
+            $memberData['diliveryman_id']=$resData;
+        }
         if(!$resData){
             ErrorModel::throwException(CodeConfigModel::addDeliveryManError);
         }
-        $memberData['diliveryman_id']=$resData;
         $memberDao->saveInfo($memberData,$member['memberId']);
-
+        $storeDao->deleteStoreCache($storeId);
+        $storeDao->deleteStoreRefundCache($storeId);
 //        $memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
 //        $memberDb0Redis->tableHSet(trim($member['diliveryman_id']),$resData,ApiConst::tenDaySecond);
         return $resData;

application/models/Business/Store/ShopkeeperService.php

@@ -85,7 +85,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $data['favCount'] = $storeFavariteCount['favCount'];
         $data['todayOrderCount'] = $storeStats['todayOrderCount'];
         $data['todayOrderTotal'] = $storeStats['todayOrderTotal'];
-        $data['todayOrderTotalOnline']=$todayTotalOnline;
+        $data['todayOrderTotalOnline']=$todayTotalOnline['orderTotalOnline'];
         $data['tadayFavCount'] = $storeFavariteCount['todayFavCount'];
         $data['todayFavCount'] = $storeFavariteCount['todayFavCount'];
         return $data;
@@ -508,7 +508,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::emptyStoreId);
         }
         $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
-        $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
+       // $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
+        $diliveryMans=$diliveryMan->getDeliveryManByStoreId($storeId);
         foreach($diliveryMans as &$dilivery){
             $dilivery['memberAvatar']=$memberDao->getMemberAvatar($dilivery['memberId']);
         }
@@ -692,7 +693,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         $memberFavoritesStoreMemberStatisticsDao=\DAO\Store\MemberFavoritesStoreStoreMemberStatisticsModel::getInstance(DbNameConst::masterDBConnectName);
         foreach($distincts as $order){
-
             $storeDao->deleteStoreTotalCount($order['storeId']);
            // $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'], true, true);
             $storeMemberStatisticsData['storeId']=$order['storeId'];

application/models/Business/Store/StoreService.php

@@ -320,13 +320,13 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @return array
      * @throws \Our\Exception
      */
-    public function getStoreDetail($param){
+    public function getStoreDetail($param,$flag=true){
         $storeId = intval($param['storeId']);
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
 
-        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId);
+        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId,true,$flag);
         //展示图片
 //        $detailImg = [];
 //        if($storeInfo['store_detail_image']){

application/models/DAO/Order/Diliveryman.php

@@ -71,7 +71,17 @@ class DiliverymanModel extends \DAO\AbstractModel
         $result=$this->find($where);
         return $result;
     }
-
+    /**
+     * 插入数据
+     * @param $data
+     * @param $where
+     * @return mixed
+     */
+    public function update($where,$data)
+    {
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
+    }
     /**
      * 插入数据
      * @param $data

application/models/DAO/Order/Order.php

@@ -496,7 +496,7 @@ class OrderModel extends \DAO\AbstractModel
         }else{
             $refundAmount=   $refundReturnDao->getSumRefundAmountByStoreId($storeId,false,true);
         }
-        $res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,order_amount as orderTotalOnline")->fetchOne();
+        $res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,sum(order_amount) as orderTotalOnline")->fetchOne();
         if(!$res){
             $res=array();
             $res['orderTotalOnline']=ApiConst::zero;

application/models/DAO/Store.php

@@ -285,10 +285,11 @@ class StoreModel extends \DAO\AbstractModel
     }
     public function deleteStoreCache($storeId,$orderId){
         $qmDeliveryManLogDao =\DAO\Order\QmDeliverymanLogModel::getInstance();
+        $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
         if(!empty($storeId)){
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array(), array($storeId));
-
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array(), array($storeId));
         }
         if(!empty($orderId)){
             $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);

application/models/Error/CodeConfig.php

@@ -328,6 +328,7 @@ class CodeConfigModel
     const payTypeUpdateError = 30145;
     const beyongRefundAmount = 300146;
     const addOrderFrequently = 300147;
+    const cancelRefundMoneyError = 300148;
     //店铺相关错误码
 
     //商品分类
@@ -838,6 +839,7 @@ class CodeConfigModel
             self::payTypeUpdateError=> '更新支付类型失败',
             self::beyongRefundAmount=>'退款金额不能超过可退款金额',
             self::addOrderFrequently => '操作太频繁,请稍后重试',
+            self::cancelRefundMoneyError=>'退款有误，请于商家联系',
             //销售员
             self::emptySaleGoodsId => '商品id不能为空',
             self::emptySaleGoods => '销售商品不存在',

application/modules/Client/controllers/User.php

@@ -43,7 +43,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeIsRefuse);
                 }
                 $storeService =\Business\Store\StoreServiceModel::getInstance();
-                $storeOne=$storeService->getStoreDetail($seller);
+                $storeOne=$storeService->getStoreDetail($seller,false);
             }else{
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::errorUsernameOrPassword);
             }

conf/application.ini

@@ -290,7 +290,7 @@ elastic.master.scheme="http";
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "192.168.1.201"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs"
+resources.database.params.database = "qmcs_ccw"
 resources.database.params.username = "root"
 resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
@@ -300,7 +300,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 resources.database.slave.params.driver   = "pdo_mysql"
 resources.database.slave.params.hostname = "192.168.1.201"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.database = "qmcs_ccw"
 resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"

scripts/crontab/push/jpush.php

@@ -60,7 +60,7 @@ class cliOrderClose extends basecli
 //            else{
 //                if(!empty($res['timeDiff'])){
 //                    $timeArr=explode('-',$res['timeDiff']);
-//                    if(!empty($timeArr)){v
+//                    if(!empty($timeArr)){
 //                        if(\Our\Common::isCurentTimeInSection($timeArr[0],$timeArr[1])){
 //                            continue;
 //                        }
@@ -74,7 +74,12 @@ class cliOrderClose extends basecli
     }
     protected function autoPushClient(){
         $push=\Our\Push::getInstance();
+        $messageService=\Business\Message\MessageServiceModel::getInstance();
         while($pushData=\Our\RedisHelper::lpop('client_push')){
+            if($pushData['type']==\Our\ApiConst::messageReceiveOrderType){
+                $push->recievedOrder($pushData['storeId'],$pushData['orderId']);
+                continue;
+            }
             $push->addOneToClient($pushData);
         }
         $goodsCommonService=\Business\Goods\GoodsCommonServiceModel::getInstance();
@@ -103,8 +108,8 @@ class cliOrderClose extends basecli
 
             }
         }
-
         $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
     }
     protected function _runCli()
     {

scripts/crontab/shopkeeper/index.php

@@ -70,6 +70,7 @@ class cliShopkeeperIndex extends basecli
         $shopkeeperService = \Business\Store\ShopkeeperServiceModel::getInstance();
         $shopkeeperService->baseDir= \Our\Common::getConfig('out.config');
         try {
+
             $shopkeeperService->insertStoreMemberStatics();
             //退货退款订单自动关闭
             $shopkeeperService->reduceStoreMemberStatics();