辅助工具机具换新继承大pos标记OpId

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2157,13 +2157,6 @@ namespace MySystem.Areas.Admin.Controllers
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                         }
-                        if (newpos.OpId == 0)
-                        {
-                            newpos.OpReserve1 = oldpos.OpReserve1;
-                            newpos.OpReserve2 = oldpos.OpReserve3;
-                            newpos.OpReserve3 = oldpos.OpReserve1;
-                            newpos.OpId = oldpos.OpId;
-                        }
                     }
 
                     newpos.BuyUserId = oldpos.BuyUserId;
@@ -2184,11 +2177,11 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.PrizeParams = oldpos.PrizeParams;
                     newpos.LeaderUserId = oldpos.LeaderUserId;
                     newpos.BindMerchantId = oldpos.BindMerchantId;
-
                     newpos.StoreId = oldpos.StoreId;
                     newpos.PreUserId = oldpos.PreUserId;
                     newpos.FirstFlag = oldpos.FirstFlag;
                     newpos.IsExecute = oldpos.IsExecute;
+                    newpos.OpId = oldpos.OpId;
 
                     if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
@@ -2436,6 +2429,7 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.TransferTime = oldpos.TransferTime;
                     newpos.FirstFlag = oldpos.FirstFlag;
                     newpos.IsExecute = oldpos.IsExecute;
+                    newpos.OpId = oldpos.OpId;
 
                     if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
@@ -2468,13 +2462,6 @@ namespace MySystem.Areas.Admin.Controllers
 
                             RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                         }
-                        if (newpos.OpId == 0)
-                        {
-                            newpos.OpReserve1 = oldpos.OpReserve1;
-                            newpos.OpReserve2 = oldpos.OpReserve3;
-                            newpos.OpReserve3 = oldpos.OpReserve1;
-                            newpos.OpId = oldpos.OpId;
-                        }
                     }
 
                     var BeforeDeposit = 0;
@@ -2769,13 +2756,6 @@ namespace MySystem.Areas.Admin.Controllers
 
                         RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                     }
-                    if (newpos.OpId == 0)
-                    {
-                        newpos.OpReserve1 = oldpos.OpReserve1;
-                        newpos.OpReserve2 = oldpos.OpReserve3;
-                        newpos.OpReserve3 = oldpos.OpReserve1;
-                        newpos.OpId = oldpos.OpId;
-                    }
                 }
 
                 //发出方
@@ -2840,8 +2820,8 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.BindMerchantId = oldpos.BindMerchantId;
                 newpos.FirstFlag = oldpos.FirstFlag;
                 newpos.IsExecute = oldpos.IsExecute;
-
                 newpos.PreUserId = oldpos.PreUserId;
+                newpos.OpId = oldpos.OpId;
 
                 if (!opData.Contains(newpos.BuyUserId + ":" + newpos.BrandId))
                 {
@@ -2952,7 +2932,6 @@ namespace MySystem.Areas.Admin.Controllers
                         Title = "创客跨品牌换机", //标题
                         Summary = "您的旧机 " + brandInfo.Name + " SN:" + OldSnNum + "已经成功为您换为" + brandNew.Name + "SN:" + NewSnNum + "。",
                         CreateDate = DateTime.Now,
-
                     }));
                 }