Merge remote-tracking branch 'origin/yanglei'

af2cd9f4 · Aeolus · 8dd0677d · 5002fb13 · af2cd9f4 · af2cd9f4
Commit af2cd9f4 authored Nov 18, 2021 by Aeolus
Showing with 170 additions and 7 deletions

myapps/sukang24h/api/__init__.py
+2 -0

myapps/sukang24h/api/card_edit_portal.py
+114 -0

myapps/sukang24h/api/nfc_card_portal.py
+41 -0

myapps/sukang24h/api/wx_auth_portal.py
+11 -5

utils/error_code.py
+2 -2

No files found.
--- a/myapps/sukang24h/api/__init__.py
+++ b/myapps/sukang24h/api/__init__.py
@@ -13,6 +13,7 @@ from myapps.sukang24h.api.rent_portal import rent_route
 from myapps.sukang24h.api.tallyman_portal import tallyman_route
 from myapps.sukang24h.api.machine_portal import machine_route
 from myapps.sukang24h.api.nfc_card_portal import nfc_card_route
+from myapps.sukang24h.api.card_edit_portal import card_edit_route


 def register_sukang_blueprint(app: Flask):
@@ -23,3 +24,4 @@ def register_sukang_blueprint(app: Flask):
    app.register_blueprint(tallyman_route, url_prefix=prefix + "/tallyman")
    app.register_blueprint(machine_route, url_prefix=prefix + "/machine")
    app.register_blueprint(nfc_card_route, url_prefix=prefix + "/nfc_card")
+    app.register_blueprint(card_edit_route, url_prefix=prefix + "/card_edit")
--- a/myapps/sukang24h/api/card_edit_portal.py
+++ b/myapps/sukang24h/api/card_edit_portal.py
+import json
+import logging
+import re
+import time
+
+from flask import Blueprint, request, jsonify, g
+from sqlalchemy import extract
+
+from config.commen_config import USER_RENT_PREPAY_ID
+from config.wechat_config import platform_appid_config_list, pay_config_list, NFC_PAY_CALLBCK_URL
+from models.base_model import db
+from models.models import NfcCard, NfcCardPayRecord, NfcCardPayRefund
+from service.rent_service import RentService
+from service.wechat_service import WeChatPayService
+from utils.error_code import NFC_CARD_NOT_EXIST, NFC_CARD_ACTIVATED_ERROR, WE_MINIAPP_PAY_FAIL, NO_RENT_RECORD, \
+    NO_NFC_CARD_ERROR
+from utils.my_redis_cache import redis_client
+from utils.my_response import BaseResponse
+
+logger = logging.getLogger(__name__)
+
+card_edit_route = Blueprint('card_edit', __name__) #创建蓝图
+#增
+@card_edit_route.route("add",methods=["post"])
+def card_add():
+    json_data = request.get_json()
+    card_no = json_data["card_no"]
+    #如果有重复的卡，则报错
+
+    card = NfcCard.query.filter_by(card_no=card_no, status=1).first()
+    if card:
+        return jsonify(RE_NFC_CARD_ERROR) #账号重复
+
+    #先添加 添加一条行的记录
+    newCard = NfcCard(card_no=card_no,status=0,money=0,limit_count=-1)
+    db.session.add(newCard)
+    db.session.commit()
+
+    return BaseResponse()
+
+#删
+@card_edit_route.route("delete",methods=["post"])
+def card_delete():
+    json_data = request.get_json()
+    card_no = json_data["card_no"]
+
+    card = NfcCard.query.filter_by(card_no=card_no, status=1).first()
+    if not card:
+        return jsonify(NFC_CARD_NOT_EXIST)
+
+    card.status = -1
+
+    db.session.add(card)
+    db.session.commit()
+
+    return BaseResponse()
+
+#查 列出所有用户 根据分页来展示
+@card_edit_route.route("users_card",methods=["post"])
+def card_users_card():
+    json_data = request.get_json()
+    page = json_data["page"]
+    page_size = json_data["pageSize"]
+
+    filter_list = [
+        NfcCard.status.in_([1])
+    ]
+
+
+    total_count = NfcCard.query.filter(*filter_list).count()
+    if not total_count:
+        return BaseResponse(data=[], total=0, page=page, pageSize=page_size)
+    cards = NfcCard.query.filter(*filter_list).offset((page - 1) * page_size).limit(page_size).all() #查询
+    return_data = [] #返回的结果
+    for card in cards:
+        tmp_data = {
+            "card_no": card.card_no,
+            "nick_name": card.nick_name,
+            "phone": card.phone,
+            "money": card.money,
+            "status": card.status,
+        }
+        return_data.append(tmp_data)
+    return   BaseResponse(data=return_data, total=total_count, page=page, pageSize=page_size)
+
+#根据卡号查询
+@card_edit_route.route("found_user_card",methods=["post"])
+def found_users_card():
+    json_data = request.get_json()
+    card_no = json_data["card_no"]
+
+    filter_list = [
+        NfcCard.card_no == card_no,
+        NfcCard.status.in_([1])
+    ]
+
+    cards = NfcCard.query.filter(*filter_list).all()
+    if not cards:
+        return jsonify(NO_NFC_CARD_ERROR)
+
+    return_data = []
+    for card in cards:
+        tmp_data = {
+            "card_no": card.card_no,
+            "nick_name": card.nick_name,
+            "phone": card.phone,
+            "money": card.money,
+            "status": card.status,
+        }
+        return_data.append(tmp_data)
+
+    return BaseResponse(data=return_data)
+
+
--- a/myapps/sukang24h/api/nfc_card_portal.py
+++ b/myapps/sukang24h/api/nfc_card_portal.py
@@ -326,3 +326,44 @@ def run_nfc_card_pay_refund():
        db.session.commit()

        return BaseResponse()
+
+#查询充值记录
+@nfc_card_route.route('/user_pay_record', methods=['POST'])
+def run_nfc_card_user_pay_record():
+    json_data = request.get_json()
+    card_no = json_data["card_no"]
+
+    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 = NfcCardPayRecord.query.filter_by(card_no=card_no,is_pay=1).all()
+    result_data=[]
+    for card in card_result:
+        record={
+            "card_no":card.card_no,
+            "id":card.id,
+            "pay_money":card.pay_money,
+            "created_at":card.created_at,
+            "updated_at":card.updated_at
+        }
+        result_data.append(record)
+
+    return BaseResponse(data=result_data)
+
+#充值成功后改变数据库
+@nfc_card_route.route('/user_pay_succeed', methods=['POST'])
+def run_nfc_card_pay_succeed():
+    json_data=request.get_json()
+    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()
+
+    return BaseResponse()
+
--- a/myapps/sukang24h/api/wx_auth_portal.py
+++ b/myapps/sukang24h/api/wx_auth_portal.py
@@ -31,6 +31,7 @@ wx_auth_route = Blueprint('wx_auth', __name__)
 @wx_auth_route.route('/test', methods=['POST'])
 def my_test():
    a = {'error_code': '0', 'error_message': 'Success'}
+
    return jsonify(a)


@@ -59,16 +60,20 @@ def mini_login():
        return jsonify(WX_LOGIN_CODE_ERROR)

    try:
-        user_info = WeChatWxaCrypto(user_session["session_key"], iv, app_id).decrypt_message(encrypted_data)
+        user_info = WeChatWxaCrypto(
+            user_session["session_key"], iv, app_id).decrypt_message(encrypted_data)
    except:
        try:
-            session_key = redis_client.get(WX_SESSION_KEY + user_session["openid"])
-            user_info = WeChatWxaCrypto(session_key, iv, app_id).decrypt_message(encrypted_data)
+            session_key = redis_client.get(
+                WX_SESSION_KEY + user_session["openid"])
+            user_info = WeChatWxaCrypto(
+                session_key, iv, app_id).decrypt_message(encrypted_data)
        except:
            return BaseResponse(error_code=500, error_message='user info decrypt error')

    is_new_user = 0
-    wx_user_model = WxUser.query.filter_by(openid=user_session["openid"]).first()
+    wx_user_model = WxUser.query.filter_by(
+        openid=user_session["openid"]).first()
    if not wx_user_model:
        wx_user_model = WxUser()
        wx_user_model.status = 1
@@ -88,7 +93,8 @@ def mini_login():
    wx_user_model.platform = platform_appid_config_list.index(app_id)
    db.session.add(wx_user_model)
    db.session.commit()
-    token = generate_jwt(payload={"user_id": wx_user_model.id}, expiry=time.time() + 24 * 60 * 60)
+    token = generate_jwt(
+        payload={"user_id": wx_user_model.id}, expiry=time.time() + 24 * 60 * 60)
    return jsonify({
        'customer_id': wx_user_model.id,
        'token': token,

--- a/utils/error_code.py
+++ b/utils/error_code.py
-#!usr/bin/env python
# -*- coding:utf-8 _*-
"""
@version:
author:Aeolus
@file: error_code.py
"""

###  通用错误相关
Param_Invalid_Error = {
    "error_code": "500",
    "error_message": "params is invalid, 参数无效"
}

TOKEN_NOT_VALID_ERROR = {
    "error_code": "1001",
    "error_message": "无效的token"
}

TOKEN_NOT_PROVIDED_ERROR = {
    "error_code": "1002",
    "error_message": "token未提供"
}

TOKEN_EXPIRE_ERROR = {
    "error_code": "1003",
    "error_message": "token超时"
}

PHONE_NOT_BINDING_ERROR = {
    "error_code": "1004",
    "error_message": "未绑定手机号"
}

PHONE_NOT_NULL_ERROR = {
    "error_code": "1005",
    "error_message": "手机号为空"
}

PHONE_NOT_VALID_ERROR = {
    "error_code": "1006",
    "error_message": "无效的手机号"
}

USER_ALREADY_REGISTER_ERROR = {
    "error_code": "1007",
    "error_message": "用户已注册"
}

VERIFICATION_CODE_NULL_ERROR = {
    "error_code": "1008",
    "error_message": "验证码为空"
}

VERIFICATION_CODE_INVALID_ERROR = {
    "error_code": "1009",
    "error_message": "验证码已失效"
}

VERIFICATION_CODE_ERROR = {
    "error_code": "1010",
    "error_message": "验证码错误"
}

PASSWORD_ERROR = {
    "error_code": "1011",
    "error_message": "账号或密码错误"
}

## 微信登陆相关
WX_LOGIN_DATA_ERROR = {
    "error_code": "3001",
    "error_message": "微信登录数据错误"
}

WX_LOGIN_CODE_ERROR = {
    "error_code": "3002",
    "error_message": "微信登录code值错误"
}

WX_OPENID_NOT_GET_ERROR = {
    "error_code": "3003",
    "error_message": "微信OpenId获取失败，请刷新重试"
}

WX_SESSION_KEY_ERROR = {
    "error_code": "3004",
    "error_message": "session key error"
}

###  微信支付相关

WE_MINIAPP_PAY_FAIL = {
    "error_code": "3101",
    "error_message": "小程序下单失败"
}

###  消息推送相关

WXBizMsgCrypt_OK = {
    "error_code": "0",
    "error_message": "WXBizMsgCrypt_OK"
}

WXBizMsgCrypt_ValidateSignature_Error = {
    "error_code": "4001",
    "error_message": "验证签名错误"
}

WXBizMsgCrypt_ParseXml_Error = {
    "error_code": "4002",
    "error_message": "解析xml错误"
}

WXBizMsgCrypt_ComputeSignature_Error = {
    "error_code": "4003",
    "error_message": "计算签名错误"
}

WXBizMsgCrypt_IllegalAesKey = {
    "error_code": "4004",
    "error_message": "Aes key非法错误"
}

WXBizMsgCrypt_ValidateAppid_Error = {
    "error_code": "4005",
    "error_message": "appid错误"
}

WXBizMsgCrypt_EncryptAES_Error = {
    "error_code": "4006",
    "error_message": "aes加密错误"
}

WXBizMsgCrypt_DecryptAES_Error = {
    "error_code": "4007",
    "error_message": "aes解密错误"
}

WXBizMsgCrypt_IllegalBuffer = {
    "error_code": "4008",
    "error_message": "illegal buffer"
}

WXBizMsgCrypt_EncodeBase64_Error = {
    "error_code": "4009",
    "error_message": "base64加密错误"
}

WXBizMsgCrypt_DecodeBase64_Error = {
    "error_code": "4010",
    "error_message": "base64解密错误"
}

WXBizMsgCrypt_GenReturnXml_Error = {
    "error_code": "4011",
    "error_message": "gen return xml error"
}

MACHINE_NOT_EXIST_ERROR = {
    "error_code": '5001',
    "error_message": "机柜不存在"
}
MACHINE_IS_USE_ERROR = {
    "error_code": '5002',
    "error_message": "已有他人正在租借中，请稍后"
}

MACHINE_IS_NOT_ONLINE_ERROR = {
    "error_code": '5003',
    "error_message": "机柜不在线"
}

MACHINE_ADD_ERROR = {
    "error_code": '5004',
    "error_message": "机柜添加失败"
}

MACHINE_NO_DUPLICATE_ERROR = {
    "error_code": '5005',
    "error_message": "machine_no duplicate,机柜编号重复"
}

MACHINE_EDIT_ERROR = {
    "error_code": '5006',
    "error_message": "machine edit error, 机柜修改错误"
}

HATCH_NOT_EXIST_ERROR = {
    "error_code": "5007",
    "error_message": "no hatch, 没有商品信息"
}

HATCH_NOT_ALL_EXIST_ERROR = {
    "error_code": "5008",
    "error_message": "no all hatch, 存在已售出商品"
}

HATCH_COUNT_ERROR = {
    "error_code": "5009",
    "error_message": "hatch count error, 商品数量错误，检查数量"
}

MACHINE_ACTIVATED_ERROR = {
    "error_code": '5010',
    "error_message": "machine activated, 机柜已激活"
}

### 订单相关
RENT_ORDER_NOT_BACK_ERROR = {
    "error_code": '6101',
    "error_message": "有未归还的订单"
}

RENT_ORDER_NOT_TAKE_ERROR = {
    "error_code": '6102',
    "error_message": "有未取货的订单"
}

RENT_ORDER_NUMBER_MAX = {
    "error_code": '6103',
    "error_message": "订单数量达到上限"
}

TAKE_CODE_NOT_VALID = {
    "error_code": '6104',
    "error_message": "取货码错误请确认手机号及取货码是否匹配"
}

CODE_CANCEL_ERROR = {
    "error_code": '6105',
    "error_message": "取货码已取消"
}

CODE_USED_ERROR = {
    "error_code": '6108',
    "error_message": "取货码已使用"
}

NO_POWER_ERROR = {
    "error_code": '6106',
    "error_message": "没有可租借设备"
}
NO_RENT_RECORD = {
    "error_code": '6107',
    "error_message": "订单不存在"
}

CODE_USED_ERROR = {
    "error_code": '6108',
    "error_message": "取货码已使用"
}

RENT_ORDER_NUMBER_LIMIT = {
    "error_code": '6109',
    "error_message": "机柜只允许租借一台"
}

REFUND_NOT_RENT_INFO = {
    "error_code": "6301",
    "error_message": "没有该订单信息"
}

REFUND_BACK_TIME_ERROR = {
    "error_code": "6302",
    "error_message": "归还时间异常"
}

REFUND_NOT_PRODUCTION_INFO = {
    "error_code": "6303",
    "error_message": "没有该讲解器信息"
}

REFUND_MONEY_IS_ZERO = {
    "error_code": "6304",
    "error_message": "退款金额为零"
}

REFUND_NO_DUPLICATE = {
    "error_code": "6305",
    "error_message": "退款单号重复"
}

TALLYMAN_ACCOUNT_EXIST = {
    "error_code": "7001",
    "error_message": "tallyman account exist, 补货员账号已存在"
}

TALLYMAN_ACCOUNT_NOT_EXIST = {
    "error_code": "7002",
    "error_message": "tallyman account not exist, 补货员账号不存在"
}

NFC_CARD_NOT_EXIST = {
    "error_code": "8001",
    "error_message": "nfc card not exist, 卡号错误"
}

NFC_CARD_ACTIVATED_ERROR = {
    "error_code": "8002",
    "error_message": "nfc card  activated, 卡片已激活"
}

NO_NFC_CARD_ERROR = {
    "error_code": "8003",
    "error_message": "no nfc card , 不存在卡片"
}
\ No newline at end of file
+#!usr/bin/env python
# -*- coding:utf-8 _*-
"""
@version:
author:Aeolus
@file: error_code.py
"""

###  通用错误相关
Param_Invalid_Error = {
    "error_code": "500",
    "error_message": "params is invalid, 参数无效"
}

TOKEN_NOT_VALID_ERROR = {
    "error_code": "1001",
    "error_message": "无效的token"
}

TOKEN_NOT_PROVIDED_ERROR = {
    "error_code": "1002",
    "error_message": "token未提供"
}

TOKEN_EXPIRE_ERROR = {
    "error_code": "1003",
    "error_message": "token超时"
}

PHONE_NOT_BINDING_ERROR = {
    "error_code": "1004",
    "error_message": "未绑定手机号"
}

PHONE_NOT_NULL_ERROR = {
    "error_code": "1005",
    "error_message": "手机号为空"
}

PHONE_NOT_VALID_ERROR = {
    "error_code": "1006",
    "error_message": "无效的手机号"
}

USER_ALREADY_REGISTER_ERROR = {
    "error_code": "1007",
    "error_message": "用户已注册"
}

VERIFICATION_CODE_NULL_ERROR = {
    "error_code": "1008",
    "error_message": "验证码为空"
}

VERIFICATION_CODE_INVALID_ERROR = {
    "error_code": "1009",
    "error_message": "验证码已失效"
}

VERIFICATION_CODE_ERROR = {
    "error_code": "1010",
    "error_message": "验证码错误"
}

PASSWORD_ERROR = {
    "error_code": "1011",
    "error_message": "账号或密码错误"
}

## 微信登陆相关
WX_LOGIN_DATA_ERROR = {
    "error_code": "3001",
    "error_message": "微信登录数据错误"
}

WX_LOGIN_CODE_ERROR = {
    "error_code": "3002",
    "error_message": "微信登录code值错误"
}

WX_OPENID_NOT_GET_ERROR = {
    "error_code": "3003",
    "error_message": "微信OpenId获取失败，请刷新重试"
}

WX_SESSION_KEY_ERROR = {
    "error_code": "3004",
    "error_message": "session key error"
}

###  微信支付相关

WE_MINIAPP_PAY_FAIL = {
    "error_code": "3101",
    "error_message": "小程序下单失败"
}

###  消息推送相关

WXBizMsgCrypt_OK = {
    "error_code": "0",
    "error_message": "WXBizMsgCrypt_OK"
}

WXBizMsgCrypt_ValidateSignature_Error = {
    "error_code": "4001",
    "error_message": "验证签名错误"
}

WXBizMsgCrypt_ParseXml_Error = {
    "error_code": "4002",
    "error_message": "解析xml错误"
}

WXBizMsgCrypt_ComputeSignature_Error = {
    "error_code": "4003",
    "error_message": "计算签名错误"
}

WXBizMsgCrypt_IllegalAesKey = {
    "error_code": "4004",
    "error_message": "Aes key非法错误"
}

WXBizMsgCrypt_ValidateAppid_Error = {
    "error_code": "4005",
    "error_message": "appid错误"
}

WXBizMsgCrypt_EncryptAES_Error = {
    "error_code": "4006",
    "error_message": "aes加密错误"
}

WXBizMsgCrypt_DecryptAES_Error = {
    "error_code": "4007",
    "error_message": "aes解密错误"
}

WXBizMsgCrypt_IllegalBuffer = {
    "error_code": "4008",
    "error_message": "illegal buffer"
}

WXBizMsgCrypt_EncodeBase64_Error = {
    "error_code": "4009",
    "error_message": "base64加密错误"
}

WXBizMsgCrypt_DecodeBase64_Error = {
    "error_code": "4010",
    "error_message": "base64解密错误"
}

WXBizMsgCrypt_GenReturnXml_Error = {
    "error_code": "4011",
    "error_message": "gen return xml error"
}

MACHINE_NOT_EXIST_ERROR = {
    "error_code": '5001',
    "error_message": "机柜不存在"
}
MACHINE_IS_USE_ERROR = {
    "error_code": '5002',
    "error_message": "已有他人正在租借中，请稍后"
}

MACHINE_IS_NOT_ONLINE_ERROR = {
    "error_code": '5003',
    "error_message": "机柜不在线"
}

MACHINE_ADD_ERROR = {
    "error_code": '5004',
    "error_message": "机柜添加失败"
}

MACHINE_NO_DUPLICATE_ERROR = {
    "error_code": '5005',
    "error_message": "machine_no duplicate,机柜编号重复"
}

MACHINE_EDIT_ERROR = {
    "error_code": '5006',
    "error_message": "machine edit error, 机柜修改错误"
}

HATCH_NOT_EXIST_ERROR = {
    "error_code": "5007",
    "error_message": "no hatch, 没有商品信息"
}

HATCH_NOT_ALL_EXIST_ERROR = {
    "error_code": "5008",
    "error_message": "no all hatch, 存在已售出商品"
}

HATCH_COUNT_ERROR = {
    "error_code": "5009",
    "error_message": "hatch count error, 商品数量错误，检查数量"
}

MACHINE_ACTIVATED_ERROR = {
    "error_code": '5010',
    "error_message": "machine activated, 机柜已激活"
}

### 订单相关
RENT_ORDER_NOT_BACK_ERROR = {
    "error_code": '6101',
    "error_message": "有未归还的订单"
}

RENT_ORDER_NOT_TAKE_ERROR = {
    "error_code": '6102',
    "error_message": "有未取货的订单"
}

RENT_ORDER_NUMBER_MAX = {
    "error_code": '6103',
    "error_message": "订单数量达到上限"
}

TAKE_CODE_NOT_VALID = {
    "error_code": '6104',
    "error_message": "取货码错误请确认手机号及取货码是否匹配"
}

CODE_CANCEL_ERROR = {
    "error_code": '6105',
    "error_message": "取货码已取消"
}

CODE_USED_ERROR = {
    "error_code": '6108',
    "error_message": "取货码已使用"
}

NO_POWER_ERROR = {
    "error_code": '6106',
    "error_message": "没有可租借设备"
}
NO_RENT_RECORD = {
    "error_code": '6107',
    "error_message": "订单不存在"
}

CODE_USED_ERROR = {
    "error_code": '6108',
    "error_message": "取货码已使用"
}

RENT_ORDER_NUMBER_LIMIT = {
    "error_code": '6109',
    "error_message": "机柜只允许租借一台"
}

REFUND_NOT_RENT_INFO = {
    "error_code": "6301",
    "error_message": "没有该订单信息"
}

REFUND_BACK_TIME_ERROR = {
    "error_code": "6302",
    "error_message": "归还时间异常"
}

REFUND_NOT_PRODUCTION_INFO = {
    "error_code": "6303",
    "error_message": "没有该讲解器信息"
}

REFUND_MONEY_IS_ZERO = {
    "error_code": "6304",
    "error_message": "退款金额为零"
}

REFUND_NO_DUPLICATE = {
    "error_code": "6305",
    "error_message": "退款单号重复"
}

TALLYMAN_ACCOUNT_EXIST = {
    "error_code": "7001",
    "error_message": "tallyman account exist, 补货员账号已存在"
}

TALLYMAN_ACCOUNT_NOT_EXIST = {
    "error_code": "7002",
    "error_message": "tallyman account not exist, 补货员账号不存在"
}

NFC_CARD_NOT_EXIST = {
    "error_code": "8001",
    "error_message": "nfc card not exist, 卡号错误"
}

NFC_CARD_ACTIVATED_ERROR = {
    "error_code": "8002",
    "error_message": "nfc card  activated, 卡片已激活"
}

NO_NFC_CARD_ERROR = {
    "error_code": "8003",
    "error_message": "no nfc card , 不存在卡片"
}

RE_NFC_CARD_ERROR = {
    "error_code": "8004",
    "error_message": "re nfc card , 卡片已存在"
}
\ No newline at end of file