Commit ef0a6cdd authored by 吴春's avatar 吴春
parents 4554fa9d 3c829cee
......@@ -31,6 +31,11 @@ namespace Mall.Common.Enum.User
/// 百度
/// </summary>
[EnumField("百度")]
Baidu = 4
Baidu = 4,
/// <summary>
/// H5站点
/// </summary>
[EnumField("H5")]
H5 = 5
}
}
......@@ -74,5 +74,14 @@ namespace Mall.Model.Extend.Product
/// 凭证列表
/// </summary>
public List<string> VoucherList { get; set; }
/// <summary>
/// 完成开始时间
/// </summary>
public string FStartTime { get; set; }
/// <summary>
/// 完成结束时间
/// </summary>
public string FEndTime { get; set; }
}
}
......@@ -5564,6 +5564,7 @@ namespace Mall.Module.Product
if (type == 1)
{
keyValues.Add(nameof(RB_Goods_Order.OrderStatus), OrderStatusEnum.Cancel);
keyValues.Add(nameof(RB_Goods_Order.CancelTime), DateTime.Now);
keyValues.Add(nameof(RB_Goods_Order.ApplyForCancelStatus), 1);
keyValues.Add(nameof(RB_Goods_Order.RefundOrderNo), RefundOrderNo);
}
......@@ -5828,6 +5829,7 @@ namespace Mall.Module.Product
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
keyValues.Add(nameof(RB_Goods_Order.OrderStatus), OrderStatusEnum.Cancel);
keyValues.Add(nameof(RB_Goods_Order.CancelTime), DateTime.Now);
keyValues.Add(nameof(RB_Goods_Order.RefundOrderNo), RefundOrderNo);
if (omodel.OrderStatus != OrderStatusEnum.NonPayment)
{
......@@ -6050,8 +6052,11 @@ namespace Mall.Module.Product
goods_OrderRepository.DBSession.Commit();
if (flag && tenantId == 1)
{
//同意 创建财务单据
OrderRefundFinanceModule(omodel, true);
if (omodel.OrderStatus != OrderStatusEnum.NonPayment)
{
//同意 创建财务单据
OrderRefundFinanceModule(omodel, true);
}
}
return flag;
}
......
......@@ -191,6 +191,12 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.OrderDetialId)} in({dmodel.OrderDetailIds})";
}
if (!string.IsNullOrEmpty(dmodel.FStartTime)) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.FinishTime)}>='{dmodel.FStartTime}'";
}
if (!string.IsNullOrEmpty(dmodel.FEndTime)) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.FinishTime)}<='{dmodel.FEndTime} 23:59:59'";
}
string sql = $@"SELECT oas.* FROM rb_goods_orderaftersale oas {where} order by oas.ReOrderId desc";
return Get<RB_Goods_OrderAfterSale_Extend>(sql).ToList();
......
......@@ -29,6 +29,12 @@ namespace Mall.WindowsService.Helper
Module.FinanceModule.OrderIncomeFinanceModule();
LogHelper.Write("RevenueFinance=====End");
#region 退款制单
LogHelper.Write("AutoCreateFinanceRefund=====Start");
Module.FinanceModule.AutoCreateFinanceRefund();
LogHelper.Write("AutoCreateFinanceRefund=====End");
#endregion
Interlocked.Exchange(ref inTimer, 0);
}
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment