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

src/common/models.py

@@ -280,6 +280,7 @@ class Article(models.Model):
     content = models.TextField(u"内容",blank=True,null=True)                       
     status = models.SmallIntegerField(u"下线/上线/编辑中-1/2/1",default=1)
     isbanner = models.SmallIntegerField(u"是否banner",default=0)
+    category = models.CharField(u"类型", max_length=255, blank=True,null=True)         
                                                                                    
     ctime = models.DateTimeField(u"创建时间",auto_now_add=True)                    
     class Meta:                                                                    

src/manage/controls.py

@@ -27,6 +27,7 @@ from threading import Thread
 #from django.core.cache import cache
 from django.db import connection
 from utils.wxSubscribeMessage import send_consult_reply_message
+from utils.aliyunpush import aliyunpush
 
 import xlrd
 import xlwt
@@ -807,20 +808,63 @@ def reply_wanzhu_consult(**kwargs):
     pid = kwargs.get("pid")
     content = kwargs.get("reply_content")
     user_id = kwargs.get("user_id")
-    cm.WanzhuConsult.objects.create(
-        pid = pid, 
-        reply_content = content,
-        user_id = 0,
-        player_id = 0,
-        reply_user_id = user_id
-    )
-    cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,reply_content=content,ctime=datetime.datetime.now())
+    action = kwargs.get("action")
+    if action == "send":
+        user = cm.UserInfo.objects.filter(id=user_id).first()
+        user_name = user.username
+        user_avatar = user.avatar
+
+        obj,flag = cm.Consult.objects.get_or_create(
+            user_id = user_id, 
+        )
+        obj.user_name = user_name
+        obj.user_avatar = user_avatar
+        #obj.reply_content = content
+        obj.view_status = 1
+        obj.reply_status = 0
+        obj.ctime = datetime.datetime.now()
+        obj.save()
+
+        wanzhu_obj = cm.WanzhuConsult.objects.create(
+            user_id = user_id, 
+            user_name = user_name, 
+            user_avatar = user_avatar
+        )
+
+        wanzhu_obj_1 = cm.WanzhuConsult.objects.create(
+            reply_content = content,
+            user_id = 0,
+            player_id = 0,
+            reply_user_id = user_id,
+            pid = wanzhu_obj.id
+        )
+        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,reply_content=content,ctime=datetime.datetime.now())
+
+
+    else:
+        cm.WanzhuConsult.objects.create(
+            pid = pid, 
+            reply_content = content,
+            user_id = 0,
+            player_id = 0,
+            reply_user_id = user_id
+        )
+        cm.Consult.objects.filter(user_id=user_id).update(reply_status=1,reply_content=content,ctime=datetime.datetime.now())
     #发送消息提醒
     if cm.UserInfo.objects.filter(id=user_id).exists():
         user = cm.UserInfo.objects.filter(id=user_id).first()
         openid = user.openid
         username = user.username
-        send_consult_reply_message(openid,username)
+        try:
+            send_consult_reply_message(openid,username)
+        except Exception as e:
+            print(e)
+        #发送app推送消息
+        title = u"顽主杯"
+        body = u"你收到一条顽主的消息"
+        user_id = 6209
+        params = {"type":"message","id":user_id}
+        aliyunpush.push_notice_by_userid(user_id,title,body,params)
 
 def update_player_type(**kwargs):
     """

src/manage/views.py

@@ -694,7 +694,7 @@ class ArticleView(cv.AdminView):
         if mse:
             raise ce.TipException(mse)
         try:
-            need_params.extend(["type","img"])
+            need_params.extend(["type","img","category","isbanner"])
             vals = ccf.get_need_params(*need_params,**qdata)
             rst = ctl.add_model(self,**vals)
             return cv.to_suc(rst)
@@ -714,7 +714,7 @@ class ArticleView(cv.AdminView):
         if mse:
             raise ce.TipException(mse)
         try:
-            need_params.extend(["type","img"])
+            need_params.extend(["type","img","category","isbanner"])
             vals = ccf.get_need_params(*need_params,**qdata)
             rst = ctl.update_model(self,**vals)
             return cv.to_suc(rst)
@@ -1013,11 +1013,12 @@ class WanzhuConsultReplyView(cv.AdminView):
         @id:1
         """
         qdata = request.json
-        need_params = ["pid","reply_content","user_id"]
+        need_params = ["reply_content","user_id"]
         mse = ccf.check_params(*need_params,**qdata)
         if mse:
             raise ce.TipException(mse)
         try:
+            need_params.extend(["pid","action"])
             vals = ccf.get_need_params(*need_params,**qdata)
             rst = ctl.reply_wanzhu_consult(**vals)
             return cv.to_suc(rst)

src/utils/aliyunpush.py

@@ -21,8 +21,8 @@ class AliyunPush(object):
         self.request.set_DeviceType("ALL")
         self.request.set_Target("ACCOUNT")
         self.request.set_TargetValue(str(user_id))
-        self.request.set_Body(title)
-        self.request.set_Title(body)
+        self.request.set_Body(body)
+        self.request.set_Title(title)
         self.request.set_iOSExtParameters(params)
         response = self.client.do_action_with_exception(self.request)
         return response

src/weixin/controls.py

@@ -1788,8 +1788,8 @@ def get_stock_players(**kwargs):
     else:
         total = len(data)
 
-    #return total,data
-    return data
+    return total,data
+    #return data
         
 
 def update_user_fund(**kwargs):

src/weixin/views.py

@@ -1155,8 +1155,9 @@ class V3StockPlayersListView(cv.AuthView):
             vals = ccf.get_need_params(*need_params,**qdata)
             vals["user_id"] = request.user.get("id")
             vals["stock_id"] = vals.get("id")
-            rst = ctl.get_stock_players(**vals)
-            return cv.to_suc(rst)
+            total,rst = ctl.get_stock_players(**vals)
+            return cv.to_suc({"total":total,"list":rst})
+            #return cv.to_suc(rst)
         except Exception as e:
             cv.tracefail()
             return cv.to_fail(e)