移动系统liao
2024-10-14 0d49cda44c24c655525888b861c6e411877ccdaf
cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -105,7 +105,7 @@
                    var UserTiXianDetailwork = new BaseRepository<UserTiXianDetail>();
                    var WeChatTransferOrderwork = new BaseRepository<WeChatTransferOrder>();
                    if ((uw != null) && ((uw.TiXianZonge - uw.YiTiXianJine) >= Money))
                    if ((uw != null) && (((uw.TiXianZonge??0) - (uw.YiTiXianJine??0)) >= Money))
                    {
                        //满足条件,发起支付
                        var TransferOrder = new WeChatTransferOrder
@@ -185,10 +185,11 @@
                                ZhiChuShouRu = 0,
                                YiTiXianJine = Money,
                                WeChatTransferOrderID = TransferOrder.Id,
                                Remark = "用户提现"
                            });
                            //钱包余额调整
                            uw.YiTiXianJine += Money;
                            uw.YiTiXianJine = (uw.YiTiXianJine??0)+ Money;
                            uw.UpDataBy = uw.UserId.ToString();
                            uw.UpDataTime = DateTime.Now;
                            await rs.UpdateAsync(uw);
@@ -211,6 +212,10 @@
                    }
                    else
                    {
                        throw Oops.Oh("系统错误");
                    }
                }
@@ -251,7 +256,7 @@
        /// </summary>
        [AllowAnonymous]
        [HttpPost]
        [ApiExplorerSettings(IgnoreApi = true)]
        //[ApiExplorerSettings(IgnoreApi = true)]
        public async Task<TransferOderOut> GetTransferOder(SearchTransferOder param)
        {
@@ -276,10 +281,15 @@
                }
            }
            if (param.HasSendOk == false)
                SearchList= SearchList.And(x => x.BatchId == null);
                SearchList= SearchList.And(x => x.FailNum >0||x.BatchStatus!= "FINISHED");
            else
                SearchList= SearchList.And(x => x.BatchId != null);
            var data = await WeChatTransferOrderwork.GetPageListAsync(SearchList, pageModel);
                //有一笔大余0 的视为失败
                SearchList= SearchList.And(x => x.FailNum ==0&&x.BatchStatus== "FINISHED");
             var data=await WeChatTransferOrderwork.AsQueryable().Where(SearchList).Select(x=>new WeChatTransferOrder
             {
               BatchRemark= SqlFunc.Subqueryable<UserWorker>().Where(uw=>uw.UserId==x.UserID).Select(uw => uw.name+ uw.IdCode)
             }).ToPageListAsync(pageModel.PageIndex, pageModel.PageSize,pageModel.TotalCount);
            //var data = await WeChatTransferOrderwork.GetPageListAsync(SearchList, pageModel);
              
            return new TransferOderOut
            {