Copytrybox #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

shuaibinliu wants to merge 113 commits into master from copytrybox

make_data.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,12 +6,15 @@
  
    from flask import current_app

    import uuid

    from sqlalchemy import false

    from planet import create_app

    from planet.config.enums import ItemAuthrity, ItemPostion, ItemType, ActivityType, TimeLimitedStatus

    from planet.control.CExcel import CExcel

    from planet.extensions.register_ext import db

    from planet.models import Items, ProductBrand, Activity, PermissionType, Approval, ProductSku, Admin, Products, \

        TimeLimitedActivity, UserActivationCode, ActivationCodeApply, MakeOver

        TimeLimitedActivity, UserActivationCode, ActivationCodeApply, MakeOver, ActivationType, User

    # 添加一些默认的数据

    @@ -309,7 +312,7 @@ def check_abnormal_sale_volume():
  
                db.session.add(product)

                # 修正商品月销量

                ops = db.session.query(extract('month', OrderPart.createtime), func.count('*')).outerjoin(

                    OrderMain,OrderMain.OMid == OrderPart.OMid).filter(

                    OrderMain, OrderMain.OMid == OrderPart.OMid).filter(

                    OrderMain.isdelete == False,

                    OrderPart.isdelete == False,

                    OrderMain.OMstatus != -40,

    @@ -429,6 +432,194 @@ def init_make_over():
  
            db.session.add(mo)

    def make_ActivationType():

        with db.auto_commit():

            print('start add attype')

            attid = 100

            act_list = []

            # 分享新用户

            share_new = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "分享新用户",

                'ATTnum': 20,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ADid': 'adid1'

            })

            act_list.append(share_new)

            attid += 100

            # 分享老用户

            share_old = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "分享老用户",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ADid': 'adid1'

            })

            act_list.append(share_old)

            attid += 100

            # 发布随笔

            publish = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "发布随笔",

                'ATTnum': 20,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 100,

                'ADid': 'adid1'

            })

            act_list.append(publish)

            attid += 100

            # 加精

            selected = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "系统精选随笔",

                'ATTnum': 20,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ADid': 'adid1'

            })

            act_list.append(selected)

            attid += 100

            # 打赏 该类型具体积分需按照实际情况添加

            print('get reward id is {}'.format(attid))

            reward = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "系统打赏",

                'ATTnum': 0,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ADid': 'adid1'

            })

            act_list.append(reward)

            attid += 100

            # 小红书信息绑定

            redbook = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "小红书信息绑定",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ATTtype': 1,

                'ATTicon': '/img/base/2019/8/1/logo-red.png',

                'ADid': 'adid1'

            })

            act_list.append(redbook)

            attid += 100

            # 抖音信息绑定

            tiktok = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "抖音信息绑定",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ATTtype': 1,

                'ATTicon': '/img/base/2019/8/1/logo-dou.png',

                'ADid': 'adid1'

            })

            act_list.append(tiktok)

            attid += 100

            # QQ号信息绑定

            qq = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "QQ号信息绑定",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ATTtype': 1,

                'ATTicon': '/img/base/2019/8/1/logo-qq.png',

                'ADid': 'adid1'

            })

            act_list.append(qq)

            attid += 100

            # 微信号信息绑定

            wechat = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "微信号信息绑定",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ATTtype': 1,

                'ATTicon': '/img/base/2019/8/1/logo-peng.png',

                'ADid': 'adid1'

            })

            act_list.append(wechat)

            attid += 10

            # sina微博信息绑定

            sina = ActivationType.create({

                'ATTid': str(attid),

                'ATTname': "sina微博信息绑定",

                'ATTnum': 10,

                'ATTupperLimit': 0,

                'ATTdayUpperLimit': 0,

                'ATTtype': 1,

                'ATTicon': '/img/base/2019/8/1/logo-weibo.png',

                'ADid': 'adid1'

            })

            act_list.append(sina)

            # attid += 1

            print('max attid is {}'.format(attid))

            db.session.add_all(act_list)

    def add_user():

        import xlrd

        import os

        from PIL import Image

        from planet.extensions.qiniu.storage import QiniuStorage

        file_path = os.path.join(current_app.config['BASEDIR'], 'img', 'avatar', '2019', '9', '29')

        username = xlrd.open_workbook(os.path.join(file_path, 'username.xls'))

        sheet = username.sheet_by_index(0)

        one_col = sheet.col_values(0)

        with db.auto_commit():

            last_user_id = db.session.query(User.USid).filter(

                User.isdelete == false(), User.USid.ilike('id000%')).order_by(

                User.USid.desc(), User.createtime.desc(), origin=True).first()

            current_app.logger.info("query_last_user_id: {}".format(last_user_id))

            if last_user_id:

                last_user_id = last_user_id[0]

            else:

                last_user_id = 'id00000000'

            new_id = int(str(last_user_id).split('id')[-1]) + 1

            user_list = []

            qiniu = QiniuStorage(current_app)

            for index, name in enumerate(one_col):

                avatar_name = '/img/avatar/2019/9/29/aratar_{}.jpg'.format(index + 1)

                avatar_path = os.path.join(current_app.config['BASEDIR'], avatar_name[1:])

                img = Image.open(avatar_path)

                x, y = img.size

                if x != 132 or y != 132:

                    img.resize((132, 132), Image.LANCZOS).save(avatar_path)

                print(name, avatar_name)

                # 上传七牛云

                qiniu.save(data=avatar_path, filename=avatar_name[1:])

                usid = 'id%08d' % new_id

                user = User.create({'USid': usid,

                                    'USname': name,

                                    'USheader': avatar_name,

                                    'USfrom': 2,

                                    })

                user_list.append(user)

                new_id += 1

            db.session.add_all(user_list)

    if __name__ == '__main__':

        app = create_app()

        with app.app_context():

    @@ -437,7 +628,7 @@ def init_make_over():
  
            # print(admin.__dict__)

            # print(admin_str)

            # make_acvitity()

            make_items()

            # make_items()

            # make_permissiontype()

            # make_admin()

            # cexcel = CExcel()

    @@ -450,4 +641,6 @@ def init_make_over():
  
            # check_product_from()

            # change_tla_status()

            # add_uac_acaid()

            # make_ActivationType()

            add_user()

            pass

planet/__init__.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ @@
     from planet.api.v2.ATicket import ATicket
     from planet.common.request_handler import error_handler, request_first_handler
     from planet.config.secret import DefaltSettig
+    from planet.api.v2.AActivation import AActivation
     from planet.extensions.register_ext import register_ext
     from planet.extensions.loggers import LoggerHandler
     from planet.route.RouteSocket import Mynamespace, JSONEncoder as socketjsonencoder
@@ Expand Down Expand Up / @@ -118,7 +119,8 @@ def detail(self): @@
                 'method': self.method,
                 'data': self.data,
                 'query': self.args.to_dict(),
-                'address': self.remote_addr
+                'address': self.remote_addr,
+                'user-agent': self.user_agent.__dict__,
             }
             # if self.files:
             #     res.setdefault('files', dict(self.files))
@@ Expand Down Expand Up / @@ -197,6 +199,7 @@ def register(app): @@
         v2.add_url_rule('/play/<string:play>', view_func=APlay.as_view('play'))  # 活动
         v2.add_url_rule('/ticket/<string:ticket>', view_func=ATicket.as_view('ticket'))  # 票务
         v2.add_url_rule('/feedback/<string:feedback>', view_func=AMaterialFeedback.as_view('feedback'))  # 素材反馈
+        v2.add_url_rule('/activation/<string:activation>', view_func=AActivation.as_view('activation'))  # 活跃度
         v2.add_url_rule('/personalcenter/<string:personalcenter>',
                         view_func=AMiniProgramPersonalCenter.as_view('personalcenter'))  # 小程序个人中心
@@ Expand Down @@

planet/api/v2/AActivation.py

-Original file line number
+Diff line change
@@ -0,0 +1,25 @@
+    from planet.common.base_resource import Resource
+    from planet.control.CActivation import CActivation
+    class AActivation(Resource):
+        def __init__(self):
+            self.cat = CActivation()
+        def post(self, activation):
+            apis = {
+                'update_activationtype': self.cat.update_activationtype,
+                'bind_linkage': self.cat.bind_linkage,
+                'reward': self.cat.reward,
+                'select': self.cat.select,
+            }
+            return apis
+        def get(self, activation):
+            apis = {
+                'get_activationtype': self.cat.get_activationtype,
+                'list_activationtype': self.cat.list_activationtype,
+                'get_userlinkage': self.cat.get_userlinkage,
+                'get_duration_activation': self.cat.get_duration_activation,
+            }
+            return apis

planet/api/v2/APlay.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,8 @@ def get(self, play): @@
                 'get_promotion': self.cplay.get_promotion,
                 'get_undertake_agreement': self.cplay.get_undertake_agreement,
                 'get_params': self.cplay.get_params,
+                'get_role': self.cplay.get_role,
+                'list_role': self.cplay.list_role,
                 'download_team': self.cplay.download_team_user_info,
             }
             return apis
@@ Expand All / @@ -53,6 +55,7 @@ def post(self, play): @@
                 'make_over': self.cplay.make_over,
                 'undertake': self.cplay.undertake,
                 'payment': self.cplay.payment,
+                'update_role': self.cplay.update_role,
                 'help': self.cplay.help
             }
             return apis

planet/api/v2/ASupplizer.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ def get(self, supplizer): @@
                 'code': self.csupplizer.send_reset_password_code,
                 'get_supplizeraccount': self.csupplizer.get_supplizeraccount,
                 'get_system_notes': self.csupplizer.get_system_notes,
+                'get_verifier': self.csupplizer.get_verifier,
             }
             return apis
@@ Expand All / @@ -26,5 +27,6 @@ def post(self, supplizer): @@
                 'offshelves': self.csupplizer.offshelves,
                 'set_supplizeraccount': self.csupplizer.set_supplizeraccount,
                 'add_update_notes': self.csupplizer.add_update_notes,
+                'set_verifier': self.csupplizer.set_verifier,
             }
             return apis

planet/api/v2/ATicket.py

-Original file line number
+Diff line change
@@ -1,26 +1,28 @@
-    from planet.common.base_resource import Resource
-    from planet.control.CTicket import CTicket
-    class ATicket(Resource):
-        def __init__(self):
-            self.cticket = CTicket()
-        def get(self, ticket):
-            apis = {
-                'get': self.cticket.get_ticket,
-                'list': self.cticket.list_ticket,
-                'get_promotion': self.cticket.get_promotion,
-                'list_linkage': self.cticket.list_linkage,
-                'list_trade': self.cticket.list_trade,
-            }
-            return apis
-        def post(self, ticket):
-            apis = {
-                'create': self.cticket.create_ticket,
-                'update': self.cticket.update_ticket,
-                'pay': self.cticket.pay,
-                'award': self.cticket.set_award,
-            }
-            return apis
+    from planet.common.base_resource import Resource
+    from planet.control.CTicket import CTicket
+    class ATicket(Resource):
+        def __init__(self):
+            self.cticket = CTicket()
+        def get(self, ticket):
+            apis = {
+                'get': self.cticket.get_ticket,
+                'list': self.cticket.list_ticket,
+                'get_promotion': self.cticket.get_promotion,
+                'list_linkage': self.cticket.list_linkage,
+                'list_trade': self.cticket.list_trade,
+                'tsostatus': self.cticket.list_tsostatus,
+            }
+            return apis
+        def post(self, ticket):
+            apis = {
+                'create': self.cticket.create_ticket,
+                'update': self.cticket.update_ticket,
+                'pay': self.cticket.pay,
+                'award': self.cticket.set_award,
+                'verify': self.cticket.ticketorder_verified,
+            }
+            return apis

planet/api/v2/AUser.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ def post(self, user): @@
                 'mp_login': self.user.mini_program_login,  # 小程序登录
                 'blog_login': self.user.blog_login,  # 网页blog登录
                 'update_usinfo': self.user.update_usinfo,  # 小程序编辑个人信息
+                'add_mock_user': self.user.add_mock_user,  # 添加虚拟用户
                 # 'update': self.user.update,
                 # 'destroy': self.user.destroy,
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Copytrybox #126

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Copytrybox #126

Are you sure you want to change the base?

Uh oh!

Copytrybox #126

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!