灵活用工工资计算，修改bug

username@email.com

2026-04-09 ebda5e08f2c9e7a8c4fec39e59c2753c6bd45372

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -307,7 +307,8 @@
            orderBidding.Selectedtime = DateTime.Now;
            orderBidding.UpDataBy = NickName;
            orderBidding.UpDataTime = DateTime.Now;

            //是否是半固定临时工
            orderBidding.IsGuding = queRenDto.IsGuding;

            res = await orderBiddingRes.UpdateAsync(orderBidding);

@@ -330,6 +331,98 @@
            orderBiddingWorkPrice.CreateBy = NickName;
            orderBiddingWorkPrice.CreateTime = DateTime.Now;
            res = await orderBiddingWorkPriceRes.InsertAsync(orderBiddingWorkPrice);

            return res;
        }


        /// <summary>
        /// 设置员工是半固定临时工是否是
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        public async Task<bool> GudingGongren(BangudingDto bangudingDto)
        {

            var UserID = App.User?.FindFirstValue("UserID");
            int userid = 0;
            string NickName = App.User?.FindFirstValue("NickName");
            if (!string.IsNullOrEmpty(UserID))
            {
                userid = int.Parse(UserID);
            }

            var orderBiddingRes = new BaseRepository<OrderBidding>();

            var orderBidding = await orderBiddingRes.GetByIdAsync(bangudingDto.OrderBiddingId);
            if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
            {
                throw Oops.Oh("该投递已经无效！");
            }





            bool res;

            orderBidding.IsGuding = bangudingDto.IsGuding;

            orderBidding.UpDataBy = NickName;
            orderBidding.UpDataTime = DateTime.Now;


            res = await orderBiddingRes.UpdateAsync(orderBidding);



            return res;
        }




        /// <summary>
        /// 公司收藏工人
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        public async Task<bool> ShoucangGongren(ShoucangDto shoucangDto)
        {

            var UserID = App.User?.FindFirstValue("UserID");
            int userid = 0;
            string NickName = App.User?.FindFirstValue("NickName");
            if (!string.IsNullOrEmpty(UserID))
            {
                userid = int.Parse(UserID);
            }

            var orderBiddingRes = new BaseRepository<OrderBidding>();

            var orderBidding = await orderBiddingRes.GetByIdAsync(shoucangDto.OrderBiddingId);
            if (orderBidding == null || orderBidding.IsEn != true || orderBidding.IsDeleted == true)
            {
                throw Oops.Oh("该投递已经无效！");
            } 

          



            bool res;

            orderBidding.IsCollect = shoucangDto.IsCollect;
        
            orderBidding.UpDataBy = NickName;
            orderBidding.UpDataTime = DateTime.Now;


            res = await orderBiddingRes.UpdateAsync(orderBidding);

            

            return res;
        }
@@ -604,6 +697,8 @@
            var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
            var orderBiddingDetailCheckRepository = new BaseRepository<OrderBiddingDetailCheck>();
            var userWorkerRes = new BaseRepository<UserWorker>();
            var orderBiddingRes = new BaseRepository<OrderBidding>();

            var data = await orderRepository.Context.Queryable<Order, OrderBidding, OrderBiddingDetail, UserWorker>((a, b, c, d) =>
                 new JoinQueryInfos(JoinType.Inner, a.Id == b.OrderId,
                 JoinType.Inner, b.Id == c.OrderBiddingId,
@@ -634,6 +729,7 @@
                          WorkerUserId = b.WorkerUserId,
                          WorkerUserName = d.name,
                          OrderBiddingId = c.OrderBiddingId,
                          IsGuding = b.IsGuding,
                      })
                      
                    .ToPageListAsync(page.PageIndex, page.PageSize, total);
@@ -662,6 +758,10 @@
                {
                    int hours = 0;
                    int minutes = 0;

                    int jiabanhours = 0;
                    int jiabanminutes = 0;

                    var orderBiddingDetailChecks = await orderBiddingDetailCheckRepository.GetListAsync(x => x.OrderBiddingDetailId == dakaDto.OrderBiddingDetailId && x.IsEn == true && x.IsDeleted == false);
                    string DakaMingxi = "";
                    for (int i = 0; i < orderBiddingDetailChecks.Count; i++)
@@ -681,14 +781,37 @@
                            hours += timeDifference.Hours;
                            minutes += timeDifference.Minutes;


                            // 获取当前时间
                            DateTime now = DateTime.Now;

                            // 创建一个表示晚上8点的时间（假定今天）
                            DateTime eveningTime = new DateTime(orderBiddingDetailChecks[i].Checktime.Value.Year, orderBiddingDetailChecks[i].Checktime.Value.Month, orderBiddingDetailChecks[i].Checktime.Value.Day, 20, 0, 0); // 20:00:0
                            //计算是否为晚上8点后的加班时间
                            if (orderBiddingDetailChecks[i].Checktime.Value > eveningTime )
                            {
                                var timeDifferencejiaban = orderBiddingDetailChecks[i].Checktime.Value - eveningTime;
                                jiabanhours += timeDifferencejiaban.Hours;
                                jiabanminutes += timeDifferencejiaban.Minutes;
                            }

                        }
                    }
                    var orderBidding = await orderBiddingRes.GetByIdAsync(dakaDto.OrderBiddingId);
                    //当前有效的工价
                    var orderBiddingWorkPrices = await orderBiddingWorkPriceRepository.GetListAsync(x => x.OrderBiddingId == dakaDto.OrderBiddingId && x.IsEn == true && x.IsDeleted == false && x.EffectTime <= dakaDto.WorkDate);
                    var orderBiddingWorkPrice = orderBiddingWorkPrices.OrderByDescending(x => x.Id).FirstOrDefault();
                    if (orderBiddingWorkPrice != null)
                    {
                        dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                        //如果为半固定的临时工，工价固定11块
                        if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
                        {
                            dakaDto.WorkPrice = 11;
                        }
                        else
                        {
                            dakaDto.WorkPrice = orderBiddingWorkPrice.WorkPrice;
                        }       
                    }
                    //如果当天还没有填写申请，则计算工作时间和工资
                    if (dakaDto.IsShenPi == 0)
@@ -699,6 +822,13 @@
                        if (dakaDto.WorkerType == 0)
                        {
                            dakaDto.TodaySalary = dakaDto.WorkTime * dakaDto.WorkPrice;

                            //如果为半固定的临时工，加班每个小时增加4块钱
                            if (orderBidding != null && orderBidding.IsGuding.HasValue && orderBidding.IsGuding.Value == true)
                            {
                                var jiabanshijian = jiabanhours + (jiabanminutes / 60);
                                dakaDto.TodaySalary += (jiabanshijian * 4);
                            }
                        }
                        else
                        {