wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 19:53:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复财务报表统计中对充值统计纬度类型传送错误的问题。

Browse Source 
【修复】修复退款单处理未更新【更新时间】字段的问题。
This commit is contained in:
JianWeie
2022-06-09 12:19:01 +08:00
parent 2227cc1ee1
commit 5687d54ecc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs
View File

@@ -143,7 +143,8 @@ namespace CoreCms.Net.Services
await _dal.UpdateAsync(p => new CoreCmsBillRefund() await _dal.UpdateAsync(p => new CoreCmsBillRefund()
{ {
status = (int)GlobalEnumVars.BillRefundStatus.STATUS_REFUND, status = (int)GlobalEnumVars.BillRefundStatus.STATUS_REFUND,
paymentCode = paymentCodeStr paymentCode = paymentCodeStr,
updateTime = DateTime.Now
}, },
p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND); p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND);
jm.status = true; jm.status = true;
@@ -162,7 +163,8 @@ namespace CoreCms.Net.Services
p => new CoreCmsBillRefund() p => new CoreCmsBillRefund()
{ {
status = status, status = status,
paymentCode = paymentCodeStr paymentCode = paymentCodeStr,
updateTime = DateTime.Now
}, },
p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND); p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND);
jm.status = true; jm.status = true;

6
CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs
View File

@@ -225,7 +225,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content
whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and status = 2 "; whereSql += " and status = 2 ";
whereSql += " and type = 1 "; whereSql += " and type = " + (int)GlobalEnumVars.BillPaymentsType.Common + " ";
data = _reportsServices.GetPaymentsMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime"); data = _reportsServices.GetPaymentsMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime");
data2 = data; data2 = data;
break; break;
@@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content
whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and status = 2 "; whereSql += " and status = 2 ";
whereSql += " and type = 1 "; whereSql += " and type = " + (int)GlobalEnumVars.BillPaymentsType.Common + " ";
data = _reportsServices.GetRefundMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime"); data = _reportsServices.GetRefundMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime");
data3 = data; data3 = data;
break; break;
@@ -243,7 +243,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content
whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime > '" + getDate.start.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; whereSql += " and updateTime < '" + getDate.end.ToString("yyyy-MM-dd HH:mm:ss") + "' ";
whereSql += " and status = 2 "; whereSql += " and status = 2 ";
whereSql += " and type = 2 "; whereSql += " and type = " + (int)GlobalEnumVars.BillPaymentsType.Recharge + " ";
data = _reportsServices.GetPaymentsMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime"); data = _reportsServices.GetPaymentsMark(getDate.num, whereSql, getDate.section, getDate.start, "updateTime");
data4 = data; data4 = data;
break; break;