reset 修改失败

myapps/automat/api/hatch_portal.py

@@ -104,34 +104,20 @@ def run_hatch_open():
     machine_no = json_data['machine_no']
     machine_no = json_data['machine_no']
     hatch_no = json_data['hatch_no']
     hatch_no = json_data['hatch_no']
     user_id = g.user.id
     user_id = g.user.id
+
     rent_detail = RentDetail.query.filter(RentDetail.user_id == user_id, RentDetail.machine_no == machine_no,
     rent_detail = RentDetail.query.filter(RentDetail.user_id == user_id, RentDetail.machine_no == machine_no,
                                           RentDetail.hatch_no == hatch_no,
                                           RentDetail.hatch_no == hatch_no,
                                           RentDetail.status != -1,
                                           RentDetail.status != -1,
                                           RentDetail.is_take == 0).order_by(RentDetail.id.desc()).first()
                                           RentDetail.is_take == 0).order_by(RentDetail.id.desc()).first()
     if rent_detail:
     if rent_detail:
+        # 改变rentDatail中的is_take
+        rent_detail.is_take = 1
+        db.session.add(rent_detail)
         # 查询到柜子中的物品 数量减一
         # 查询到柜子中的物品 数量减一
         sql = "update hatch set left_count = left_count - 1 where machine_no = '{}' and hatch_no='{}'".format(
         sql = "update hatch set left_count = left_count - 1 where machine_no = '{}' and hatch_no='{}'".format(
             machine_no, hatch_no)
             machine_no, hatch_no)
-        # 对订单中已经取出过的数量 + 1
-        sql_updata = "update rent_detail set takeout_count = takeout_count + 1 where id = '{}'".format(rent_detail.id)
         db.session.execute(sql)
         db.session.execute(sql)
         db.session.commit()
         db.session.commit()
-        db.session.execute(sql_updata)
-        db.session.commit()
-
-        # 改变rentDatail中的is_take
-        # 22-06-08 Author famon
-        # 已取出的数量 和 订单数量一致才算取出
-        # 再去查询一次
-        rent_detail_sql = RentDetail.query.filter(RentDetail.user_id == user_id, RentDetail.machine_no == machine_no,
-                                RentDetail.hatch_no == hatch_no,
-                                RentDetail.status != -1,
-                                RentDetail.is_take == 0).order_by(RentDetail.id.desc()).first()
-        if rent_detail_sql.takeout_count == rent_detail_sql.rent_count:
-            rent_detail_sql.is_take = 1
-            db.session.add(rent_detail_sql)
-            db.session.commit()
-
 
 
         # 当数量小于等于1时，将柜子物品状态改为已售空
         # 当数量小于等于1时，将柜子物品状态改为已售空
         left_res = Hatch.query.filter(Hatch.hatch_no == hatch_no,
         left_res = Hatch.query.filter(Hatch.hatch_no == hatch_no,