策划部供应商资料 --> 代码优化

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -7415,15 +7415,23 @@ FROM
             {
                 var add = await _sqlSugar.Insertable(new Grp_EnterExitCost() { CurrencyRemark = currencyStr, CreateUserId = dto.CurrUserId }).ExecuteCommandAsync();
 
-                if (add > 0) return Ok(JsonView(true));
+                if (add < 1) return Ok(JsonView(false));
             }
             else //update
             {
                 var upd = await _sqlSugar.Updateable<Grp_EnterExitCost>().SetColumns(x => new Grp_EnterExitCost() { CurrencyRemark = currencyStr }).Where(x => x.Id == dto.Id).ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(true));
+                if (upd < 1) return Ok(JsonView(false));
             }
-            
-            return Ok(JsonView(false));
+
+            //todo:
+            #region 汇率变更时更改币种相关费用
+            var dayCosts = new List<Grp_DayAndCost>();
+            var dayOtherCosts = new List<Grp_DayOtherPrice>();
+
+
+            #endregion
+
+            return Ok(JsonView(true));
         }
 
         /// <summary>
@@ -7446,7 +7454,7 @@ FROM
                 checkboxInfo.CreateUserId = dto.CurrUserId;
                 var add = await _sqlSugar.Insertable(checkboxInfo).ExecuteCommandAsync();
 
-                if (add > 0) return Ok(JsonView(true));
+                if (add < 1) return Ok(JsonView(false));
             }
             else //update
             {
@@ -7465,10 +7473,10 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(true));
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            return Ok(JsonView(false));
+            return Ok(JsonView(true));
         }
 
         /// <summary>
@@ -7487,13 +7495,12 @@ FROM
             info.InsidePay = dto.Visa + dto.Service + dto.Safe + dto.Ticket + dto.HeSuan + dto.YiMiao;
 
             int id = dto.Id;
-            var status = false;
             if (id <= 0) //add 
             {
                 info.CreateUserId = dto.CurrUserId;
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
 
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
             else //update
             {
@@ -7510,15 +7517,10 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
-            }
-
-            if (status)
-            {
-                return Ok(JsonView(new { itemTotal = info.InsidePay }));
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            return Ok(JsonView(false));
+            return Ok(JsonView(new { itemTotal = info.InsidePay }));
         }
 
         /// <summary>
@@ -7536,20 +7538,14 @@ FROM
             var info = _mapper.Map<Grp_EnterExitCost>(dto);
 
             int id = dto.Id;
-            var status = false;
             decimal jjcItemTotal = 0.00M, gwcItemTotal = 0.00M, tdcItemTotal = 0.00M;
             if (id <= 0) //add 
             {
                 info.CreateUserId = dto.CurrUserId;
                 var addInfo = await _sqlSugar.Insertable(info).ExecuteReturnEntityAsync();
 
-                if (addInfo != null)
-                {
-                    status = true;
-                    jjcItemTotal = addInfo.AirJJ + addInfo.CityTranffic;
-                    gwcItemTotal = addInfo.AirGW + addInfo.CityTranffic;
-                    tdcItemTotal = addInfo.AirTD + addInfo.CityTranffic;
-                }
+                if (addInfo == null) return Ok(JsonView(false));
+
             }
             else //update
             {
@@ -7565,21 +7561,15 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0)
-                {
-                    status = true;
-                    jjcItemTotal = info.AirJJ + info.CityTranffic;
-                    gwcItemTotal = info.AirGW + info.CityTranffic;
-                    tdcItemTotal = info.AirTD + info.CityTranffic;
-                }
-            }
+                if (upd > 0) return Ok(JsonView(false));
 
-            if (status)
-            {
-                return Ok(JsonView(new { jjcItemTotal = jjcItemTotal, gwcItemTotal = gwcItemTotal, tdcItemTotal = tdcItemTotal }));
             }
 
-            return Ok(JsonView(false));
+            jjcItemTotal = info.AirJJ + info.CityTranffic;
+            gwcItemTotal = info.AirGW + info.CityTranffic;
+            tdcItemTotal = info.AirTD + info.CityTranffic;
+
+            return Ok(JsonView(new { jjcItemTotal = jjcItemTotal, gwcItemTotal = gwcItemTotal, tdcItemTotal = tdcItemTotal }));
         }
 
         /// <summary>
@@ -7594,31 +7584,31 @@ FROM
             if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
             if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
             if (dto.Infos.Length < 1) return Ok(JsonView(false, "请传入有效的费用信息!"));
-            var feeTypeIds = new List<int>() {1,2,3,4, };
+            var feeTypeIds = new List<int>() { 1, 2, 3, 4, };
             if (!feeTypeIds.Contains(dto.FeeType)) return Ok(JsonView(false, "请传入有效的费用类型!"));
 
             var infos1 = _mapper.Map<List<Grp_DayAndCost>>(dto.Infos);
             var infos = infos1.Select(x => new Grp_DayAndCost
-                {
-                    Id = x.Id,
-                    DiId = dto.DiId,
-                    Type = dto.FeeType,
-                    Days = x.Days,
-                    NationalTravelFeeId = x.NationalTravelFeeId,
-                    Cost = x.Cost,
-                    Currency = x.Currency,
-                    SubTotal = x.SubTotal,
-                    CreateUserId = dto.CurrUserId
-                })
+            {
+                Id = x.Id,
+                DiId = dto.DiId,
+                Type = dto.FeeType,
+                Days = x.Days,
+                NationalTravelFeeId = x.NationalTravelFeeId,
+                Cost = x.Cost,
+                Currency = x.Currency,
+                SubTotal = x.SubTotal,
+                CreateUserId = dto.CurrUserId
+            })
                 .ToList();
 
             var adds = infos.Where(x => x.Id <= 0).ToList();
             var upds = infos.Where(x => x.Id > 0).ToList();
-            var status = false;
+
             if (adds.Count > 0)
             {
                 var add = await _sqlSugar.Insertable(adds).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
             if (upds.Count > 0)
             {
@@ -7633,16 +7623,11 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
-            }
-
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            return Ok(JsonView(false));
+            var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7662,13 +7647,12 @@ FROM
             var info = _mapper.Map<Grp_DayAndCost>(dto);
             info.CreateUserId = dto.CurrUserId;
            
-            var status = false;
             if (info.Id < 1) //添加
             {
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
-            else if (info.Id > 0)
+            else
             {
                 var upd = await _sqlSugar.Updateable(info)
                     .UpdateColumns(x => new
@@ -7681,16 +7665,11 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
-            }
-
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            return Ok(JsonView(false));
+            var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7721,11 +7700,11 @@ FROM
 
             var adds = infos.Where(x => x.Id <= 0).ToList();
             var upds = infos.Where(x => x.Id > 0).ToList();
-            var status = false;
+
             if (adds.Count > 0)
             {
                 var add = await _sqlSugar.Insertable(adds).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
             if (upds.Count > 0)
             {
@@ -7741,15 +7720,11 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
-            return Ok(JsonView(false));
+            var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7766,13 +7741,13 @@ FROM
 
             var info = _mapper.Map<Grp_DayOtherPrice>(dto);
             info.CreateUserId = dto.CurrUserId;
-            var status = false;
+
             if (info.Id < 1)//add
             {
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
-            else if (info.Id > 0) //upd
+            else //upd
             {
                 var upd = await _sqlSugar.Updateable(info)
                     .UpdateColumns(x => new
@@ -7786,15 +7761,11 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
-            return Ok(JsonView(false));
+            var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         #endregion

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -4161,7 +4161,7 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> MediaSupplierInit()
         {
-            return Ok(JsonView(await _mediaSupplierRep.Init()));
+            return Ok(await _mediaSupplierRep.Init());
         }
 
         /// <summary>
@@ -4178,7 +4178,7 @@ WHERE
 
             if (dto.Id < 1) return Ok(JsonView(false, MsgTips.Port));
 
-            return Ok(JsonView(await _mediaSupplierRep.Info(dto)));
+            return Ok(await _mediaSupplierRep.Info(dto));
         }
 
         /// <summary>
@@ -4193,7 +4193,7 @@ WHERE
         {
             if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
 
-            return Ok(JsonView(await _mediaSupplierRep.PageItem(dto)));
+            return Ok(await _mediaSupplierRep.PageItem(dto));
         }
 
         /// <summary>
@@ -4212,7 +4212,7 @@ WHERE
 
             if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            return Ok(JsonView(await _mediaSupplierRep.AddOrEdit(dto)));
+            return Ok(await _mediaSupplierRep.AddOrEdit(dto));
         }
 
         /// <summary>
@@ -4232,7 +4232,7 @@ WHERE
             if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
 
-            return Ok(JsonView(await _mediaSupplierRep.SoftDel(dto)));
+            return Ok(await _mediaSupplierRep.SoftDel(dto));
         }
 
         #endregion

OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -76,6 +76,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
             result.Code = 200;
             result.Data = info;
+            result.Msg = MsgTips.Succeed;
             return result;
         }
 
@@ -112,6 +113,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 })
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
+            result.Msg = MsgTips.Succeed;
             result.Code = 200;
             result.Data = infos;
             result.Count = total;