同行奖励订单需要判处退款状态

AppStart/TxjHelper.cs

@@ -59,7 +59,7 @@ public class TxjHelper
         List<MySystem.JavaProductModels.KxsMachineAward> list = dbpro.KxsMachineAward.Where(m => m.VariationType == 118 && m.CreateTime >= start && m.CreateTime < end).ToList();
         foreach(MySystem.JavaProductModels.KxsMachineAward sub in list)
         {
-            MySystem.JavaProductModels.KxsShopOrder order = dbpro.KxsShopOrder.FirstOrDefault(m => m.OrderSn == sub.PosSn);
+            MySystem.JavaProductModels.KxsShopOrder order = dbpro.KxsShopOrder.FirstOrDefault(m => m.OrderSn == sub.PosSn && m.ReturnStatus == 0);
             if(order != null)
             {
                 int UserId = order.UserId;
@@ -73,11 +73,12 @@ public class TxjHelper
                     {
                         if(txjList.ContainsKey(ParentId))
                         {
+                            MySystem.JavaProductModels.KxsShopOrderInfo orderInfo = dbpro.KxsShopOrderInfo.FirstOrDefault(m => m.OrderId == order.Id) ?? new MySystem.JavaProductModels.KxsShopOrderInfo();
                             string[] userData = txjList[ParentId].Split('|');
                             dbpro.KxsMachineAward.Add(new MySystem.JavaProductModels.KxsMachineAward()
                             {
                                 Amount = 60,
-                                VariationType = 30,
+                                VariationType = orderInfo.Number * 30,
                                 Username = userData[1],
                                 UserCode = userData[0],
                                 UserId = int.Parse(ParentId),

Areas/Api/Controllers/OutApiController.cs

@@ -140,7 +140,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 return "请勿频繁操作";
             }
             RedisDbconn.Instance.Set("LeaderTxjPrizeFlag", "1");
-            RedisDbconn.Instance.SetExpire("LeaderTxjPrizeFlag", 1800);
+            RedisDbconn.Instance.SetExpire("LeaderTxjPrizeFlag", 60);
             RedisDbconn.Instance.AddList("TxjQueue", month);
             return "ok";
         }