From 557c2711a3e103ebc3d0492344eca9730d5e92b2 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 17 二月 2025 10:47:47 +0800
Subject: [PATCH] 增加司机配送单超时处理任务,防止一直不停手机定位信息,

---
 CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
index e84955d..028318e 100644
--- a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
+++ b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
@@ -1,7 +1,7 @@
 /***********************************************************************
- *            Project: CoreCms
+ *            Project: baifenBinfa
  *        ProjectName: 鐧惧垎鍏垫硶绠$悊绯荤粺                               
- *                Web: hhtp://chuanyin.com                     
+ *                Web: http://chuanyin.com                     
  *             Author:                                        
  *              Email:                               
  *         CreateTime: 202403/02   
@@ -84,7 +84,7 @@
         /// 鎻愮幇鐢宠
         /// </summary>
         /// <returns></returns>
-        public async Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId)
+        public async Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId=0, GlobalEnumVars.UserTocashType type= GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处)
         {
             var jm = new WebApiCallBack();
 
@@ -142,26 +142,30 @@
                 jm.msg = GlobalErrorCodeVars.Code11015;
                 return jm;
             }
+             CoreCmsUserBankCard bankcardsInfo = null;
+            if (type == GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处||type== GlobalEnumVars.UserTocashType.浼佷笟浠樻鍒伴摱琛屽崱)
             //鑾峰彇閾惰鍗′俊鎭�
-            var bankcardsInfo = await userBankCardServices.QueryByClauseAsync(p => p.userId == userId && p.id == bankCardsId);
-            if (bankcardsInfo == null)
             {
-                jm.msg = GlobalErrorCodeVars.Code11016;
-                return jm;
+                bankcardsInfo = await userBankCardServices.QueryByClauseAsync(p => p.userId == userId && p.id == bankCardsId);
+                if (bankcardsInfo == null)
+                {
+                    jm.msg = GlobalErrorCodeVars.Code11016;
+                    return jm;
+                }
             }
             var cashModel = new CoreCmsUserTocash();
             cashModel.userId = userId;
             cashModel.money = money;
-            cashModel.bankName = bankcardsInfo.bankName;
-            cashModel.bankCode = bankcardsInfo.bankCode;
-            cashModel.bankAreaId = bankcardsInfo.bankAreaId;
-            cashModel.accountBank = bankcardsInfo.accountBank;
-            cashModel.accountName = bankcardsInfo.accountName;
-            cashModel.cardNumber = bankcardsInfo.cardNumber;
+            cashModel.bankName = bankcardsInfo?.bankName??"寰俊闆堕挶";
+            cashModel.bankCode = bankcardsInfo?.bankCode?? "寰俊闆堕挶";
+            cashModel.bankAreaId = bankcardsInfo?.bankAreaId??510000;
+            cashModel.accountBank = bankcardsInfo?.accountBank?? "寰俊闆堕挶";
+            cashModel.accountName = bankcardsInfo?.accountName?? "寰俊闆堕挶";
+            cashModel.cardNumber = bankcardsInfo?.cardNumber?? "寰俊闆堕挶";
             cashModel.status = (int)GlobalEnumVars.UserTocashStatus.寰呭鏍�;
             cashModel.withdrawals = cateMoney;
             cashModel.createTime = DateTime.Now;
-            cashModel.type = (int)GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处;
+            cashModel.type = (int)type;
 
             var res = await _dal.InsertAsync(cashModel);
             if (res > 0)
@@ -208,6 +212,7 @@
                 foreach (var item in list)
                 {
                     item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.UserTocashStatus>(item.status);
+                    if(item.cardNumber!="寰俊闆堕挶")
                     item.cardNumber = UserHelper.BankCardNoFormat(item.cardNumber);
                 }
             }

--
Gitblit v1.9.1