From 0d49cda44c24c655525888b861c6e411877ccdaf Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 14 十月 2024 09:56:07 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Transfer/UserTransfer.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/cylsg/cylsg.Application/Transfer/UserTransfer.cs b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
index 0aaf219..cf480f6 100644
--- a/cylsg/cylsg.Application/Transfer/UserTransfer.cs
+++ b/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
{
--
Gitblit v1.9.1