小程序下单调整 临时提交

Mall.Common/Enum/Goods/OrderPaymentTypeEnum.cs

@@ -18,9 +18,14 @@ namespace Mall.Common.Enum.Goods
         [EnumField("在线支付")]
         OnlinePayment = 1,
         /// <summary>
-        /// 线下支付
+        /// 货到付款
         /// </summary>
-        [EnumField("线下支付")]
-        OfflinePayment = 2
+        [EnumField("货到付款")]
+        OfflinePayment = 2,
+        /// <summary>
+        /// 余额支付
+        /// </summary>
+        [EnumField("余额支付")]
+        YEPayment = 3
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -175,8 +175,18 @@ namespace Mall.Model.Entity.Product
         /// 运费
         /// </summary>
         public decimal? FreightMoney { get; set; }
-
-
+        /// <summary>
+        /// 使用积分数量
+        /// </summary>
+        public int? IntegralNumber { get; set; }
+        /// <summary>
+        /// 积分抵扣金额
+        /// </summary>
+        public decimal? IntegralMoney { get; set; }
+        /// <summary>
+        /// 优惠券使用金额
+        /// </summary>
+        public decimal? CouponMoney { get; set; }
 
     }
 }

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -95,5 +95,40 @@ namespace Mall.Model.Extend.Product
         /// 区域地址
         /// </summary>
         public string DistrictAddress { get; set; }
+        /// <summary>
+        /// 收货地址id
+        /// </summary>
+        public int? AddressId { get; set; }
+        /// <summary>
+        /// 使用积分
+        /// </summary>
+        public int? Use_Integral { get; set; }
+        /// <summary>
+        /// 使用优惠卷id
+        /// </summary>
+        public int? User_Coupon_Id { get; set; }
+    }
+
+    /// <summary>
+    /// 订单优惠金额
+    /// </summary>
+    public class RB_Goods_CouponModel { 
+        /// <summary>
+        /// 商品id
+        /// </summary>
+        public int GoodsId { get; set; }
+        /// <summary>
+        /// key
+        /// </summary>
+        public string Key { get; set; }
+        /// <summary>
+        /// 商品总价格(包含减积分)
+        /// </summary>
+        public decimal TotalMoney { get; set; }
+        /// <summary>
+        /// 优惠券金额
+        /// </summary>
+        public decimal CouponMoney { get; set; }
+
     }
 }

Mall.Model/Extend/User/RB_Member_ShippingAddress_Extend.cs

@@ -17,5 +17,19 @@ namespace Mall.Model.Extend.User
         /// 区域地址
         /// </summary>
         public string DistrictAddress { get; set; }
+
+        /// <summary>
+        /// 省名称
+        /// </summary>
+        public string PName { get; set; }
+        /// <summary>
+        /// 市名称
+        /// </summary>
+        public string CName { get; set; }
+        /// <summary>
+        /// 区名称
+        /// </summary>
+        public string DName { get; set; }
     }
 }
+

Mall.Module.User/UserModule.cs

@@ -348,6 +348,17 @@ namespace Mall.Module.User
             return list;
         }
 
+        /// <summary>
+        /// 获取会员等级列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_Grade_Extend> GetMemberGrade(RB_Member_Grade_Extend dmodel)
+        {
+            var list = member_GradeRepository.GetGrade(dmodel);
+            return list;
+        }
+
         /// <summary>
         /// 新增会员等级
         /// </summary>
@@ -485,6 +496,41 @@ namespace Mall.Module.User
             }
         }
 
+        /// <summary>
+        /// 验证会员等级是否存在
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool ValidateMemberGrade(RB_Member_Grade_Extend demodel)
+        {
+            List<WhereHelper> whereHelpers = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_Grade.Grade),
+                        FiledValue=demodel.Grade,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_Grade.TenantId),
+                        FiledValue=demodel.TenantId,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_Grade.MallBaseId),
+                        FiledValue=demodel.MallBaseId,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            if (demodel.Id > 0) {
+                whereHelpers.Add(new WhereHelper()
+                {
+                    FiledName = nameof(RB_Member_Grade.Id),
+                    FiledValue = demodel.Id,
+                    OperatorEnum = OperatorEnum.NotEqual
+                });
+            }
+            return member_GradeRepository.Exists(whereHelpers);
+        }
+
         /// <summary>
         /// 获取会员等级
         /// </summary>
@@ -1954,11 +2000,65 @@ namespace Mall.Module.User
             var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
             if (model == null)
             {
-                return new
+                var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
+                bool flag = true;
+                if (basicsModel.DistributorCondition == DistributorConditionEnum.GMSP) {
+                    //验证购买商品
+                    List<WhereHelper> whereHelpers = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.UserId),
+                              FiledValue=userId,
+                               OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.TenantId),
+                              FiledValue=tenantId,
+                               OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.MallBaseId),
+                              FiledValue=mallBaseId,
+                               OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.Recycled),
+                              FiledValue=2,
+                               OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.Status),
+                              FiledValue=0,
+                               OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_Order_Extend.OrderStatus),
+                              FiledValue="2,3,4,5,6",
+                               OperatorEnum=OperatorEnum.IN
+                        },
+                    };
+                    flag = goods_OrderRepository.Exists(whereHelpers);
+                }
+                else if(basicsModel.DistributorCondition == DistributorConditionEnum.DCXF){
+                    //单次消费   充值也算  (货到付款这种怎么处理)
+
+                }
+                if (flag)
                 {
-                    Status = 1,
-                    Msg = "未申请成为分销商"
-                };
+                    return new
+                    {
+                        Status = 1,
+                        Msg = "未申请成为分销商",
+                        basicsModel.ApplyFor,
+                        ApplyForName = basicsModel.ApplyFor.GetEnumName()
+                    };
+                }
+                else {
+                    return new
+                    {
+                        Status = 0,
+                        Msg = "未满足申请成为分销商条件：" + basicsModel.DistributorCondition.GetEnumName()
+                    };
+                }
             }
             if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Reject)
             {

Mall.Repository/Product/RB_Material_InfoRepository.cs

@@ -23,7 +23,7 @@ namespace Mall.Repository.Product
         /// <returns></returns>
         public List<RB_Material_Info_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Info_Extend dmodel)
         {
-            string where = $" 1=1 and {nameof(RB_Material_Info.Status)}=0";
+            string where = $" 1=1 and Id>100 and {nameof(RB_Material_Info.Status)}=0";
             if (dmodel.Id >= 100)
             {
                 if (dmodel.TenantId > 0)

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -44,7 +44,7 @@ namespace Mall.Repository.User
                 where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
             }
             if (dmodel.Source > 0) {
-                where += $@" and u.{nameof(RB_Member_User.Source)}={dmodel.Source}";
+                where += $@" and u.{nameof(RB_Member_User.Source)}={(int)dmodel.Source}";
             }
             if (!string.IsNullOrEmpty(dmodel.NickName))
             {

Mall.Repository/User/RB_Distributor_RemitRepository.cs

@@ -36,6 +36,9 @@ namespace Mall.Repository.User
             if (dmodel.AuditStatus > 0) {
                 where += $@" and r.{nameof(RB_Distributor_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
             }
+            if (dmodel.UserId > 0) {
+                where += $@" and r.{nameof(RB_Distributor_Remit.UserId)}={dmodel.UserId}";
+            }
             
             string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_Distributor_Remit r
 left join rb_member_user u on r.UserId = u.Id

Mall.Repository/User/RB_Member_GradeRepository.cs

@@ -60,6 +60,9 @@ namespace Mall.Repository.User
             {
                 where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={dmodel.MallBaseId}";
             }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Member_Grade.Id)} ={(int)dmodel.Id}";
+            }
             if (dmodel.Grade > 0)
             {
                 where += $@" and {nameof(RB_Member_Grade.Grade)} ={(int)dmodel.Grade}";
@@ -75,5 +78,37 @@ namespace Mall.Repository.User
             string sql = $@"select * from RB_Member_Grade where {where} order by Grade asc";
             return Get<RB_Member_Grade_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_Grade_Extend> GetGrade(RB_Member_Grade_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Member_Grade.Status)}=0 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Member_Grade.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Grade > 0)
+            {
+                where += $@" and {nameof(RB_Member_Grade.Grade)} ={(int)dmodel.Grade}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and {nameof(RB_Member_Grade.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Enabled > 0)
+            {
+                where += $@" and {nameof(RB_Member_Grade.Enabled)} ={(int)dmodel.Enabled}";
+            }
+            string sql = $@"select Grade from RB_Member_Grade where {where} order by Grade asc";
+            return Get<RB_Member_Grade_Extend>(sql).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -282,6 +282,38 @@ namespace Mall.WebApi.Controllers.MallBase
             return orderModule.GetAppletGoodsSettlementInfo(demodel);
         }
 
+        /// <summary>
+        /// 结算页面详情(赞羊字段)
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletGoodsSettlementInfoForZY()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
+
+            if (demodel.DetailList == null || !demodel.DetailList.Any())
+            {
+                return ApiResult.ParamIsNull("请传递商品信息");
+            }
+            foreach (var item in demodel.DetailList)
+            {
+                if ((item.GoodsId ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品id");
+                }
+                if ((item.Number ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品数量");
+                }
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            return orderModule.GetAppletGoodsSettlementInfoForZY(demodel);
+        }
+
         /// <summary>
         /// 结算页面修改快递，获取快递费用
         /// </summary>

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1383,6 +1383,7 @@ namespace Mall.WebApi.Controllers.MallBase
             List<Model.Extend.User.RB_Member_Grade_Extend> MGradeList = null;
             if (demodel.IsCustomSpecification == 1)
             {
+                demodel.InventoryNum = 0;
                 if (demodel.SpecificationList == null || !demodel.SpecificationList.Any()) {
                     return ApiResult.ParamIsNull("请传递规格列表");
                 }
@@ -1455,7 +1456,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     pricemodel.GoodsWeight ??= 0;
                     demodel.InventoryNum += (pricemodel.InventoryNum ?? 0);
                 }
-
+                //主表价格  如果有自定义规格，直接取最小值
+                demodel.SellingPrice = demodel.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
                 //分销佣金
                 if (demodel.SeparateDistribution == 1) {
                     if (DGradeList == null)
@@ -1527,6 +1529,9 @@ namespace Mall.WebApi.Controllers.MallBase
                         //普通设置  直接根据等级验证数量
                         if (DGradeList.Count() * TotalNum != demodel.DistributionCommissionList.Count())
                         {
+                            LogHelper.Write(DGradeList.Count().ToString() + "|||" + JsonConvert.SerializeObject(DGradeList));
+                            LogHelper.Write("TotalNum:"+ TotalNum.ToString());
+                            LogHelper.Write(JsonConvert.SerializeObject(demodel.DistributionCommissionList));
                             return ApiResult.ParamIsNull("分销佣金列表数量不正确");
                         }
                         foreach (var item in DGradeList)

Mall.WebApi/Controllers/User/UserController.cs

@@ -381,6 +381,22 @@ namespace Mall.WebApi.Controllers.User
             }));
         }
 
+        /// <summary>
+        /// 获取会员等级
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberGrade()
+        {
+            var parms = RequestParm;
+            RB_Member_Grade_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Grade_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = userModule.GetMemberGrade(demodel);
+            return ApiResult.Success("", list.Select(x => x.Grade).ToList());
+        }
+
         /// <summary>
         /// 新增会员等级
         /// </summary>
@@ -490,6 +506,9 @@ namespace Mall.WebApi.Controllers.User
             demodel.Status = 0;
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;
+            if (userModule.ValidateMemberGrade(demodel)) {
+                return ApiResult.Failed("该等级已存在,请重新选择等级");
+            }
             bool flag = userModule.SetMemberGradeInfo(demodel);
             if (flag)
             {
@@ -526,7 +545,6 @@ namespace Mall.WebApi.Controllers.User
             }
         }
 
-
         /// <summary>
         /// 获取会用户积分分页列表
         /// </summary>
@@ -1859,15 +1877,15 @@ namespace Mall.WebApi.Controllers.User
                             case 6:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName ?? "") { }); break;
                             case 7:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber ?? "") { }); break;
                             case 8:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountName) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountName ?? "") { }); break;
                             case 9:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.AuditStatus.GetEnumName()) { }); break;
                             case 10:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.WithdrawalWay.GetEnumName()) { }); break;
                             case 11:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.RemitDate.HasValue? item.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss"):"") { }); break;
                         }
                     }
                     slist.Add(datarow);