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

application/library/Order/OrderConfirmUtil.php

@@ -47,7 +47,19 @@ class OrderConfirmUtil {
 
     private $couponCacheFlag = false;
 
-    public  function addOrder($data,$memberId,$currentAddress){
+    /**
+     * 添加订单
+     * @param $data
+     * @param $memberId
+     * @param $currentAddress
+     * @param string $formId 小程序微信支付支付表单id
+     * @return array
+     * @throws \Exception
+     * User: King <358887571@qq.com>
+     * Date: 2018/12/25 0025
+     * Time: 下午 3:01
+     */
+    public  function addOrder($data, $memberId, $currentAddress, $formId = ''){
         $storeCartData = $this->checkPostData($data,$memberId,$currentAddress);
         //return $storeCartData;
         if(CURRENTVERSION==\Our\NameConst::versionDefault){
@@ -55,7 +67,7 @@ class OrderConfirmUtil {
         }else{
             $storeCartData = $this->checkDeliveryTypeAndPaywayNew($storeCartData);
         }
-        return $this->saveOrderInfo($storeCartData);
+        return $this->saveOrderInfo($storeCartData, $formId);
     }
 
 
@@ -477,7 +489,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);
@@ -522,6 +534,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'];

application/library/Payment/Pay.php

@@ -45,6 +45,10 @@ class Pay {
             $orderInfo['openid'] = $authInfo['openid'];
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
+            $prepayId = $wxLitePay->getPrepayId();
+            if($prepayId) {
+                \DAO\Order\OrderModel::getInstance()->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+            }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();
             $return = $qPay->doPay($orderInfo);

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']);

application/models/Business/Order/OrderService.php

@@ -878,7 +878,7 @@ class OrderServiceModel extends \Business\AbstractModel
 //                } else {
 //                    $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
 //                    if ($order['acceptTime'] < $limitTime) {
-//                        array_push($expressOrderIds, $order['orderId']);
+//                        array_push($expressOrderIds, $order['orderId']);z
 //                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
 //                    }
 //                }

application/models/Business/Store/DeliveryService.php

@@ -121,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);
@@ -147,7 +148,8 @@ class DeliveryServiceModel extends \Business\AbstractModel
         }
         $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/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);