From 63a83521fa76fbbbd39656d85ec5a251c46e0ed3 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 02 一月 2025 10:36:13 +0800
Subject: [PATCH] 修正发增加欠费错误重新发起支付
---
cylsg/cylsg.Application/Transfer/UserTransfer.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/cylsg/cylsg.Application/Transfer/UserTransfer.cs b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
index 137496d..a464ff8 100644
--- a/cylsg/cylsg.Application/Transfer/UserTransfer.cs
+++ b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -285,7 +285,7 @@
SearchList = SearchList.And(x =>x.IsSetOK==param.IsSetOK);
}
if (param.HasSendOk == false)
- SearchList= SearchList.And(x => x.FailNum >0||x.BatchStatus!= "FINISHED");
+ SearchList= SearchList.And(x =>( x.FailNum >0||x.BatchStatus!= "FINISHED")||(x.BatchStatus==null&&x.ErrorCode== "NOT_ENOUGH")); //NOT_ENOUGH 鏄处鎴锋病鏈夐挶
else
//鏈変竴绗斿ぇ浣�0 鐨勮涓哄け璐�
SearchList= SearchList.And(x => x.FailNum ==0&&x.BatchStatus=="FINISHED");
@@ -358,7 +358,7 @@
{
throw Oops.Oh("宸茬粡澶勭悊涓嶅啀澶勭悊");
}
- if(!(TOrder.ErrorCode== "INVALID_REQUEST"&&TOrder.ErrorMsg== "瀵瑰簲鍗曞彿宸茶秴鍑洪噸璇曟湡,璇锋煡鍗曠‘璁ゅ悗鍐冲畾鏄惁鎹㈠崟璇锋眰"))
+ if(!((TOrder.ErrorCode== "INVALID_REQUEST"&&TOrder.ErrorMsg== "瀵瑰簲鍗曞彿宸茶秴鍑洪噸璇曟湡,璇锋煡鍗曠‘璁ゅ悗鍐冲畾鏄惁鎹㈠崟璇锋眰")|| (TOrder.ErrorCode == "NOT_ENOUGH")))
{
//涓嶆弧瓒冲啿娲楁敮浠樿姹�
throw Oops.Oh("涓嶆弧瓒抽噸鏂版敮浠樿姹�");
@@ -366,7 +366,25 @@
var rs = new BaseRepository<UserWorker>();
var userid = TOrder.UserID;
- var Money = (TOrder.FailAmount??0)/100m;
+ decimal Money = 0;
+
+ if (TOrder.FailAmount==null)
+ {
+ decimal overTotal = 0;
+ if (TOrder.BatchId == null)
+ {
+ overTotal = 0;//娌℃湁鏀粯鍗曪紝璇佹槑娌℃湁鏀粯
+ }
+ else
+ overTotal = (TOrder.SuccessAmount??0)/100m;
+
+
+ //杩欎釜鏄病鏈夊垱寤烘彁浜ゅ崟 鎸夊師浠烽噸鏂版敮浠�
+ Money = ((TOrder.TotalAmount??0)/100m)-overTotal;
+
+ }
+ else
+ Money = (TOrder.FailAmount??0)/100m;
if(Money<0.03m)
{
throw Oops.Oh("澶辫触閲戦涓嶈冻0.3鍏冧笉鑳藉啀娆″彂璧锋敮浠�");
@@ -406,9 +424,9 @@
var UserTiXianDetailwork = new BaseRepository<UserTiXianDetail>();
var WeChatTransferOrderwork = new BaseRepository<WeChatTransferOrder>();
- if ((uw != null) && (((uw.TiXianZonge ?? 0) - (uw.YiTiXianJine ?? 0)) >= Money))
+ if ((uw != null) && Money<= (uw.TiXianZonge ?? 0))
{
- //婊¤冻鏉′欢锛屽彂璧锋敮浠�
+ //婊¤冻鏉′欢锛屽彂璧锋敮浠� 杩欓噷涓嶅垽鏂敮浠橀噾棰濆ぇ楸煎彲鎻愮幇浣欓
var TransferOrder = new WeChatTransferOrder
{
@@ -509,7 +527,7 @@
}
else
{
- throw Oops.Oh("绯荤粺閿欒");
+ throw Oops.Oh("娌℃湁宸ヤ綔璧勬枡鎴栬�呮槸鎻愮幇棰濆害宸茬粡澶т綑鎬婚浜�");
}
}
--
Gitblit v1.9.1