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

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;

application/models/DAO/Order/Order.php

@@ -846,6 +846,7 @@ class OrderModel extends \DAO\AbstractModel
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
 
             }
+            $this->deleteGetListByMemberId($stroeId);
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId,$stroeId);
         }

public/test/shopkeeper/orders.php

@@ -12,7 +12,7 @@
 
     用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
     订单状态id:<input name="data[orderState]" value=""/><br />
-    订单号:<input name="data[keyword]" value="400"/><br />
+    keyword:<input name="data[keyword]" value="400"/><br />
     <p id="img_area"></p>
     <input type="submit" value="提交">
 </form>