Merge branch 'v3.0-app' of http://118.190.145.217:3000/xiaojincai/wanzb_v3_api into v3.0-app

src/manage/controls.py

@@ -154,10 +154,19 @@ def add_model(cls,**kwargs):
             yesterday_stock_img = yesterday.today_stock_img
             yesterday_is_markt = yesterday.is_markt
         else:
-            yesterday_fund = init_fund 
+            yesterday_fund = today_fund 
             yesterday_stock = ""
             yesterday_stock_img = "" 
             yesterday_is_markt = 0
+            if kwargs.get("id"):
+                if cm.PlayerRecord.get_db_model(match_id).objects.filter(match_id=match_id,user_id=user_id).count()==1:
+                    init_fund = today_fund
+                    cm.Player.objects.filter(user_id=user_id,match_id=match_id).update(fund=today_fund)
+            else:
+                if not cm.PlayerRecord.get_db_model(match_id).objects.filter(match_id=match_id,user_id=user_id).exists():
+                    init_fund = today_fund
+                    cm.Player.objects.filter(user_id=user_id,match_id=match_id).update(fund=today_fund)
+                    
         obj,flag = cm.PlayerRecord.get_db_model(match_id).objects.get_or_create(
                         player_id=player_id,
                         match_id=match_id,

src/weixin/controls.py

@@ -2490,8 +2490,8 @@ def add_wanzhu_consult(request):
     aliyunpush.push_notice_by_userid(0,title,body,params,"android")
 
     #退款短信通知
-    if '退款' in content:
-        send_verify_code('18397565872','0000')
+#     if '退款' in content:
+#         send_verify_code('18397565872','0000')
 
 
 def add_comments(request):