Browse Source

设置押金保存状态

lcl 1 year ago
parent
commit
0e87239adc

+ 4 - 4
AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -85,8 +85,8 @@ namespace MySystem
                                     function.WriteLog("互斥机具---sn:" + check.KqSnNo + ",merno:" + check.KqMerNo + ",name:" + check.MerchantName, "监控机具是否互斥");
                                     function.WriteLog("互斥机具---sn:" + check.KqSnNo + ",merno:" + check.KqMerNo + ",name:" + check.MerchantName, "监控机具是否互斥");
                                     IsFirst = 0;
                                     IsFirst = 0;
 
 
-                                    PublicFunction.FeeSetRecord(db, pos, check, 0.63M);
-                                    string info = "{\"RecordId\":\"\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
+                                    int RecordId = PublicFunction.FeeSetRecord(db, pos, check, 0.63M);
+                                    string info = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
                                     RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                     RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                 }
                                 }
                             }
                             }
@@ -95,8 +95,8 @@ namespace MySystem
 
 
                             if(pos.PrizeParams == "0")
                             if(pos.PrizeParams == "0")
                             {
                             {
-                                PublicFunction.FeeSetRecord(db, pos, merinfo, 0.63M);
-                                string info = "{\"RecordId\":\"\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
+                                int RecordId = PublicFunction.FeeSetRecord(db, pos, merinfo, 0.63M);
+                                string info = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
                                 RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                 RedisDbconn.Instance.AddList("SetDepositQueue", info);
                             }
                             }
                             
                             

+ 4 - 4
AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -95,8 +95,8 @@ namespace MySystem
                                         {
                                         {
                                             function.WriteLog("互斥机具---sn:" + check.KqSnNo + ",merno:" + check.KqMerNo + ",name:" + check.MerchantName, "监控机具是否互斥");
                                             function.WriteLog("互斥机具---sn:" + check.KqSnNo + ",merno:" + check.KqMerNo + ",name:" + check.MerchantName, "监控机具是否互斥");
                                             IsFirst = 0;
                                             IsFirst = 0;
-                                            PublicFunction.FeeSetRecord(db, pos, check, 0.63M);
-                                            string info = "{\"RecordId\":\"\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
+                                            int RecordId = PublicFunction.FeeSetRecord(db, pos, check, 0.63M);
+                                            string info = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
                                             RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                             RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                         }
                                         }
                                     }
                                     }
@@ -175,8 +175,8 @@ namespace MySystem
 
 
                                 if(pos.PrizeParams == "0")
                                 if(pos.PrizeParams == "0")
                                 {
                                 {
-                                    PublicFunction.FeeSetRecord(db, pos, add, 0.63M);
-                                    string info = "{\"RecordId\":\"\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
+                                    int RecordId = PublicFunction.FeeSetRecord(db, pos, add, 0.63M);
+                                    string info = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
                                     RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                     RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                 }
                                 }
 
 

+ 3 - 1
AppStart/PublicFunction.cs

@@ -38,7 +38,7 @@ namespace MySystem
             return "";
             return "";
         }
         }
 
 
-        public static void FeeSetRecord(WebCMSEntities db, PosMachinesTwo pos, PosMerchantInfo mer, decimal ChangeFee)
+        public static int FeeSetRecord(WebCMSEntities db, PosMachinesTwo pos, PosMerchantInfo mer, decimal ChangeFee)
         {
         {
             PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id && m.Status == 0);
             PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id && m.Status == 0);
             if(query == null)
             if(query == null)
@@ -66,6 +66,8 @@ namespace MySystem
             query.MerchantId = mer.Id;
             query.MerchantId = mer.Id;
             query.PosUserId = pos.BuyUserId; //机具所属人
             query.PosUserId = pos.BuyUserId; //机具所属人
             query.ChangeFee = ChangeFee; //调整费率
             query.ChangeFee = ChangeFee; //调整费率
+            db.SaveChanges();
+            return query.Id;
         }
         }