From 16b063870156db78148440971ab46c649e3e6018 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 19 三月 2025 11:44:22 +0800
Subject: [PATCH] 测试定版，

---
 cylsg/cylsg.Application/Transfer/UserTransfer.cs |   78 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/cylsg/cylsg.Application/Transfer/UserTransfer.cs b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
index a464ff8..60a5fad 100644
--- a/cylsg/cylsg.Application/Transfer/UserTransfer.cs
+++ b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -1,6 +1,7 @@
 锘縰sing cylsg.Core;
 using cylsg.Model.TransferOrder;
 using cylsg.Model.UserModel;
+using cylsg.Model.utilityViewModel;
 using cylsg.utility;
 using cylsg.utility.Extend;
 using Cylsg.Filter;
@@ -19,6 +20,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using TencentCloud.Ame.V20190916.Models;
+using TencentCloud.Domain.V20180808.Models;
 using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsLeadsGetLeadsInfoByComponentIdResponse.Types;
 
 namespace cylsg.Application.Transfer
@@ -285,7 +287,7 @@
                 SearchList = SearchList.And(x =>x.IsSetOK==param.IsSetOK);
             }
             if (param.HasSendOk == false)
-                SearchList= SearchList.And(x =>( x.FailNum >0||x.BatchStatus!= "FINISHED")||(x.BatchStatus==null&&x.ErrorCode== "NOT_ENOUGH")); //NOT_ENOUGH 鏄处鎴锋病鏈夐挶
+                SearchList= SearchList.And(x =>( x.FailNum >0||x.BatchStatus!= "FINISHED")||(x.BatchStatus==null&&x.ErrorCode== "NOT_ENOUGH")||x.FailAmount>0); //NOT_ENOUGH 鏄处鎴锋病鏈夐挶
             else
                 //鏈変竴绗斿ぇ浣�0 鐨勮涓哄け璐�
                 SearchList= SearchList.And(x => x.FailNum ==0&&x.BatchStatus=="FINISHED");
@@ -358,7 +360,7 @@
             {
                 throw Oops.Oh("宸茬粡澶勭悊涓嶅啀澶勭悊");
             }
-           if(!((TOrder.ErrorCode== "INVALID_REQUEST"&&TOrder.ErrorMsg== "瀵瑰簲鍗曞彿宸茶秴鍑洪噸璇曟湡,璇锋煡鍗曠‘璁ゅ悗鍐冲畾鏄惁鎹㈠崟璇锋眰")|| (TOrder.ErrorCode == "NOT_ENOUGH")))
+           if(!((TOrder.ErrorCode== "INVALID_REQUEST"&&TOrder.ErrorMsg== "瀵瑰簲鍗曞彿宸茶秴鍑洪噸璇曟湡,璇锋煡鍗曠‘璁ゅ悗鍐冲畾鏄惁鎹㈠崟璇锋眰")|| (TOrder.ErrorCode == "NOT_ENOUGH")||(TOrder.FailAmount>0)))
             {
                 //涓嶆弧瓒冲啿娲楁敮浠樿姹�
                 throw Oops.Oh("涓嶆弧瓒抽噸鏂版敮浠樿姹�");
@@ -883,9 +885,76 @@
         }
 
 
+        /// <summary>
+        /// 鑾峰彇鍒楄〃璇︽儏
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<RetPageData<WeChatTransferOrder>> GetTransferOrder(SSPageByWhereOrder Param)
+        {
+            if (Param.Page == null)
+                throw Oops.Oh("鍙傛暟閿欒");
+
+            Expression<Func<WeChatTransferOrder, bool>> where = null;
+     
+
+            if (!string.IsNullOrEmpty( Param.Where as string))
+            {
+              //where =   CommonHelper.FormatWhereExpression<WeChatTransferOrder>(Param.Where);
+ where =   CommonHelper.FormatWhereExpression<WeChatTransferOrder>(Param.Where as string);
+
+            }
+            Expression<Func<WeChatTransferOrder, object>> order = null;
+            if (Param.Order?.Name!=null)
+            {
+                 order = CommonHelper.FormatPropertyExpression<WeChatTransferOrder>(Param.Order.Name);
+
+            }
+            RefAsync<int> title = 0;
+            var BR = new BaseRepository<WeChatTransferOrder>();
+          var data=  await BR.AsQueryable().Includes(x=>x.user,u=>u.Worek).Select(x=>new WeChatTransferOrder
+          {
+               UserIDCode= x.user.Worek.IdCode,
+                UserName=x.user.Worek.name,
+                 TotalAmount=x.TotalAmount,
+               TotalNum=x.TotalNum,
+              BatchId=x.BatchId,
+               SuccessNum=x.SuccessNum,
+              OutBatchNumber=x.OutBatchNumber,
+              BatchName = x.BatchName,
+              BatchStatus=x.BatchStatus,
+              UserID= x.UserID,
+              UpDataTime=x.UpDataTime,
+              YiTiXianGz=x.user.Worek.YiTiXianJine,
+               ZhongGz=x.user.Worek.TiXianZonge,
+              ItCode=x.user.ItCode,
+              SuccessAmount= x.SuccessAmount,
+              FailAmount=x.FailAmount
+              
+
+
+
+
+
+
+          }).MergeTable().WhereIF(where != null, where).OrderByIF(order!=null,order,Param.Order?.Des?? OrderByType.Asc).ToPageListAsync(Param.Page.PageIndex,Param.Page.PageSize, title);
+
+         
+
+            Param.Page.TotalCount = title;
+             
+            return new RetPageData<WeChatTransferOrder>()
+            { 
+                 data= data,
+                  Page=Param.Page,
+             };
+;        }
+
+
     }
     /// <summary>
-    /// 
+    /// 鏀剁储
     /// </summary>
     public class SearchTransferOder
     {
@@ -961,4 +1030,7 @@
 
     }
 
+
+    
+
 }

--
Gitblit v1.9.1