Skip to content

M
mall.oytour.com
Commit 641a5d2d authored by liudong1993's avatar liudong1993
Browse files
Options

每日自动生成退款单

parent e03d3911
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
Mall.Module.Product/OrderModule.cs
View file @ 641a5d2d
...@@ -5008,7 +5008,8 @@ namespace Mall.Module.Product ...@@ -5008,7 +5008,8 @@ namespace Mall.Module.Product
{ {
if (tenantId == 1) if (tenantId == 1)
{ {
OrderRefundFinanceModule(model, tenantId, mallBaseId); //2020-07-03 屏蔽 改每日自动生成
//OrderRefundFinanceModule(model, tenantId, mallBaseId);
} }
goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog() goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog()
{ {
...@@ -5797,8 +5798,8 @@ namespace Mall.Module.Product ...@@ -5797,8 +5798,8 @@ namespace Mall.Module.Product
goods_OrderRepository.DBSession.Commit(); goods_OrderRepository.DBSession.Commit();
if (flag && type == 1 && tenantId == 1) if (flag && type == 1 && tenantId == 1)
{ {
//同意 创建财务单据 //同意 创建财务单据 屏蔽 改为每日自动创建
OrderRefundFinanceModule(omodel); //OrderRefundFinanceModule(omodel);
} }
return flag; return flag;
} }
...@@ -6054,8 +6055,8 @@ namespace Mall.Module.Product ...@@ -6054,8 +6055,8 @@ namespace Mall.Module.Product
{ {
if (omodel.OrderStatus != OrderStatusEnum.NonPayment) if (omodel.OrderStatus != OrderStatusEnum.NonPayment)
{ {
//同意 创建财务单据 //同意 创建财务单据 屏蔽 改为每日自动创建
OrderRefundFinanceModule(omodel, true); //OrderRefundFinanceModule(omodel, true);
} }
} }
return flag; return flag;
......
Mall.WindowsService/Module/FinanceModule.cs
View file @ 641a5d2d
...@@ -1213,7 +1213,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -1213,7 +1213,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
//goods_OrderRepository.Update(keyValues, wheres); goods_OrderRepository.Update(keyValues, wheres);
} }
foreach (var dmodel in afterList) { foreach (var dmodel in afterList) {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
...@@ -1237,7 +1237,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -1237,7 +1237,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
//goods_OrderAfterSaleRepository.Update(keyValues, wheres); goods_OrderAfterSaleRepository.Update(keyValues, wheres);
goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog() goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog()
{ {
Id = 0, Id = 0,
......
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