Browse Source

修改运营中心额度记录备注
购买运营中心返额度可控

lcl 1 year ago
parent
commit
5b189507a4

BIN
.DS_Store


+ 1 - 1
AppStart/Helper/AlipayPayBack2Service.cs

@@ -775,7 +775,7 @@ namespace MySystem
                 {
                 {
                     AmountType = AmountType,//1 未使用额度 2 可提现额度 3 关联分仓额度
                     AmountType = AmountType,//1 未使用额度 2 可提现额度 3 关联分仓额度
                     CreateDate = DateTime.Now,
                     CreateDate = DateTime.Now,
-                    Title = "合伙人提现",
+                    Title = Remark,
                     UserId = UserId, //运营中心Id
                     UserId = UserId, //运营中心Id
                     BeforeAmount = BeforeAmount,//使用前剩余额度
                     BeforeAmount = BeforeAmount,//使用前剩余额度
                     AfterAmount = AfterAmount,//使用后剩余额度
                     AfterAmount = AfterAmount,//使用后剩余额度

+ 1 - 1
AppStart/Helper/Operate/OperateAmountService.cs

@@ -74,7 +74,7 @@ namespace MySystem
                         {
                         {
                             AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
                             AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
                             CreateDate = DateTime.Now,
                             CreateDate = DateTime.Now,
-                            Title = "合伙人提现",
+                            Title = Kind == 1 ? "机具激活返还" : "机具券兑换返还",
                             UserId = UserId, //运营中心Id
                             UserId = UserId, //运营中心Id
                             BeforeAmount = BeforeAmount,//使用前剩余额度
                             BeforeAmount = BeforeAmount,//使用前剩余额度
                             AfterAmount = AfterAmount,//使用后剩余额度
                             AfterAmount = AfterAmount,//使用后剩余额度

+ 5 - 5
AppStart/Helper/PosCouponPrize/OperateAddService.cs

@@ -54,6 +54,11 @@ namespace MySystem
             OpModels.SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id);
             OpModels.SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             if (edit != null)
             {
             {
+                decimal ReturnAmount = 0;
+                if(edit.ReturnAmount > 0)
+                {
+                    ReturnAmount = edit.ReturnAmount;
+                }
                 if(edit.ReturnFlag == 0)
                 if(edit.ReturnFlag == 0)
                 {
                 {
                     return;
                     return;
@@ -63,11 +68,6 @@ namespace MySystem
                 {
                 {
                     return;
                     return;
                 }
                 }
-                decimal ReturnAmount = 160000M;
-                if(edit.ReturnAmount > 0)
-                {
-                    ReturnAmount = edit.ReturnAmount;
-                }
                 string ParentNav = orderUser.ParentNav;
                 string ParentNav = orderUser.ParentNav;
                 string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
                 string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
                 Array.Reverse(ParentNavList);
                 Array.Reverse(ParentNavList);

+ 1 - 1
AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -545,7 +545,7 @@ namespace MySystem
                 {
                 {
                     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
                     AmountType = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
                     CreateDate = DateTime.Now,
                     CreateDate = DateTime.Now,
-                    Title = "合伙人提现",
+                    Title = Remark,
                     UserId = UserId, //运营中心Id
                     UserId = UserId, //运营中心Id
                     BeforeAmount = BeforeAmount,//使用前剩余额度
                     BeforeAmount = BeforeAmount,//使用前剩余额度
                     AfterAmount = AfterAmount,//使用后剩余额度
                     AfterAmount = AfterAmount,//使用后剩余额度

+ 1 - 1
AppStart/Helper/TimeOutPosChargeService.cs

@@ -266,7 +266,7 @@ namespace MySystem
                             {
                             {
                                 AmountType = 2,
                                 AmountType = 2,
                                 CreateDate = DateTime.Now,
                                 CreateDate = DateTime.Now,
-                                Title = "合伙人提现",
+                                Title = "运营中心预扣款",
                                 UserId = UserId, //运营中心Id
                                 UserId = UserId, //运营中心Id
                                 BeforeAmount = opUserAccount.ValidForGetAmount,//使用前剩余额度
                                 BeforeAmount = opUserAccount.ValidForGetAmount,//使用前剩余额度
                                 AfterAmount = opUserAccount.ValidForGetAmount - record.ChargeAmount,//使用后剩余额度
                                 AfterAmount = opUserAccount.ValidForGetAmount - record.ChargeAmount,//使用后剩余额度

+ 1 - 1
Util/Utils.cs

@@ -187,7 +187,7 @@ namespace MySystem
             Levels.Add(leaderRank.Rank);
             Levels.Add(leaderRank.Rank);
             Levels.Add(operatorRank.Rank);
             Levels.Add(operatorRank.Rank);
             db.Dispose();
             db.Dispose();
-            return Levels.Max();
+            return Levels.Max(); 
         }
         }
         #endregion
         #endregion