商城活动调整

Mall.Repository/Product/RB_Goods_Activity_GetRepository.cs

@@ -98,8 +98,8 @@ namespace Mall.Repository.Product
             {
                 if (dmodel.State == 3)
                 {
-                    where += $@" and g.{nameof(RB_Goods_Activity_Get_Extend.State)} =1";
-                    where += $@" and g.{nameof(RB_Goods_Activity_Get_Extend.ReceiveTime)} <'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
+                    where += $@" and (g.{nameof(RB_Goods_Activity_Get_Extend.State)} =3";
+                    where += $@" or (g.{nameof(RB_Goods_Activity_Get_Extend.State)} =1 and a.{nameof(RB_Goods_Activity_Get_Extend.ReceiveTime)} <'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'))";
                 }
                 else
                 {

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1718,7 +1718,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.CoverImage,
                 x.PrizeName,
                 x.PrizeImage,
-                x.ReceiveTime,
+                ReceiveTime = x.ReceiveTime.ToString("yyyy-MM-dd"),
                 SurplusDay = Math.Ceiling((x.ReceiveTime - DateTime.Now).TotalDays),
                 x.Way
             });

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -2803,6 +2803,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.State,
                 x.Way,
                 x.OrderList,
+                x.PrizeName,
+                x.PrizeImage,
                 x.TenantId,
                 x.MallBaseId,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""

Mall.WindowsService/Module/FinanceModule.cs

@@ -2265,7 +2265,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                     string UserTree = string.Join(",", orderList.Select(x => x.UserTree));
                                     AllUserIdList = JsonConvert.DeserializeObject<List<int>>("[" + UserTree + "]");
                                 }
-                                AllUserIdList = AllUserIdList.Where(x => x > 0).Distinct().ToList();//去除重复数据  表示这么多用户在参加活动
+                                AllUserIdList = AllUserIdList.Where(x => x > 10000).Distinct().ToList();//去除重复数据  表示这么多用户在参加活动
                                 //查询已拿到活动名单的用户
                                 var myPrizeList = goods_Activity_GetRepository.GetList(new RB_Goods_Activity_Get_Extend() { TenantId = item.TenantId, MallBaseId = item.MallBaseId, ActivityId = qitem.Id, UserIds = string.Join(",", AllUserIdList) });
                                 foreach (var UserId in AllUserIdList)