全部订单查询

app/api/engine.py

@@ -14,8 +14,7 @@ import os
 import sys
 import yaml
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
+from sqlalchemy.orm import sessionmaker, scoped_session
 
 env = sys.argv[-1]
 work_dir = os.getcwd()
@@ -44,8 +43,8 @@ tamp_pay_engine = create_engine(
         charset="utf8"),
     echo=True
 )
-tamp_user_session = sessionmaker(bind=tamp_user_engine)()
-tamp_pay_session = sessionmaker(bind=tamp_pay_engine)()
+tamp_user_session = scoped_session(sessionmaker(bind=tamp_user_engine))()
+tamp_pay_session = scoped_session(sessionmaker(bind=tamp_pay_engine))()
 
 # redis = redis.StrictRedis(
 #     host=config[env]['redis']['host'],

app/config/errors.py

@@ -14,10 +14,14 @@ class Errors:
     USER_ALREADY_EXISTS = '9002'
     APPLE_VOCHER_INVALID = '9003'
     TANGPU_BALANCE_NOT_ENOUGH = '9004'
+    APPLE_VOCHER_USED = '9005'
+    INPUT_PARAMS_ERROR = '9006'
 
     MSG = {
         TOKEN_INVALID: 'TOKEN失效',
         USER_ALREADY_EXISTS: '用户已经存在',
         APPLE_VOCHER_INVALID: '苹果证书无效',
         TANGPU_BALANCE_NOT_ENOUGH: '探普币余额不足',
+        APPLE_VOCHER_USED: '该支付凭证已使用',
+        INPUT_PARAMS_ERROR: '入参错误'
     }

app/controller/order.py

@@ -40,6 +40,7 @@ class TopUpOrder(Resource):
         self.parser.add_argument('amount', type=float, required=True, help='订单总额不能为空')
         self.parser.add_argument('pay_method', type=int, required=True, help='支付方式不能为空')
         self.parser.add_argument('receipt_data', type=str, required=False)
+        self.parser.add_argument('product_id', type=str, required=False)
         args = self.parser.parse_args()
         args['user_id'] = request.user_id
         args['remote_addr'] = request.remote_addr
@@ -74,6 +75,8 @@ class ConsumeOrder(Resource):
         data = order_service.CurriculumOrderService().get_order(args)
         resp = request.return_success
         resp['attributes'] = data
+        resp = make_response(resp)
+        resp.hearders = {'Content-Type': 'application/json;charset=UTF-8'}
         return resp
 
     def post(self):
@@ -119,7 +122,7 @@ class TopUpOrderNotify(Resource):
         if res['success']:
             order_service.topUpSuccessAction(res['order_no'])
             resp = make_response(res['body'])
-            resp.hearders['Content-Type'] = res['header']['Content-Type']
+            resp.hearders = res['header']
         return resp
 
     def put(self, id):
@@ -150,7 +153,7 @@ class ConsumeOrderNotify(Resource):
         if res['success']:
             order_service.consumeSucessAction(res['order_no'])
             resp = make_response(res['body'])
-            resp.hearders['Content-Type'] = res['header']['Content-Type']
+            resp.hearders = res['header']
         return resp
 
     def put(self, id):
@@ -187,3 +190,33 @@ class AccountBalance(Resource):
     def delete(self, id):
         """."""
         pass
+
+
+class AllOrders(Resource):
+    """"""
+    def __init__(self):
+        """."""
+        self.parser = reqparse.RequestParser()
+
+    def get(self):
+        """."""
+        self.parser.add_argument('pageNumber', type=int, required=True)
+        self.parser.add_argument('pageSize', type=int, required=True)
+        args = self.parser.parse_args()
+        args['user_id'] = request.user_id
+        data = order_service.getAllOrders(args)
+        resp = request.return_success
+        resp['attributes'] = data
+        return resp
+
+    def post(self):
+        """."""
+        pass
+
+    def put(self, id):
+        """."""
+        pass
+
+    def delete(self, id):
+        """."""
+        pass
\ No newline at end of file

app/model/account_topup_order.py

@@ -13,18 +13,18 @@ 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), 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='支付方式：4:探普贝，5:app微信支付，6:支付宝支付，7:苹果支付')
-    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:已删除')
+# class AccountTopupOrder(Base, BaseModel):
+#     """账户探普币充值表"""
+#     __tablename__ = 'account_topup_order'
+#
+#     id = Column(String(64), 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='支付方式：4:探普贝，5:app微信支付，6:支付宝支付，7:苹果支付')
+#     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/base.py

@@ -18,4 +18,5 @@ class BaseModel:
         pass
 
     def to_dict(self):
-        return {c.name: getattr(self, c.name).strftime("%Y-%m-%d %H:%M:%S") if isinstance(getattr(self, c.name), datetime.datetime) else getattr(self, c.name) for c in self.__table__.columns}
+        return {c.name: int(getattr(self, c.name).timestamp()) if isinstance(getattr(self, c.name), datetime.datetime) else getattr(self, c.name) for c in self.__table__.columns}
+

app/model/curriculum_order.py

@@ -47,7 +47,7 @@ class OrderFlow(Base, BaseModel):
     ab_type = Column(String(3), comment='产品类型')
     ab_proid = Column(String(64), comment='产品ID')
     ab_pro_siid = Column(String(64), comment='产品规格ID')
-    ab_si_type = Column(String(3), comment='购买类型  1：栏目  3：直播 4：视频  5 音频')
+    ab_si_type = Column(String(3), comment='购买类型  1：栏目  3：直播 4：视频  5 音频 6 探普币订单')
     ab_si_name = Column(String(32), comment='产品规格规格名称')
     ab_si_code = Column(String(16), comment='产品规格规格编码')
     ab_si_pattern = Column(String(3), comment='产品规格定价模式')
@@ -59,6 +59,6 @@ class OrderFlow(Base, BaseModel):
     complete_time = Column(DateTime(timezone=True), default=func.now(), comment='完成时间')
     updatetime = Column(DateTime, comment='修改时间')
     updateby = Column(String(64), comment='修改人')
-    deletetag = Column(String(3), comment='删除标识')
+    deletetag = Column(String(3), default="0", comment='删除标识')
     unionid = Column(String(64), comment='微信unionid')
     transaction_serial_no = Column(String(64), comment='交易流水号')

app/router/version1.py

@@ -21,4 +21,6 @@ def add_route(api):
     api.add_resource(ConsumeOrderNotify, '/tamp_order/micro_shop/consumeOrderNotify')
     # 查询探普币余额
     api.add_resource(AccountBalance, '/tamp_order/micro_shop/accountBalance')
+    # 查询全部订单
+    api.add_resource(AllOrders, '/tamp_order/micro_shop/AllOrders')