diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs index 38c37fe1..0b9b29d9 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs @@ -143,7 +143,8 @@ namespace CoreCms.Net.Services await _dal.UpdateAsync(p => new CoreCmsBillRefund() { status = (int)GlobalEnumVars.BillRefundStatus.STATUS_REFUND, - paymentCode = paymentCodeStr + paymentCode = paymentCodeStr, + updateTime = DateTime.Now }, p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND); jm.status = true; @@ -162,7 +163,8 @@ namespace CoreCms.Net.Services p => new CoreCmsBillRefund() { status = status, - paymentCode = paymentCodeStr + paymentCode = paymentCodeStr, + updateTime = DateTime.Now }, p => p.refundId == refundId && p.status == (int)GlobalEnumVars.BillRefundStatus.STATUS_NOREFUND); jm.status = true; diff --git a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs index 6c97be9f..5f8f5aeb 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs @@ -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.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; 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"); data2 = data; 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.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; 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"); data3 = data; 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.end.ToString("yyyy-MM-dd HH:mm:ss") + "' "; 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"); data4 = data; break;