Commit a59cc434 authored by 吴春's avatar 吴春

提交代码

parent b98f0b25
...@@ -431,6 +431,12 @@ namespace Mall.Module.User ...@@ -431,6 +431,12 @@ namespace Mall.Module.User
{ nameof(RB_Goods_Order_Extend.PaymentTime),Time_End}, { nameof(RB_Goods_Order_Extend.PaymentTime),Time_End},
{ nameof(RB_Goods_Order_Extend.PaymentWay),Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment} { nameof(RB_Goods_Order_Extend.PaymentWay),Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment}
}; };
if (oldOrder.TenantId == 29)
{
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now);
}
else {
if (guidebaseModel != null && guidebaseModel.IsConfirm == 2 && oldOrder.OrderClassify == 1) if (guidebaseModel != null && guidebaseModel.IsConfirm == 2 && oldOrder.OrderClassify == 1)
{ {
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving); keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
...@@ -450,7 +456,8 @@ namespace Mall.Module.User ...@@ -450,7 +456,8 @@ namespace Mall.Module.User
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving); keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now); keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now);
} }
else if (oldOrder.OrderEduType == 2) { else if (oldOrder.OrderEduType == 2)
{
if (oldOrder.DeliveryMethod == Common.Enum.Goods.OrderDeliveryMethodEnum.ExpressDistribution) if (oldOrder.DeliveryMethod == Common.Enum.Goods.OrderDeliveryMethodEnum.ExpressDistribution)
{ {
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitSendGoods); keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitSendGoods);
...@@ -515,6 +522,8 @@ namespace Mall.Module.User ...@@ -515,6 +522,8 @@ namespace Mall.Module.User
} }
//2020-11-10 Add By:W End //2020-11-10 Add By:W End
} }
}
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.OrderId), FiledName=nameof(RB_Goods_Order_Extend.OrderId),
......
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