DuGuYang 3 жил өмнө
parent
commit
3188eea242

+ 5 - 2
Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -561,7 +561,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "该订单不符合退货规则!";
                 }
-                else if (order.TotalPrice < decimal.Parse(data.RefundActAmount.ToString()) || decimal.Parse(data.RefundActAmount.ToString()) < 0)
+                else if (order.TotalPrice < decimal.Parse(data.RefundActAmount.ToString()) || decimal.Parse(data.RefundActAmount.ToString()) <= 0)
                 {
                     return "退款金额和订单金额不符!";
                 }
@@ -574,7 +574,10 @@ namespace MySystem.Areas.Admin.Controllers
                     order.RefundReason = data.RefundReason;
                     order.RefundActAmount = data.RefundActAmount;
                     db.SaveChanges();
-                    string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\"}";
+                    var Remark = "";
+                    var orderProduct = db.OrderProduct.FirstOrDefault(m => m.OrderId == order.Id) ?? new OrderProduct();
+                    Remark = orderProduct.ProductName + "退款至余额";
+                    string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\",\"Remark\":\"" + Remark + "\"}";
                     RedisDbconn.Instance.AddList("RefundQueue", SendData);
                 }
             }