增加活动取消二次确认

Mall.Model/Entity/TradePavilion/RB_Commerce_Activity.cs

@@ -103,5 +103,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int Price { get; set; }
 
+        /// <summary>
+        /// 是否需取消确认   1是  2否
+        /// </summary>
+        public int IsCancelConfirm { get; set; }
+
     }
 }

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -100,6 +100,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_Activity_Extend.SignEndTime),model.SignEndTime },
                     {nameof(RB_Commerce_Activity_Extend.IsFree),model.IsFree },
                     {nameof(RB_Commerce_Activity_Extend.Price),model.Price },
+                    {nameof(RB_Commerce_Activity_Extend.IsCancelConfirm),model.IsCancelConfirm }
                 };
                 flag = commerce_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Activity_Extend.Id), model.Id));
             }

Mall.Module.TradePavilion/CommerceConsultModule.cs

@@ -197,9 +197,10 @@ namespace Mall.Module.TradePavilion
         public bool CancelCommerceConsultModule(int activityId, string cancelRemark, int userId)
         {
             bool flag;
+            var amodel = commerce_ActivityRepository.GetEntity(activityId);
             var cmodel = consultRepository.GetCommerceConsultListRepository(new RB_Commerce_Consult_Extend() { ActivityId = activityId, UserId = userId }).FirstOrDefault();
             if (cmodel == null || cmodel.Status ==  Common.Enum.DateStateEnum.Delete) { return true; }
-            if (cmodel.Money > 0)
+            if (amodel.IsCancelConfirm == 1)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
@@ -208,7 +209,7 @@ namespace Mall.Module.TradePavilion
                 };
                 List<WhereHelper> list = new List<WhereHelper>()
                 {
-                    new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), cmodel)
+                    new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), cmodel.Id)
                 };
                 flag = consultRepository.Update(fileds, list);
             }
@@ -224,6 +225,35 @@ namespace Mall.Module.TradePavilion
                 new WhereHelper(nameof(RB_Commerce_Consult_Extend.UserId), userId),
             };
                 flag = consultRepository.Update(fileds, list);
+                if (flag && cmodel.Money > 0) {
+                    //取消退回使用点数
+                    var umodel = member_UserRepository.GetEntity(cmodel.UserId);
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        { nameof(RB_Member_User_Extend.PointNum),umodel.PointNum + cmodel.Money}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                                FiledName=nameof(RB_Member_User_Extend.Id),
+                                FiledValue=umodel.Id,
+                                OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                    member_UserRepository.Update(keyValues, wheres);
+                    member_PointBalanceRepository.Insert(new Model.Entity.User.RB_Member_PointBalance()
+                    {
+                        Id = 0,
+                        UserId = umodel.Id,
+                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend,
+                        TenantId = umodel.TenantId,
+                        OrderId = 0,
+                        PlatformType = Common.Enum.User.UserSourceEnum.WeiXin,
+                        MallBaseId = umodel.MallBaseId,
+                        PonitNum = cmodel.Money,
+                        CreateDate = DateTime.Now,
+                        Description = "取消活动报名，退回使用点数：" + cmodel.Money,
+                        Remarks = "取消活动报名，退回使用点数：" + cmodel.Money,
+                    });
+                }
             }
             return flag;
         }

Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs

@@ -57,7 +57,7 @@ namespace Mall.Repository.Miai
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
 left join rb_miai_baseinfo b on d.UserId =b.UserId
-where {where} order by d.Id asc";
+where {where} order by d.Id desc";
             return GetPage<RB_Miai_ActivityDiscuss_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 
@@ -113,7 +113,7 @@ where {where} order by d.Id asc";
                 sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
-where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id asc limit {number}";
+where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id desc limit {number}";
             }
             else
             {
@@ -125,14 +125,14 @@ where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id asc
                         sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
-where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})";
+where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id desc limit {number})";
                     }
                     else
                     {
                         sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
-where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})
+where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id desc limit {number})
 union 
 ";
                     }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -340,7 +340,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 SignStartTime = jObj.GetDateTime("SignStartTime"),
                 SignEndTime = jObj.GetDateTime("SignEndTime"),
                 IsFree = jObj.GetInt("IsFree", 2),
-                Price = jObj.GetInt("Price", 0)
+                Price = jObj.GetInt("Price", 0),
+                IsCancelConfirm = jObj.GetInt("IsCancelConfirm", 2)
             };
             try
             {