修复

app/api/engine.py

@@ -44,8 +44,8 @@ tamp_pay_engine = create_engine(
         charset="utf8"),
     echo=True
 )
-tamp_user_session = sessionmaker(bind=tamp_user_engine, autocommit=True)()
-tamp_pay_session = sessionmaker(bind=tamp_pay_engine, autocommit=True)()
+tamp_user_session = sessionmaker(bind=tamp_user_engine)()
+tamp_pay_session = sessionmaker(bind=tamp_pay_engine)()
 
 # redis = redis.StrictRedis(
 #     host=config[env]['redis']['host'],

app/config/config.yaml

@@ -16,7 +16,7 @@ dev:
     format: "%(asctime)s %(name)s %(levelname)s %(message)s"
     datefmt: "%Y-%m-%d  %H:%M:%S %a"
   token_auth_url:
-    https://testtamper.tanpuyun.com/fatools/token/auth
+    https://devtamper.tanpuyun.com/fatools/token/auth
 test:
   MySQL:
     tamp_user_db: tamp_user

app/controller/order.py

@@ -26,15 +26,18 @@ class TopUpOrder(Resource):
     def get(self):
         """."""
         # raise CustomFlaskErr(Errors.USER_ALREADY_EXISTS)
-        user_id = request.user_id
-        data = order_service.TopUpOrderService().get_order(user_id)
+        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.TopUpOrderService().get_order(args)
         resp = request.return_success
         resp['attributes'] = data
         return resp
 
     def post(self):
         """."""
-        self.parser.add_argument('amount', type=int, required=True, help='订单总额不能为空')
+        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)
         args = self.parser.parse_args()
@@ -63,8 +66,12 @@ class ConsumeOrder(Resource):
 
     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()
         user_id = request.user_id
-        data = order_service.CurriculumOrderService().get_order(user_id)
+        args['user_id'] = request.user_id
+        data = order_service.CurriculumOrderService().get_order(args)
         resp = request.return_success
         resp['attributes'] = data
         return resp

app/service/order_service.py

@@ -29,9 +29,19 @@ class TopUpOrderService:
     def __init__(self):
         pass
 
-    def get_order(self, user_id):
-        res = tamp_pay_session.query(AccountTopupOrder).filter(and_(AccountTopupOrder.user_id == user_id, AccountTopupOrder.order_status == 1)).all()
-        return [r.to_dict() for r in res]
+    def get_order(self, args):
+        pageNumber = args['pageNumber']
+        pageSize = args['pageSize']
+        user_id = args['user_id']
+        offset = (pageNumber - 1)*pageSize
+        totalSize = len(tamp_pay_session.query(AccountTopupOrder.id).filter(and_(AccountTopupOrder.user_id == user_id, AccountTopupOrder.order_status == 1)).all())
+        res = tamp_pay_session.query(AccountTopupOrder).filter(and_(AccountTopupOrder.user_id == user_id, AccountTopupOrder.order_status == 1)).order_by(AccountTopupOrder.create_time.desc()).offset(offset).limit(pageSize).all()
+        return {
+            'content': [r.to_dict() for r in res],
+            'pageNum': pageNumber,
+            'pageSize': pageSize,
+            'totalSize': totalSize
+        }
 
 
     def create_order(self, args):
@@ -80,11 +90,15 @@ class CurriculumOrderService:
     def __init__(self):
         pass
 
-    def get_order(self, user_id):
+    def get_order(self, args):
         """."""
+        pageNumber = args['pageNumber']
+        pageSize = args['pageSize']
+        user_id = args['user_id']
+        offset = (pageNumber - 1) * pageSize
         curriculum_column = tamp_user_session.query(CurriculumColumn).all()
         curriculum_res = tamp_user_session.query(CurriculumRes).all()
-        res = tamp_user_session.query(OrderFlow).filter(OrderFlow.createby == user_id).all()
+        res = tamp_user_session.query(OrderFlow).filter(OrderFlow.createby == user_id).order_by(OrderFlow.createtime.desc()).all()
         curriculum_column = {r.id: r.to_dict() for r in curriculum_column}
         curriculum_res = {r.id: r.to_dict() for r in curriculum_res}
         orders = [r.to_dict() for r in res if r.to_dict()['ab_status'] == 'SUCCESS']
@@ -95,7 +109,13 @@ class CurriculumOrderService:
                 order['prod_info'] = curriculum_column.get(prod_id, None)
             elif prod_type in ['3', '4', '5']:
                 order['prod_info'] = curriculum_res.get(prod_id, None)
-        return orders
+        totalSize = len(orders)
+        return {
+            'content': orders[offset: offset+pageSize],
+            'pageNum': pageNumber,
+            'pageSize': pageSize,
+            'totalSize': totalSize
+        }
 
 
     def create_order(self, args):

app/utils/alipay/alipayWap.py

@@ -86,7 +86,7 @@ def prePay(subject, out_trade_no, total_amount, notify_path='/webservice/notify'
     )
     if not result:
         return False
-    return result
+    return {'content': result}
 
 def alipay_transfer():
     """转账"""