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

application/models/Business/Order/OrderService.php

@@ -1041,7 +1041,12 @@ class OrderServiceModel extends \Business\AbstractModel
         $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'],$storeDao->detailField), \Our\ApiConst::oneDaySecond);
         $convertRefundReturn=Array();
         $convertRefundReturn[$refundReturn['orderGoodsId']]=$refundReturn;
-        $orderGoods = $goodsDao->convert($this->orderGoodsList,false,$convertRefundReturn);
+        if($delivery['orderType']==ApiConst::orderTypeRefund){
+            $orderGoods = $goodsDao->convert($this->orderGoodsList,false,$convertRefundReturn);
+        }else{
+            $orderGoods=$goodsDao->convert($this->orderGoodsList);
+        }
+
         if (empty($orderGoods)) {
             $orderGoods = array();
         }

application/models/Business/Order/RefundService.php

@@ -226,6 +226,8 @@ class RefundServiceModel extends \Business\AbstractModel
             if(!$return_goods) {
                 ErrorModel::throwException(CodeConfigModel::wrongRefundState);
             }
+            $orderDao->setDb(DbNameConst::masterDBConnectName);
+            $orderDao->db->doTransaction();
             $order_info=$orderDao->findByOrderId($return['order_id'],$orderDao->getOrderDetailField());
             $refund_array = array();
             $refund_array['seller_time'] = TIMESTAMP;
@@ -246,9 +248,9 @@ class RefundServiceModel extends \Business\AbstractModel
                 $orderGoodsWhere['rec_id']=$return['order_goods_id'];
                 $result=$orderGoodsDao->update($orderGoodsWhere,$orderGoodsUpdateData);
                 if(!$result){
+                    $orderDao->db->doRollback();
                     ErrorModel::throwException(CodeConfigModel::updateIsRefundFail);
                 }
-
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order_info['storeId'],
                     'type'=>ApiConst::messageRefund,
@@ -265,7 +267,6 @@ class RefundServiceModel extends \Business\AbstractModel
                         'refundId'=>$return['refund_id']));
                 $push->addOneToClient($pushData);
                 $push->sendTcpMessage();
-
             }
 
             if ($refund_array['seller_state'] == ApiConst::refundSellerAgree){
@@ -274,6 +275,7 @@ class RefundServiceModel extends \Business\AbstractModel
                 $orderGoodsWhere['rec_id']=$return['order_goods_id'];
                 $result=$orderGoodsDao->update($orderGoodsWhere,$orderGoodsUpdateData);
                 if(!$result){
+                    $orderDao->db->doRollback();
                     ErrorModel::throwException(CodeConfigModel::updateRefundStateNameFail);
                 }
             }
@@ -294,6 +296,7 @@ class RefundServiceModel extends \Business\AbstractModel
             if ($state) {
                 $sellerLogDao=\DAO\SellerLogModel::getInstance(DbNameConst::masterDBConnectName);
                 $sellerLogDao->record('退货处理，退货编号：'.$return['refund_sn']);
+                $orderDao->db->doCommit();
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order_info['storeId'],
                     'type'=>ApiConst::messageRefund,
@@ -352,7 +355,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $whereRefund['refund_id']= $refundId;
         $refund = $refundReturnDao->find($whereRefund);
         if($refund['refund_type']==ApiConst::refundTypeGoods){
-            if($this->returnGoods($storeId,$refundId,$refund['sellerState'],$refundAmount,$text,$isGiveUp)){
+            if($this->returnGoods($storeId,$refundId,$seller_state,$refundAmount,$text,$isGiveUp)){
                 $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
                 $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
                 \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));

application/models/Business/Store/DeliveryService.php

@@ -103,7 +103,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $storeDao->deleteStoreRefundCache($data['storeId'],$data['orderId']);
         //配送员推送
         $push=\Our\Push::getInstance();
-        $push->sendDelivery($oringeDeliveryManMemberId,$data['orderId']);
+        $push->sendDelivery($oringeDeliveryManMemberId,$orderD['orderId']);
         $messageService->addMessageCenterToDb();
         return $res;
     }
@@ -136,6 +136,8 @@ class DeliveryServiceModel extends \Business\AbstractModel
         if(!$resData){
             ErrorModel::throwException(CodeConfigModel::addDeliveryManError);
         }
+        $memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
+        $memberDb0Redis->tableHSet(trim($member['diliveryman_id']),$resData,ApiConst::tenDaySecond);
         return $resData;
 
     }

application/models/DAO/Member.php

@@ -541,11 +541,16 @@ class MemberModel extends \DAO\AbstractModel
     $orders = array('member_mobile'=>'desc','member_id'=>'desc');
     $memberList = $this->getList($memberCon,$this->availMemberColumn,$orders);
     if($memberList){
-      foreach($memberList as $tempMember){
+      if(count($memberList)>1){
+        foreach($memberList as $tempMember){
           if($tempMember['member_mobile']&&\Our\Common::checkMobilePhone($tempMember['member_mobile'])){
             $member = $tempMember;
             break;
           }
+        }
+      }
+      if(empty($member)){
+        $member = $memberList[0];
       }
       $memberAvatarUrl = $this->getMemberAvatarUrl($member['member_id'], $member['member_avatar']);
       $member['memberAvatarUrl'] = $memberAvatarUrl;

application/modules/Client/controllers/Shopkeeper.php

@@ -260,7 +260,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $refundAmount = floatval($this->req['data']['refundAmount']);
         $text = trim($this->req['data']['text']);
         $isGiveUp=$this->req['data']['isGiveUp']?$this->req['data']['isGiveUp']:\Our\ApiConst::zero;
-        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId, $refundAmount, $text,\Our\ApiConst::refundSellerAgree,$isGiveUp);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,$refundAmount, $text,\Our\ApiConst::refundSellerAgree,$isGiveUp);
         if($res){
             $this->success('操作成功');
         }
@@ -278,7 +278,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         }
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $text = trim($this->req['data']['text']);
-        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,0, $text, 3);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,\Our\ApiConst::zero,$text,\Our\ApiConst::refundSellerRefuse);
         $this->success($res);
     }