账户余额，账户余额变动，探普币充值订单，课程订单

app/api/app.py

@@ -10,6 +10,9 @@
 from flask import Flask
 from flask_restful import Api
 
+from app.router.version1 import add_route
+
 app = Flask(__name__)
 api = Api(app)
+add_route(api)
 

app/controller/order.py

 # -*- encoding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# @File Name  : order.py
+# @File Name  : curriculum_order.py
 # @Time       : 2020/11/18 下午3:19
 # @Author     : X. Peng
 # @Email      : acepengxiong@163.com
@@ -9,6 +9,7 @@
 from flask_restful import Resource, reqparse
 from flask import request
 
+
 class OrderHandlers(Resource):
     """."""
 

app/init/__main__.py

@@ -7,11 +7,16 @@
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
 
-from app.api.engine import tamp_user_engine, tamp_pay_session
+from app.api.engine import tamp_user_engine, tamp_pay_session, tamp_user_session
 from app.api.engine import tamp_pay_engine
 from app.model.base import Base
-from app.model.order import OrderInfo
-
+from app.model.account_balance import AccountBalance
+from app.model.balance_change_record import BalanceChangeRecord
+from app.model.account_topup_order import AccountTopupOrder
+from app.model.curriculum_order import CurriculumOrder
+from app.model.tamp_user_models import UserInfo
 
 if __name__ == '__main__':
-    Base.metadata.create_all(bind=tamp_pay_engine)
+    # Base.metadata.create_all(bind=tamp_pay_engine)
+    res = tamp_user_session.query(UserInfo).all()
+    print(res[0].to_dict())

app/model/account_balance.py

+# -*- encoding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# @File Name  : account_balance.py
+# @Time       : 2020/11/24 上午10:36
+# @Author     : X. Peng
+# @Email      : acepengxiong@163.com
+# @Software   : PyCharm
+# -----------------------------------------------------------------------------
+
+from sqlalchemy import Column, BigInteger, Integer, String, DateTime, Float, text
+from sqlalchemy.sql import func
+from app.model.base import Base
+from app.model.base import BaseModel
+import time
+
+class AccountBalance(Base, BaseModel):
+    """账户余额表"""
+    __tablename__ = 'account_balance'
+
+    id = Column(String(64), default=__tablename__ + str(int(time.time()*10000)), primary_key=True)
+    user_id = Column(String(64), server_default='', comment='用户ID')
+    android_balance = Column(Integer, server_default=text('0'), comment='安卓探普贝余额')
+    apple_balance = Column(Integer, server_default=text('0'), comment='苹果探普贝余额')
+    del_flag = Column(Integer, server_default=text('0'), comment='是否删除,0:未删除,1:已删除')
+

app/model/account_topup_order.py

+# -*- encoding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# @File Name  : account_topup_order.py
+# @Time       : 2020/11/24 上午11:20
+# @Author     : X. Peng
+# @Email      : acepengxiong@163.com
+# @Software   : PyCharm
+# -----------------------------------------------------------------------------
+
+from sqlalchemy import Column, BigInteger, Integer, String, DateTime, Float, text
+from sqlalchemy.sql import func
+from app.model.base import Base
+from app.model.base import BaseModel
+import time
+
+class AccountTopupOrder(Base, BaseModel):
+    """账户探普币充值表"""
+    __tablename__ = 'account_topup_order'
+
+    id = Column(String(64), default=__tablename__ + str(int(time.time()*10000)), primary_key=True)
+    order_no = Column(String(50), comment='订单号')
+    transaction_serial_no = Column(String(50), server_default='', comment='交易流水号')
+    user_id = Column(String(64), comment='用户ID')
+    amount = Column(BigInteger, comment='订单总额')
+    order_status = Column(Integer, server_default=text('0'), comment='订单状态：0:未支付，1:已支付，2:已退款')
+    pay_method = Column(Integer, server_default=text('1'), comment='支付方式：1:探普贝，2:微信支付，3:支付宝支付，4:苹果支付')
+    create_time = Column(DateTime(timezone=True), server_default=func.now(), comment='创建时间')
+    pay_time = Column(DateTime(timezone=True), server_default=func.now(), comment='付款时间')
+    complete_time = Column(DateTime(timezone=True), server_default=func.now(), comment='完成时间')
+    del_flag = Column(Integer, server_default=text('0'), comment='是否删除,0:未删除,1:已删除')

app/model/balance_change_record.py

+# -*- encoding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# @File Name  : balance_change_record.py
+# @Time       : 2020/11/24 上午10:41
+# @Author     : X. Peng
+# @Email      : acepengxiong@163.com
+# @Software   : PyCharm
+# -----------------------------------------------------------------------------
+
+from sqlalchemy import Column, BigInteger, Integer, String, DateTime, Float, text
+from sqlalchemy.sql import func
+from app.model.base import Base
+from app.model.base import BaseModel
+import time
+
+class BalanceChangeRecord(Base, BaseModel):
+    """账户余额变动表"""
+    __tablename__ = 'balance_change_record'
+
+    id = Column(String(64), default=__tablename__ + str(int(time.time() * 10000)), primary_key=True)
+    user_id = Column(String(64), server_default='', comment='用户ID')
+    change_type = Column(Integer, server_default=text('0'), comment='变动类型：1：充值，2：消费')
+    change_ref_order_id = Column(String(64), server_default='', comment='变动关联订单ID')
+    change_amount = Column(Integer, server_default=text('0'), comment='变动金额')
+    android_balance = Column(Integer, server_default=text('0'), comment='变动后安卓探普贝余额')
+    apple_balance = Column(Integer, server_default=text('0'), comment='变动后苹果探普贝余额')
+    del_flag = Column(Integer, server_default=text('0'), comment='是否删除,0:未删除,1:已删除')

app/model/base.py

@@ -6,10 +6,10 @@
 # @Email      : acepengxiong@163.com
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
-from sqlalchemy.ext.declarative import declarative_base
-
+from sqlalchemy.ext.declarative import declarative_base, declared_attr
 Base = declarative_base()
-class BaseModel():
+
+class BaseModel:
     """."""
 
     def __init__(self):
@@ -17,3 +17,4 @@ class BaseModel():
 
     def to_dict(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+

app/model/order.py → app/model/curriculum_order.py

 # -*- encoding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# @File Name  : order.py
+# @File Name  : curriculum_order.py
 # @Time       : 2020/11/18 下午3:11
 # @Author     : X. Peng
 # @Email      : acepengxiong@163.com
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
-from sqlalchemy import Column, BigInteger,Integer, String, DateTime, Float, text
+from sqlalchemy import Column, BigInteger, Integer, String, DateTime, Float, text
 from sqlalchemy.sql import func
 from app.model.base import Base
 from app.model.base import BaseModel
+import time
 
-class OrderInfo(Base, BaseModel):
-    """订单信息表"""
-    __tablename__ = 'order_info'
+class CurriculumOrder(Base, BaseModel):
+    """课程订单表"""
+    __tablename__ = 'curriculum_order'
 
-    id = Column(BigInteger, primary_key=True)
+    id = Column(String(64), default=__tablename__ + str(int(time.time()*10000)), primary_key=True)
     order_no = Column(String(50), comment='订单号')
     transaction_serial_no = Column(String(50), server_default='', comment='交易流水号')
+    prod_type = Column(String(200), comment='商品类型1：栏目 3：直播 4：视频 5 音频')
     prod_name = Column(String(200), comment='商品名称')
-    prod_type = Column(String(200), comment='商品类型')
     prod_id = Column(String(200), comment='商品ID')
     prod_quantity = Column(Integer, server_default=text('1'), comment='数量')
-    amount = Column(Float, comment='订单总额')
+    amount = Column(BigInteger, comment='订单总额')
     user_id = Column(String(100), comment='用户ID')
-    user_apple_id = Column(String(100), comment='用户苹果ID')
     order_status = Column(Integer, server_default=text('0'), comment='订单状态：0:未支付，1:已支付，2:已退款')
-    pay_method = Column(Integer, server_default=text('1'), comment='支付方式：1:苹果支付，2:微信支付，3:支付宝支付')
-    create_time = Column(DateTime(timezone=True), server_default=func.now(), comment='下单时间')
-    pay_time = Column(DateTime(timezone=True), server_default=func.now(), comment='支付时间')
+    pay_method = Column(Integer, server_default=text('1'), comment='支付方式：1:探普贝，2:微信支付，3:支付宝支付，4:苹果支付')
+    create_time = Column(DateTime(timezone=True), server_default=func.now(), comment='创建时间')
+    pay_time = Column(DateTime(timezone=True), server_default=func.now(), comment='付款时间')
+    complete_time = Column(DateTime(timezone=True), server_default=func.now(), comment='完成时间')
     del_flag = Column(Integer, server_default=text('0'), comment='是否删除,0:未删除,1:已删除')
 

app/router/version1.0.py → app/router/version1.py

 # -*- encoding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# @File Name  : version1.0.py
+# @File Name  : version1.py
 # @Time       : 2020/11/18 下午3:31
 # @Author     : X. Peng
 # @Email      : acepengxiong@163.com
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
-
-from app.api.app import api
 from app.controller.order import *
 
-api.add_resource(OrderHandlers, '/tamp_course_order/order')
+
+def add_route(api):
+    """注册路由"""
+    api.add_resource(OrderHandlers, '/tamp_course_order/order')

app/service/order_service.py

@@ -6,13 +6,16 @@
 # @Email      : acepengxiong@163.com
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
-from app.model.order import OrderInfo
+from app.model.curriculum_order import OrderInfo
+
 
 class OrderService:
     """"""
     def __init__(self):
         pass
+
     def create_order(self):
         pass
+
     def get_order(self):
         pass