新增设备相关功能，更新UavAdvertisementService以支持设备ID和设备名称，新增获取设备广告管理列表和订单金额统计的API，更新相关DTO以包含设备信息。

“wangming”
1 parent db5395b9
Showing 5 changed files with 87 additions and 3 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Dto/UavAdvertisementListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavAdvertisement/Entity/UavAdvertisementEntity.cs
netcore/src/Modularity/Extend/NCC.Extend/UavAdvertisementService.cs
netcore/src/Modularity/Extend/NCC.Extend/UavOrderService.cs
@@ -35,6 +35,11 @@ namespace NCC.Extend.Entitys.Dto.UavAdvertisement
         public string imageUrl { get; set; }
         /// <summary>
+        /// 设备ID
+        /// </summary>
+        public string deviceId { get; set; }
+
+        /// <summary>
         /// 是否启用（1=启用，0=禁用）
         /// </summary>
         public string isEnabled { get; set; }
@@ -33,7 +33,20 @@ namespace NCC.Extend.Entitys.Dto.UavAdvertisement
         /// </summary>
         public string imageUrl { get; set; }
-        public string type{get;set;}
+        /// <summary>
+        /// 广告类型
+        /// </summary>
+        public string type { get; set; }
+
+        /// <summary>
+        /// 设备ID
+        /// </summary>
+        public string deviceId { get; set; }
+        
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string deviceName { get; set; }
     }
 }
@@ -102,6 +102,10 @@ namespace NCC.Extend.Entitys
         [SugarColumn(ColumnName = "F_Name")]
         public string Name { get; set; }
-
+        /// <summary>
+        /// 设备ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_DeviceId")]
+        public string DeviceId { get; set; }
     }
 }
 \ No newline at end of file
@@ -78,6 +78,10 @@ namespace NCC.Extend.UavAdvertisement
                     agentId = it.AgentId,
                     imageUrl = it.ImageUrl,
                     isEnabled = it.IsEnabled,
+                    name = it.Name,
+                    type = it.Type,
+                    deviceId = it.DeviceId,
+                    deviceName = SqlFunc.Subqueryable<UavDeviceEntity>().Where(u => u.Id == it.DeviceId).Select(u => u.DeviceName),
                 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<UavAdvertisementListOutput>.SqlSugarPageResult(data);
         }
@@ -105,7 +109,10 @@ namespace NCC.Extend.UavAdvertisement
                     agentId = it.AgentId,
                     imageUrl = it.ImageUrl,
                     isEnabled = it.IsEnabled,
-                    name = it.Name
+                    name = it.Name,
+                    type = it.Type,
+                    deviceId = it.DeviceId,
+                    deviceName = SqlFunc.Subqueryable<UavDeviceEntity>().Where(u => u.Id == it.DeviceId).Select(u => u.DeviceName),
                 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<UavAdvertisementListOutput>.SqlSugarPageResult(data);
         }
@@ -133,6 +140,8 @@ namespace NCC.Extend.UavAdvertisement
                     isEnabled = it.IsEnabled,
                     name = it.Name,
                     type = it.Type,
+                    deviceId = it.DeviceId,
+                    deviceName = SqlFunc.Subqueryable<UavDeviceEntity>().Where(u => u.Id == it.DeviceId).Select(u => u.DeviceName),
                 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<UavAdvertisementListOutput>.SqlSugarPageResult(data);
         }
@@ -153,6 +162,7 @@ namespace NCC.Extend.UavAdvertisement
             entity.AgentId = _userManager.UserId;
             entity.CreateUser = _userManager.UserId;
             entity.CreateTime = DateTime.Now;
+            entity.DeviceId = input.deviceId;
             // 字符串到整数的强制转换
             if (!string.IsNullOrEmpty(input.isEnabled) && int.TryParse(input.isEnabled, out int isEnabledValue))
             {
@@ -202,5 +212,30 @@ namespace NCC.Extend.UavAdvertisement
         }
         #endregion
+        #region 获取某个设备的广告管理列表
+        /// <summary>
+        /// 获取某个设备的广告管理列表
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        [HttpGet("GetAdvertisementListByDevice")]
+        public async Task<dynamic> GetAdvertisementListByDevice(string deviceId)
+        {
+            var data = await _db.Queryable<UavAdvertisementEntity>()
+                .Where(p => p.DeviceId == deviceId)
+                .Select(it => new UavAdvertisementListOutput
+                {
+                    id = it.Id,
+                    agentId = it.AgentId,
+                    imageUrl = it.ImageUrl,
+                    isEnabled = it.IsEnabled,
+                    name = it.Name,
+                    type = it.Type,
+                    deviceId = it.DeviceId,
+                    deviceName = SqlFunc.Subqueryable<UavDeviceEntity>().Where(u => u.Id == it.DeviceId).Select(u => u.DeviceName),
+                }).ToListAsync();
+            return data;
+        }
+        #endregion
     }
 }
@@ -1482,6 +1482,33 @@ namespace NCC.Extend.UavOrder
         }
         #endregion
+        #region 获取某个设备的订单金额统计
+        /// <summary>
+        /// 获取某个设备的订单金额统计
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        [HttpGet("GetOrderAmountByDevice")]
+        public async Task<dynamic> GetOrderAmountByDevice(string deviceId)
+        {
+            //本月金额
+            var monthStart = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+            var monthData = await _db.Queryable<UavOrderEntity>()
+                .Where(p => p.DeviceId == deviceId && p.Status == UavOrderStatusEnum.已完成.GetHashCode() && p.CreateTime >= monthStart)
+                .SumAsync(p => p.ActualAmount);
+            //总金额
+            var totalData = await _db.Queryable<UavOrderEntity>()
+                .Where(p => p.DeviceId == deviceId && p.Status == UavOrderStatusEnum.已完成.GetHashCode())
+                .SumAsync(p => p.ActualAmount);
+            //返回数据
+            return new
+            {
+                monthData = monthData,
+                totalData = totalData
+            };
+        }
+        #endregion
+
         #region 获取某个代理商的每天出货量
         /// <summary>
         /// 获取某个代理商的每天出货量