1

Mall.Module.Product/ProductModule.cs

@@ -1921,7 +1921,7 @@ namespace Mall.Module.Product
             };
             #endregion
             #endregion
-        }
+        }        
 
         /// <summary>
         /// 获取小程序商品视频分页列表
@@ -5900,6 +5900,38 @@ namespace Mall.Module.Product
         {
             return distributor_InfoRepository.GetList(dmodel);
         }
+
+        /// <summary>
+        /// 获取VIP等级信息
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public object GetAppletVipGradeInfo(int tenantId, int mallBaseId)
+        {
+            var disModel = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, IsGuest = 3 }).FirstOrDefault();
+            if (disModel != null)
+            {
+                return new
+                {
+                    Status = 1,
+                    VIPModel = new
+                    {
+                        disModel.Id,
+                        disModel.Grade,
+                        disModel.GradeName
+                    }
+                };
+            }
+            else
+            {
+                return new
+                {
+                    Status = 2,
+                    VIPModel = new { }
+                };
+            }
+        }
         #endregion
 
 

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -1128,6 +1128,23 @@ namespace Mall.WebApi.Controllers.MallBase
             });
         }
 
+        /// <summary>
+        /// 获取粉象模式   Vip等级id
+        /// </summary>
+        /// <param name="requestMsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletVipGradeInfo(object requestMsg) {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (req.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            var Robj = productModule.GetAppletVipGradeInfo(req.TenantId, req.MallBaseId);
+            return ApiResult.Success("", Robj);
+        }
+
         #endregion
 
         #region 生产海报

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1555,6 +1555,82 @@ namespace Mall.WebApi.Controllers.MallBase
 
         }
 
+
+        /// <summary>
+        /// 分销订单后台分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDistributionOrdersPageListForRecommend()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.Recycled = 2;
+            var list = orderModule.GetDistributionOrdersPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.OrderId,
+                x.OrderNo,
+                x.MerchantsNo,
+                x.OrderSource,
+                OrderSourceName = x.OrderSource.GetEnumName(),
+                x.UserId,
+                x.UserName,
+                x.DeliveryMethod,
+                DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
+                x.Income,
+                x.FreightMoney,
+                x.CouponMoney,
+                x.PaymentWay,
+                PaymentWayName = x.PaymentWay.GetEnumName(),
+                DetailList = x.DetailList.Select(y => new
+                {
+                    y.Id,
+                    y.CoverImage,
+                    y.CoverImagePath,
+                    y.OrderType,
+                    OrderTypeName = y.OrderType.GetEnumName(),
+                    y.GoodsName,
+                    SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
+                    y.ProductCode,
+                    y.Final_Price,
+                    y.Number
+                }),
+                x.Consignee,
+                x.Mobile,
+                x.ShoppingAddress,
+                x.BuyerMessage,
+                x.Remark,
+                x.OrderStatus,
+                OrderStatusName = x.OrderStatus.GetEnumName(),
+                PaymentTime = x.PaymentTime.HasValue ? x.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                DeliveryTime = x.DeliveryTime.HasValue ? x.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                ReceivingTime = x.ReceivingTime.HasValue ? x.ReceivingTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.IsOrderCommission,
+                OrderCommissionList = x.OrderCommissionList.Select(z => new
+                {
+                    z.Id,
+                    z.Grade,
+                    z.GradeDescription,
+                    z.UserId,
+                    z.UserName,
+                    z.Mobile,
+                    z.Name,
+                    z.Commission,
+                    z.CommissionState
+                }),
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
         #endregion
 
         #region 售后订单