Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Product/RB_Goods.cs

@@ -454,5 +454,10 @@ namespace Mall.Model.Entity.Product
         /// 自动下架时间
         /// </summary>
         public DateTime? DownDate { get; set; }
+
+        /// <summary>
+        /// 发货地
+        /// </summary>
+        public string SendArea { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -14,6 +14,10 @@ namespace Mall.Model.Extend.Product
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Goods_OrderDetail_Extend : RB_Goods_OrderDetail
     {
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int? UserId { get; set; }
         /// <summary>
         /// 订单财务单据列表
         /// </summary>

Mall.Module.Product/OrderModule.cs

@@ -760,7 +760,7 @@ namespace Mall.Module.Product
             if (dlist.Any())
             {
                 string orderDetailIds = string.Join(",", dlist.Select(x => x.Id));
-                var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetailIds = orderDetailIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetailIds = orderDetailIds, TenantId = tenantId, MallBaseId = mallBaseId }, false);
                 foreach (var item in dlist)
                 {
                     item.CoverImagePath = item.CoverImage;
@@ -5485,7 +5485,7 @@ namespace Mall.Module.Product
             int Rstr = R.Next(111, 999);
             demodel.ReOrderNo = "RE" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
 
-            var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = demodel.OrderDetialId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+            var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = demodel.OrderDetialId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, false);
             if (oasList.Any())
             {
                 return false;
@@ -8468,7 +8468,11 @@ namespace Mall.Module.Product
                                     decimal TotalCommission = 0, OldCommission = 0;
                                     foreach (var item in ssList.Where(x => x.CommissionState == 1))
                                     {
-                                        TotalCommission += (item.Commission ?? 0);
+                                        var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.OrderDetailId, Type = 1, MallBaseId = mallBaseId, TenantId = tenantId });
+                                        if (!afterSaleList.Any())
+                                        {
+                                            TotalCommission += (item.Commission ?? 0);
+                                        }
                                     }
                                     #region 看微店佣金是否是负数  是的话  需要走总佣金里减去
                                     OldCommission = TotalCommission;
@@ -8639,36 +8643,41 @@ namespace Mall.Module.Product
                                 var smallModel = smallShops_InfoRepository.GetList(new RB_SmallShops_Info_Extend() { UserId = ssmodel.UserId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
                                 foreach (var item in ssList.Where(x => x.CommissionState == 1))
                                 {
-                                    if (smallModel != null && smallModel.AuditStatus == DistributorAuditStatusEnum.Audited)
+                                    //查询是否有申请退款
+                                    var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.OrderDetailId, Type = 1, MallBaseId = mallBaseId, TenantId = tenantId });
+                                    if (!afterSaleList.Any())
                                     {
-                                        //更新微店佣金
-                                        Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
+                                        if (smallModel != null && smallModel.AuditStatus == DistributorAuditStatusEnum.Audited)
+                                        {
+                                            //更新微店佣金
+                                            Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
                                             { nameof(RB_SmallShops_Info_Extend.TotalCommission),(smallModel.TotalCommission??0)+(item.Commission??0)},
                                             { nameof(RB_SmallShops_Info_Extend.Commission),(smallModel.Commission??0)+(item.Commission??0)},
                                         };
-                                        List<WhereHelper> wheres2 = new List<WhereHelper>() {
+                                            List<WhereHelper> wheres2 = new List<WhereHelper>() {
                                             new WhereHelper(){
                                                     FiledName=nameof(RB_SmallShops_Info_Extend.Id),
                                                     FiledValue=smallModel.Id,
                                                     OperatorEnum=OperatorEnum.Equal
                                             }
                                         };
-                                        bool flag1 = smallShops_InfoRepository.Update(keyValues2, wheres2);
-                                        if (flag1)
-                                        {
-                                            //更新返佣状态
-                                            Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                                            bool flag1 = smallShops_InfoRepository.Update(keyValues2, wheres2);
+                                            if (flag1)
+                                            {
+                                                //更新返佣状态
+                                                Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
                                                 { nameof(RB_SmallShops_Commission_Extend.CommissionState),2},
                                                 { nameof(RB_SmallShops_Commission_Extend.UpdateDate),DateTime.Now},
                                             };
-                                            List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                                                List<WhereHelper> wheres1 = new List<WhereHelper>() {
                                                 new WhereHelper(){
                                                         FiledName=nameof(RB_SmallShops_Commission_Extend.Id),
                                                         FiledValue=item.Id,
                                                         OperatorEnum=OperatorEnum.Equal
                                                 }
                                             };
-                                            smallShops_CommissionRepository.Update(keyValues1, wheres1);
+                                                smallShops_CommissionRepository.Update(keyValues1, wheres1);
+                                            }
                                         }
                                     }
                                 }
@@ -9680,6 +9689,27 @@ namespace Mall.Module.Product
             return list;
         }
 
+        /// <summary>
+        /// 获取待评论商品列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderDetail_Extend> GetAppletGoodsWaitCommentPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderDetail_Extend demodel)
+        {
+            var list = goods_OrderDetailRepository.GetAppletGoodsWaitCommentPageList(pageIndex, pageSize, out count, demodel);
+            foreach (var item in list) {
+                item.SpecificationList = new List<string>();
+                if (!string.IsNullOrEmpty(item.Specification) && item.Specification != "[]")
+                {
+                    item.SpecificationList = JsonConvert.DeserializeObject<List<string>>(item.Specification);
+                }
+            }
+            return list;
+        }
+
         /// <summary>
         /// 获取订单评价列表
         /// </summary>

Mall.Module.Product/ProductModule.cs

@@ -2297,6 +2297,7 @@ namespace Mall.Module.Product
                     isAllowShare = IsAllowShare,//是否可以分享
                     advertising = model.Advertising,//广告词
                     price = model.SellingPrice,
+                    sendArea = model.SendArea,
                     use_attr = model.IsCustomSpecification,
                     attr_groups = model.SpecificationList.Select(x => new
                     {
@@ -4309,6 +4310,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.IsLiveGoods),demodel.IsLiveGoods},
                         { nameof(RB_Goods.ShelvesDate),demodel.ShelvesDate },
                         { nameof(RB_Goods.DownDate),demodel.DownDate },
+                         { nameof(RB_Goods.SendArea),demodel.SendArea },
+
                     };
                     if (goodsModel.IsProcurement == 1)
                     {
@@ -4346,7 +4349,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember},
                         { nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember},
                         { nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy},
-                        { nameof(RB_Goods.SupplierId),demodel.SupplierId}
+                        { nameof(RB_Goods.SupplierId),demodel.SupplierId},
+                       
                     };
                     }
                     List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -4469,13 +4473,13 @@ namespace Mall.Module.Product
                                     foreach (var item in slist)
                                     {
                                         var supmodel = demodel.SpecificationList.Where(x => x.Id == item.Id).FirstOrDefault();
-                                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>() 
+                                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>()
                                         {
                                             { nameof(RB_Goods_Specification.EnabledImage),supmodel.EnabledImage},
                                             { nameof(RB_Goods_Specification.Name),supmodel.Name},
                                             { nameof(RB_Goods_Specification.Sort),supmodel.Sort}
                                         };
-                                        List<WhereHelper> wheres1 = new List<WhereHelper>() 
+                                        List<WhereHelper> wheres1 = new List<WhereHelper>()
                                         {
                                             new WhereHelper()
                                             {
@@ -4990,12 +4994,12 @@ namespace Mall.Module.Product
                         }
                     }
                 }
-      
+
                 return true;
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "SetProductGoodsInfo:"+Common.Plugin.JsonHelper.Serialize(demodel));
+                LogHelper.Write(ex, "SetProductGoodsInfo:" + Common.Plugin.JsonHelper.Serialize(demodel));
                 return false;
             }
         }

Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs

@@ -151,10 +151,12 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Goods_OrderAfterSale_Extend> GetList(RB_Goods_OrderAfterSale_Extend dmodel)
+        public List<RB_Goods_OrderAfterSale_Extend> GetList(RB_Goods_OrderAfterSale_Extend dmodel,bool IsNormal = true)
         {
             string where = $" where 1=1 and oas.{nameof(RB_Goods_OrderAfterSale.Status)}=0";
-
+            if (IsNormal) {
+                where += $" and oas.{nameof(RB_Goods_OrderAfterSale.ReOrderStatus)} <> {(int)Common.Enum.Goods.OrderAfterSaleStatusEnum.Rejected}";
+            }
             if (dmodel.TenantId > 0)
             {
                 where += $" and oas.{nameof(RB_Goods_OrderAfterSale.TenantId)}={dmodel.TenantId}";

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -526,5 +526,66 @@ INNER JOIN rb_goods_order o on o.OrderId=od.OrderId
 where {where}  order by o.CreateDate desc";
             return GetPage<RB_Goods_OrderDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
+
+        /// <summary>
+        /// 获取待评论商品列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderDetail_Extend> GetAppletGoodsWaitCommentPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderDetail_Extend dmodel)
+        {
+            string where = $" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderDetailIds))
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.Id)} in({dmodel.OrderDetailIds})";
+            }
+            if (dmodel.OrderId > 0)
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.OrderId)}={dmodel.OrderId}";
+            }
+            if (dmodel.OrderType > 0)
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.OrderType)}={(int)dmodel.OrderType}";
+            }
+            if (dmodel.IsComment > 0)
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.IsComment)}={(int)dmodel.IsComment}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsName))
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.GoodsName)} like '%{dmodel.GoodsName}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ProductCode))
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.ProductCode)} like '%{dmodel.ProductCode}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds))
+            {
+                where += $@" and a.{nameof(RB_Goods_OrderDetail.OrderId)} in({dmodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderNo))
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} ='{dmodel.OrderNo}'";
+            }
+            if (dmodel.UserId > 0) {
+                where += $@" and o.{nameof(RB_Goods_Order.UserId)} ={dmodel.UserId}";
+            }
+
+            string sql = $@"SELECT a.* FROM rb_goods_orderdetail as a 
+left join rb_goods_order o on a.OrderId = o.OrderId
+where {where} order by a.Id desc";
+            return GetPage<RB_Goods_OrderDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -842,6 +842,35 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #region 订单评价
 
+        /// <summary>
+        /// 获取商品待评论列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletGoodsWaitCommentPageList() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Goods_OrderDetail_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderDetail_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            var list = orderModule.GetAppletGoodsWaitCommentPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                OrderDetailId = x.Id,
+                x.GoodsId,
+                x.GoodsName,
+                x.CoverImage,
+                x.SpecificationList,
+                x.IsComment,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
         /// <summary>
         /// 获取商品评论分页列表
         /// </summary>

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1182,6 +1182,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsStatus,
                 x.TenantId,
                 x.MallBaseId,
+                x.SendArea,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -1425,6 +1426,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsService,
                 x.SpecificationList,
                 x.SpecificationPriceList,
+                x.SendArea,
             });
             return ApiResult.Success("", pagelist);
         }
@@ -1498,6 +1500,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 model?.IsProcurement,
                 model?.Commission,
                 model?.IsLiveGoods,
+                model.SendArea,
                 CategoryList = model?.CategoryList.Select(x => new
                 {
                     x.Id,
@@ -2052,6 +2055,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.Advertising ??= "";//广告词
             demodel.SubName ??= "";//副标题
             demodel.IsLiveGoods ??= 2;//是否直播商品  1是  2否
+            demodel.SendArea ??= "";//发货地
             if (demodel.IsProxy == 1 && demodel.CostPrice > 0)
             {
                 decimal ProxyMoney = 0;