|
@@ -50,6 +50,43 @@ namespace MySystem.Controllers
|
|
|
if(!check && !check1)
|
|
|
{
|
|
|
RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":List", order.Id.ToString());
|
|
|
+ ConsumerOrders edit = db.ConsumerOrders.FirstOrDefault(m => m.Id == order.Id);
|
|
|
+ if(edit != null)
|
|
|
+ {
|
|
|
+ edit.ReturnFlag = 1;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if(!check)
|
|
|
+ {
|
|
|
+ RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, order);
|
|
|
+ ConsumerOrders edit = db.ConsumerOrders.FirstOrDefault(m => m.Id == order.Id);
|
|
|
+ if(edit != null)
|
|
|
+ {
|
|
|
+ edit.ReturnFlag = 1;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if(!check1)
|
|
|
+ {
|
|
|
+ ConsumerOrders edit = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, 1, 10000).FirstOrDefault(m => m.Id == order.Id);
|
|
|
+ long count = RedisDbconn.Instance.DelFromList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId,edit);
|
|
|
+ if(count > 0)
|
|
|
+ {
|
|
|
+ RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":List", order.Id.ToString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(order.ReturnFlag == 0 && check && check1)
|
|
|
+ {
|
|
|
+ ConsumerOrders edit = db.ConsumerOrders.FirstOrDefault(m => m.Id == order.Id);
|
|
|
+ if(edit != null)
|
|
|
+ {
|
|
|
+ edit.ReturnFlag = 1;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|