Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -28,7 +28,7 @@ namespace Mall.Repository.Product
         public List<RB_Goods_Order_Extend> GetOrderPageList(int pageIndex, int pageSize, out long count, RB_Goods_Order_Extend dmodel)
         {
             var parameters = new DynamicParameters();
-            string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0";
+            string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.{nameof(RB_Goods_Order.OrderClassify)}=0 ";
             if (dmodel.TenantId > 0)
             {
                 where += $@" and o.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -205,6 +205,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.UserId = userInfo.UserId;
             demodel.Recycled = 2;
+            demodel.OrderClassify = 0;
             if (demodel.OrderStatus == Common.Enum.Goods.OrderStatusEnum.WaitSendGoods)
             {
                 demodel.OrderStatusIds = "2,6";//待处理也是待发货状态才有的