圈存接口修改

myapps/sukang24h/api/nfc_card_portal.py

@@ -379,14 +379,18 @@ def run_nfc_card_load_succeed():
     if not card_result:
     if not card_result:
         return jsonify(NFC_CARD_NOT_EXIST)
         return jsonify(NFC_CARD_NOT_EXIST)
     for record_no in record_nos:
     for record_no in record_nos:
-        card_record = NfcCardPayRecord.query.filter_by(rent_no=record_no).first()  # 查询到充值记录
-        card_result.money += card_record.pay_money
-        card_record.status = 2
-        db.session.add(card_record)
+        card_record = NfcCardPayRecord.query.filter_by(rent_no=record_no, status=1).first()  # 查询到充值记录
+        if card_record:
+            card_result.money += card_record.pay_money
+            card_record.status = 2
+            db.session.add(card_record)
     try:
     try:
         db.session.add(card_result)
         db.session.add(card_result)
         db.session.commit()
         db.session.commit()
     except SQLAlchemyError as e:
     except SQLAlchemyError as e:
         db.session.rollback()
         db.session.rollback()
-
-    return BaseResponse()
+    return_data = {
+        "card_no": card_result.card_no,
+        "money": card_result.money
+    }
+    return BaseResponse(data=return_data)