Merge branch 'feature-dgy-BUG修复' into DuGuYang

后台-辅助工具-售后换新/坏机换新 功能未考虑运营中心额度

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1394,6 +1394,61 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CustomerSqlConn.op("insert into PosMerchantInfo select * from PosMerchantInfoBak where KqMerNo='" + MerNo + "'", MysqlConn.connstr);
                 }
+
+                if (oldpos.OpId > 0)
+                {
+                    if (oldpos.ActivationState == 0)
+                    {
+                        var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+                        decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+                        opUserAccount.ValidAmount += oldpos.OpReserve3;
+                        opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
+                        opUserAccount.TotalAmt += oldpos.OpReserve1;
+
+                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = oldpos.OpId,
+                            SeoDescription = "机具换绑",
+                            OperateType = 1,
+                            UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                            BeforeAmount = TotalAmount,
+                            AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                        }).Entity;
+
+                        oldpos.OpReserve1 = 0;
+                        oldpos.OpReserve2 = 0;
+                        oldpos.OpReserve3 = 0;
+                    }
+                    else
+                    {
+                        if (newpos.OpId > 0)
+                        {
+                            var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == newpos.OpId && m.UserId == newpos.OpId) ?? new OpModels.UserAccount();
+                            decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+                            opUserAccount.ValidAmount += newpos.OpReserve3;
+                            opUserAccount.ValidForGetAmount += newpos.OpReserve2;
+                            opUserAccount.TotalAmt += newpos.OpReserve1;
+
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = newpos.OpId,
+                                SeoDescription = "机具换绑",
+                                OperateType = 1,
+                                UseAmount = newpos.OpReserve3 + newpos.OpReserve2 + newpos.OpReserve1,
+                                BeforeAmount = TotalAmount,
+                                AfterAmount = TotalAmount + newpos.OpReserve3 + newpos.OpReserve2 + newpos.OpReserve1,
+                            }).Entity;
+
+                            newpos.OpReserve1 = 0;
+                            newpos.OpReserve2 = 0;
+                            newpos.OpReserve3 = 0;
+                        }
+                    }
+                }
+                opdb.SaveChanges();
+
                 merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
                 newpos.BindMerchantId = merchant.Id;
                 newpos.BuyUserId = oldpos.BuyUserId;
@@ -1478,6 +1533,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 }));
             }
+            if (BackStore.UserId != OutStore.UserId)
+            {
+                RedisDbconn.Instance.AddList("ResetStoreReserveQueue", BackStore.UserId);
+                RedisDbconn.Instance.AddList("ResetStoreReserveQueue", OutStore.UserId);
+            }
             return "success";
         }
         #endregion
@@ -1589,6 +1649,36 @@ namespace MySystem.Areas.Admin.Controllers
                     storeFromUserAcount.ValidAmount += amount;
                     storeBackUserAcount.ValidAmount -= amount;
 
+                    if (oldpos.OpId > 0)
+                    {
+                        if (newpos.OpId > 0)
+                        {
+                            var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+                            decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+                            opUserAccount.ValidAmount += oldpos.OpReserve3;
+                            opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
+                            opUserAccount.TotalAmt += oldpos.OpReserve1;
+
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = oldpos.OpId,
+                                SeoDescription = "坏机换新",
+                                OperateType = 1,
+                                UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                                BeforeAmount = TotalAmount,
+                                AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                            }).Entity;
+                        }
+                        if (newpos.OpId == 0)
+                        {
+                            newpos.OpReserve1 = oldpos.OpReserve1;
+                            newpos.OpReserve2 = oldpos.OpReserve3;
+                            newpos.OpReserve3 = oldpos.OpReserve1;
+                            newpos.OpId = oldpos.OpId;
+                        }
+                    }
+
                     newpos.BuyUserId = oldpos.BuyUserId;
                     newpos.UserId = oldpos.UserId;
                     newpos.RecycEndDate = oldpos.RecycEndDate;
@@ -1660,6 +1750,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
+                    opdb.SaveChanges();
 
                     PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
                     if (merchant != null)
@@ -1809,6 +1900,35 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                     }
+                    if (oldpos.OpId > 0)
+                    {
+                        if (newpos.OpId > 0)
+                        {
+                            var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
+                            decimal TotalAmount = opUserAccount.ValidAmount + opUserAccount.TotalAmt + opUserAccount.ValidForGetAmount;//旧的总金额
+                            opUserAccount.ValidAmount += oldpos.OpReserve3;
+                            opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
+                            opUserAccount.TotalAmt += oldpos.OpReserve1;
+
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = oldpos.OpId,
+                                SeoDescription = "坏机换新",
+                                OperateType = 1,
+                                UseAmount = oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                                BeforeAmount = TotalAmount,
+                                AfterAmount = TotalAmount + oldpos.OpReserve3 + oldpos.OpReserve2 + oldpos.OpReserve1,
+                            }).Entity;
+                        }
+                        if (newpos.OpId == 0)
+                        {
+                            newpos.OpReserve1 = oldpos.OpReserve1;
+                            newpos.OpReserve2 = oldpos.OpReserve3;
+                            newpos.OpReserve3 = oldpos.OpReserve1;
+                            newpos.OpId = oldpos.OpId;
+                        }
+                    }
 
                     oldpos.StoreId = storeBack.Id;
                     oldpos.QueryCount = 0;
@@ -1853,6 +1973,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
+                    opdb.SaveChanges();
 
                     BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
                     {