调整wifi激活和奖励流程

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -229,19 +229,19 @@ namespace MySystem
                                             pos.SeoKeyword = "750";
                                             pos.PrizeParams = "750";
                                         }
-                                    }
 
-                                    pos.ActivationState = 1;
-                                    pos.ActivationTime = DateTime.Now;
-                                    add.ActiveStatus = 1;
-                                    add.MerStandardDate = DateTime.Now;
-                                    db.SaveChanges();
+                                        pos.ActivationState = 1;
+                                        pos.ActivationTime = DateTime.Now;
+                                        add.ActiveStatus = 1;
+                                        add.MerStandardDate = DateTime.Now;
+                                        db.SaveChanges();
 
-                                    //检查交易状态，并发奖励
-                                    WifiSendPrize(db, pos, add);
+                                        //检查交易状态，并发奖励
+                                        WifiSendPrize(db, pos, add);
 
-                                    //发放奖励MQ
-                                    PrizeSetHelper.Do("6", pos.PosSn);
+                                        //发放奖励MQ
+                                        PrizeSetHelper.Do("6", pos.PosSn);
+                                    }
                                 }
 
                                 Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -65,9 +65,32 @@ namespace MySystem
 
                             if(trade.SeoTitle == "v2")
                             {
-                                string duration = trade.Field2; //设备套餐时长
-                                string unit = trade.Field3; //套餐单位 0:按天 1:按月
-                                if(unit == "1") Months = int.Parse(function.CheckInt(duration));
+                                if(trade.SerEntryMode == "1") //判断是否是押金
+                                {
+                                    pos.SeoKeyword = trade.TradeAmount.ToString("f2");
+                                    pos.PrizeParams = trade.TradeAmount.ToString("f2");
+                                    db.SaveChanges();
+                                }
+                                else
+                                {
+                                    string duration = trade.Field2; //设备套餐时长
+                                    string unit = trade.Field3; //套餐单位 0:按天 1:按月
+                                    if(unit == "1") Months = int.Parse(function.CheckInt(duration));                                    
+
+                                    pos.ActivationState = 1;
+                                    pos.ActivationTime = DateTime.Now;
+
+                                    PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
+                                    add.ActiveStatus = 1;
+                                    add.MerStandardDate = DateTime.Now;
+                                    db.SaveChanges();
+
+                                    //检查交易状态，并发奖励
+                                    SycnSpMerchantService.Instance.WifiSendPrize(db, pos, add);
+
+                                    //发放奖励MQ
+                                    PrizeSetHelper.Do("6", pos.PosSn);
+                                }
                             }
                             else
                             {