修改文字：购机券 -》兑换券，购买机 -》兑换机

AppStart/Helper/AlipayPayBack2Service.cs

@@ -514,7 +514,7 @@ namespace MySystem
                                 while(ParentUserId > 0)
                                 {
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
-                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                     int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                     int couponCount = db.PosCoupons.Count(m => m.UserId == ParentUserId && m.IsUse == 0); //判断是否拥有3张券
                                     function.WriteLog("MakerCode:" + puser.MakerCode, "推荐下单奖励监控日志");

AppStart/Helper/Profit/ProfitHelper.cs

@@ -1126,7 +1126,7 @@ namespace MySystem
                                     DebitNotCapTradeAmt = DebitNotCapTradeAmt, //商户非封顶借记卡交易总金额
                                     DebitCapTradeAmt = DebitCapTradeAmt, //商户借记卡封顶交易总额
                                     DebitCapTradeNum = DebitCapTradeNum, //商户借记卡封顶交易总笔数
-                                    MallPosOrderStatus = machine.PosSnType == 1 ? 0 : 1, //商城购买机具状态
+                                    MallPosOrderStatus = machine.PosSnType == 1 ? 0 : 1, //商城兑换机具状态
                                     ActiveBuddyMerStatus = user.RealName == merchant.MerchantName ? 0 : 1, //激活创客同名商户
                                 });
                             }

AppStart/Helper/StatService.cs

@@ -691,7 +691,7 @@ namespace MySystem
                                         Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
                                         if (puser != null && Prize > 0)
                                         {
-                                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                             int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                             int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
                                             // int BigCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.BrandId == 3); //判断是否拥有2台大机
@@ -870,7 +870,7 @@ namespace MySystem
                                                     Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
                                                     if (puser != null && Prize > 0)
                                                     {
-                                                        int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                                        int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                                         int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                                         int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
                                                         // int BigCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.BrandId == 3); //判断是否拥有2台大机
@@ -1053,7 +1053,7 @@ namespace MySystem
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
                                     if (puser != null && Prize > 0)
                                     {
-                                        int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                        int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                         int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                         int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
                                         // int BigCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.BrandId == 3); //判断是否拥有2台大机

AppStart/Helper/TimeOutPosChargeReturnService.cs

@@ -9,7 +9,7 @@ using Library;
 namespace MySystem
 {
     /// <summary>
-    /// 过期购买机具循环截止时间超过15天激活扣费退还
+    /// 过期兑换机具循环截止时间超过15天激活扣费退还
     /// </summary>
     public class TimeOutPosChargeReturnService
     {
@@ -52,11 +52,11 @@ namespace MySystem
                                         BeforeBalanceAmount = userAccount.BalanceAmount,
                                         AfterBalanceAmount = userAccount.BalanceAmount + toChargeBackRecord.ChargeAmount,
                                         ChangeAmount = toChargeBackRecord.ChargeAmount,
-                                        ChangeType = 126,//过期购买机具超过15天激活扣费退还
+                                        ChangeType = 126,//过期兑换机具超过15天激活扣费退还
                                         Remark = "机具货款退还",
 
                                     }).Entity;
-                                    toChargeBackRecord.Status = 2;//过期购买机具循环截止时间超过15天激活扣费退还标识
+                                    toChargeBackRecord.Status = 2;//过期兑换机具循环截止时间超过15天激活扣费退还标识
                                     userAccount.BalanceAmount += toChargeBackRecord.ChargeAmount;
                                     db.SaveChanges();
                                 }
@@ -65,7 +65,7 @@ namespace MySystem
                     }
                     catch (Exception ex)
                     {
-                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "过期购买机具超过15天激活扣费退还");
+                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "过期兑换机具超过15天激活扣费退还");
                     }
                 }
                 Thread.Sleep(1000);

Controllers/HomeController.cs

@@ -430,7 +430,7 @@ namespace MySystem.Controllers
         //     foreach (int uid in uids)
         //     {
         //         int ParentUserId = uid;
-        //         int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台购买机
+        //         int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台兑换机
         //         int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
         //         if (machineCount + ActiveCount >= 3)
         //         {
@@ -903,7 +903,7 @@ namespace MySystem.Controllers
                                 while (ParentUserId > 0)
                                 {
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
-                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                     int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                     int couponCount = db.PosCoupons.Count(m => m.UserId == ParentUserId && m.IsUse == 0); //判断是否拥有3张券
                                     if ((machineCount + ActiveCount + couponCount >= 3 || puser.LeaderLevel > 0) && !directPrize)
@@ -1046,7 +1046,7 @@ namespace MySystem.Controllers
                                 while(ParentUserId > 0)
                                 {
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
-                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                                    int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                                     int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                     int couponCount = db.PosCoupons.Count(m => m.UserId == ParentUserId && m.IsUse == 0); //判断是否拥有3张券
                                     if ((machineCount + ActiveCount + couponCount >= 3 || puser.LeaderLevel > 0) && !directPrize)
@@ -1498,7 +1498,7 @@ namespace MySystem.Controllers
                         while(ParentUserId > 0)
                         {
                             Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
-                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台购买机
+                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.PosSnType == 0 && m.ActivationState == 0); //判断是否拥有3台兑换机
                             int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                             int couponCount = db.PosCoupons.Count(m => m.UserId == ParentUserId && m.IsUse == 0); //判断是否拥有3张券
                             function.WriteLog("MakerCode:" + puser.MakerCode, "推荐下单奖励监控日志");