调整领导奖入库条件

AppStart/Helper/LeaderCompPrize2Helper.cs

@@ -76,12 +76,13 @@ namespace MySystem
         {
             CustomerSqlConn.op("delete from LeaderCompTradeStat;delete from LeaderCompTmp;delete from LeaderCompPrize;delete from LeaderCompAddTrade;", MysqlConn.SqlConnStr);
             CustomerSqlConn.op("delete from kxs_shd_leader where trade_month='" + curMonth + "'", MysqlConn.JavaUserSqlConnStr);
-            doSomething(curMonth);
-            SendPrize(curMonth);
+            var UserData = doSomething(curMonth);
+            SendPrize(curMonth, UserData);
         }
 
-        public void doSomething(string month)
+        public List<LeaderCompUser> doSomething(string month)
         {
+            List<LeaderCompUser> UserData = new List<LeaderCompUser>();
             try
             {
                 WebCMSEntities db = new WebCMSEntities();
@@ -96,7 +97,6 @@ namespace MySystem
                 string sql = "";
                 int rownum = 0;
                 int num = 0;
-                List<LeaderCompUser> UserData = new List<LeaderCompUser>();
                 // string rootsql = "select tb.user_id,pid,pid_path,leader_type,trade_amt from (select user_id,trade_amt from kxs_user_trade_info where trade_month='" + month + "' and trade_amt>0) tb LEFT JOIN kxs_user u on tb.user_id=u.id LEFT JOIN kxs_leader l on tb.user_id=l.id and l.expired_date>='" + Now + "'";
                 string rootsql = "select tb.user_id,pid,pid_path,leader_type,trade_amt,tb.is_vip,i.full_region_num from (select user_id,is_vip,trade_amt from kxs_user_trade_info where trade_month='" + month + "' and trade_amt>0) tb LEFT JOIN kxs_user u on tb.user_id=u.id LEFT JOIN kxs_leader l on tb.user_id=l.id and l.expired_date>='" + Now + "' left join kxs_lkb_isv i on tb.user_id=i.user_id";
                 Utils.WriteLog(rootsql, "领导人达标奖励日志");
@@ -266,9 +266,10 @@ namespace MySystem
             {
                 Utils.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "领导达标人奖励异常");
             }
+            return UserData;
         }
 
-        private void SendPrize(string month)
+        private void SendPrize(string month, List<LeaderCompUser> UserData)
         {
             string sql = "";
             string MonthFlag = month;
@@ -317,6 +318,7 @@ namespace MySystem
                 db.SaveChanges();
 
                 LeaderCompTradeStat stat = db.LeaderCompTradeStat.FirstOrDefault(m => m.UserId == UserId) ?? new LeaderCompTradeStat();
+                LeaderCompUser userData = UserData.FirstOrDefault(m => m.UserId == UserId) ?? new LeaderCompUser();
                 if(stat.LeaderType > 1 && CompPrize > 0)
                 // if(CompPrize > 0)
                 {