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

application/models/Business/Cart/CartService.php

@@ -975,8 +975,6 @@ class CartServiceModel extends \Business\AbstractModel{
         //删除订单列表缓存
         $orderDao=\DAO\Order\OrderModel::getInstance();
         $orderDao->deleteOrderCache($memberId);
-        $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
-        $memberDao->changeNum($memberId,ApiConst::orderStateWaitConfirm,null,ApiConst::one);
 
         return $return;
     }

application/models/DAO/Member.php

@@ -536,7 +536,6 @@ class MemberModel extends \DAO\AbstractModel
             case ApiConst::orderStateWaitPay:
                 $type = NameConst::waitPay;
                 break;
-            case ApiConst::orderStateWaitConfirm:
             case ApiConst::orderStateWaitSend:
                 $type = NameConst::waitShipments;
                 break;