卡片充值

myapps/sukang24h/api/nfc_card_portal.py

@@ -336,14 +336,15 @@ def run_nfc_card_user_pay_record():
     card_result = NfcCard.query.filter_by(card_no=card_no, status=1).first()
     card_result = NfcCard.query.filter_by(card_no=card_no, status=1).first()
     if not card_result:
     if not card_result:
         return jsonify(NFC_CARD_NOT_EXIST)
         return jsonify(NFC_CARD_NOT_EXIST)
-    card_result = NfcCardPayRecord.query.filter_by(card_no=card_no).all()
+    card_result = NfcCardPayRecord.query.filter_by(card_no=card_no,is_pay=1).all()
     result_data=[]
     result_data=[]
     for card in card_result:
     for card in card_result:
         record={
         record={
             "card_no":card.card_no,
             "card_no":card.card_no,
-            "user_id":card.user_id,
+            "id":card.id,
             "pay_money":card.pay_money,
             "pay_money":card.pay_money,
-            "created_at":card. created_at
+            "created_at":card.created_at,
+            "updated_at":card.updated_at
         }
         }
         result_data.append(record)
         result_data.append(record)
 
 
@@ -353,13 +354,16 @@ def run_nfc_card_user_pay_record():
 @nfc_card_route.route('/user_pay_succeed', methods=['POST'])
 @nfc_card_route.route('/user_pay_succeed', methods=['POST'])
 def run_nfc_card_pay_succeed():
 def run_nfc_card_pay_succeed():
     json_data=request.get_json()
     json_data=request.get_json()
-    card_no = json_data["card_no"]
-    money = json_data["money"]
-    card_result = NfcCard.query.filter_by(card_no=card_no,status=1).first()
-    if not card_result:
-        return jsonify(NFC_CARD_NOT_EXIST)
-
-    card_result.money += int(money)
-    db.session.add(card_result)
+    for key,val in json_data.items():
+        id=json_data[key]["id"]
+        card_no=json_data[key]["card_no"]
+        pay_money = json_data[key]["pay_money"]
+        card_result = NfcCard.query.filter_by(card_no=card_no).first() # 查询到卡号
+        card_record= NfcCardPayRecord.query.filter_by(id=id).first() #查询到充值记录
+        card_result.money += pay_money
+        card_record.is_pay=2
+        db.session.add(card_record,card_record)
         db.session.commit()
         db.session.commit()
+
     return BaseResponse()
     return BaseResponse()
+