满溢 去掉历史数据库

apps/web/common/transaction/withdraw.py

@@ -458,7 +458,7 @@ class WithdrawService(object):
                                                             self.record.amount,
                                                             self.record.source_key,
                                                             self.record.order,
-                                                            self.record.is_new_version)
+                                                            )
                         if not updated:
                             handler.revoke(remarks = u'扣款失败', description = u'扣款失败')
                             raise ServiceException({'result': 0, 'description': u'扣款失败', 'payload': {}})
@@ -551,11 +551,12 @@ class WithdrawService(object):
 
                         handler = self.payee.new_withdraw_handler(self.record)
 
-                        updated = self.payee.freeze_balance(self.record.incomeType,
-                                                            self.record.amount,
-                                                            self.record.source_key,
-                                                            self.record.order,
-                                                            self.record.is_new_version)
+                        updated = self.payee.freeze_balance(
+                            self.record.incomeType,
+                            self.record.amount,
+                            self.record.source_key,
+                            self.record.order
+                        )
                         if not updated:
                             handler.revoke(remarks = u'扣款失败', description = u'扣款失败')
                             raise ServiceException({'result': 0, 'description': u'扣款失败', 'payload': {}})
@@ -635,11 +636,12 @@ class WithdrawService(object):
 
                         handler = self.payee.new_withdraw_handler(self.record)
 
-                        updated = self.payee.freeze_balance(self.record.incomeType,
-                                                            self.record.amount,
-                                                            self.record.source_key,
-                                                            self.record.order,
-                                                            self.record.is_new_version)
+                        updated = self.payee.freeze_balance(
+                            self.record.incomeType,
+                            self.record.amount,
+                            self.record.source_key,
+                            self.record.order,
+                        )
                         if not updated:
                             handler.revoke(remarks = u'扣款失败', description = u'扣款失败')
                             raise ServiceException({'result': 0, 'description': u'扣款失败', 'payload': {}})

apps/web/constant.py

@@ -1446,10 +1446,10 @@ class AppPlatformType(IterConstant):
 APP_PLATFORM_TYPE_TRANSLATION = {
     AppPlatformType.ALIPAY: u'支付宝',
     AppPlatformType.WECHAT: u'微信',
-    AppPlatformType.JD: u'京东',
-    AppPlatformType.WECHAT_MINI: u'微信小程序',
+    # AppPlatformType.JD: u'京东',
+    # AppPlatformType.WECHAT_MINI: u'微信小程序',
     AppPlatformType.PLATFORM: u'平台',
-    AppPlatformType.SWAP: u'互联互通'
+    # AppPlatformType.SWAP: u'互联互通'
 }
 
 

apps/web/dealer/models.py

@@ -1209,7 +1209,7 @@ class Dealer(CapitalUser):
         if self.devCount >= 5:
             return True
 
-        return WithdrawRecord.count_today(ownerId = str(self.id), role = self.role) <= 2
+        return WithdrawRecord.count_today(ownerId = str(self.id), role = self.role) <= 50
 
     @property
     def my_agent(self):

apps/web/dealer/views.py

@@ -3979,7 +3979,11 @@ def getRechargeRecordByCustomer(request):
             'hint': [("openId", 1)]
         }
 
-    records = ClientRechargeModelProxy.get_data_list(startTime=startTime, endTime=endTime, **queryFilter)
+    records = RechargeRecord.objects.filter(
+        dateTimeAdded__gte=to_datetime(startTime, '%Y-%m-%d'),
+        dateTimeAdded__lt=to_datetime(endTime, '%Y-%m-%d'),
+        **queryFilter
+    )
 
     dataList = list()
     for record in records.paginate(pageIndex, pageSize):
@@ -9661,8 +9665,11 @@ def getIncomeOrderList(request):
         if phoneOwner:
             filters.update({"openId": phoneOwner.openId})
 
-    records = ClientRechargeModelProxy.get_data_list(startTime=startTime, endTime=endTime,
-                                                     **filters)  # type: CustomQuerySet
+    records = RechargeRecord.objects.filter(
+        dateTimeAdded__gte=to_datetime(startTime, "%Y-%m-%d"),
+        dateTimeAdded__lt=to_datetime(endTime, "%Y-%m-%d"),
+        **filters
+    )  # type: CustomQuerySet
     total = records.count()
 
     # 这个地方的数据一定是按照年进行分型的
@@ -13396,7 +13403,7 @@ def refundOrder(request):
     refundMoney = RMB(payload.get("refundMoney"))
     deductCoins = VirtualCoin(payload.get("deductCoins"))
 
-    rechargeOrder = ClientRechargeModelProxy.get_one(orderNo=orderNo)  # type: RechargeRecord
+    rechargeOrder = RechargeRecord.objects.filter(orderNo=orderNo).first()  # type: RechargeRecord
     if not rechargeOrder:
         return JsonErrorResponse(description=u"未查询到订单，请刷新页面重试")
 

apps/web/user/conf.py

@@ -22,7 +22,7 @@ class USER_AUTH_REDIRECT_URL(IterConstant):
 
     WECHAT_USER_CENTER_MANAGER_AUTH_USER = concat_server_end_url(uri = '/user/wechat/center/managerAuth/user')
 
-    JD = concat_server_end_url(uri = '/user/{}/auth/callback'.format(AppPlatformType.JD))
+    # JD = concat_server_end_url(uri = '/user/{}/auth/callback'.format(AppPlatformType.JD))
     ALIPAY = concat_server_end_url(uri = '/user/{}/auth/callback'.format(AppPlatformType.ALIPAY))
 
     UNIONPAY = concat_server_end_url(uri = '/user/union/auth/callback')

apps/web/user/urls.py

@@ -52,12 +52,7 @@ urlpatterns = patterns('', *[
     # 用户消费列表
     url(r'^asynTransactionRecord$', asynTransactionRecord, name='asynTransactionRecord'),
 
-    # 昌原的用户消费记录，昌原的汽车桩都是直接现金交易，没有充值一说
-    url(r'^asynTransactionRecordForChangyuan$', asynTransactionRecordForChangyuan,
-        name='asynTransactionRecordForChangyuan'),
-
     # 用户充值记录
-    url(r'^getChargeRecord$', getChargeRecord, name='getChargeRecord'),
 
     url(r'^getChargeRecordDetail$', getChargeRecordDetail, name='getChargeRecordDetail'),
 

apps/web/user/utils.py

@@ -47,7 +47,7 @@ from apps.web.device.define import DeviceChannelType
 from apps.web.device.models import Device, Group
 from apps.web.exceptions import UserServerException
 from apps.web.helpers import get_wechat_auth_bridge, get_wechat_user_manager_mp_proxy, get_app, get_user_manager_agent, \
-    DealerCustomizedBrandVisitor, AgentCustomizedBrandVisitor, get_platform_promotion_pay_gateway, get_swap_env_pay_gateway
+    DealerCustomizedBrandVisitor, AgentCustomizedBrandVisitor, get_platform_promotion_pay_gateway
 from apps.web.report.ledger import Ledger
 from apps.web.user import Cookies, UserAuthState
 from apps.web.user.conf import USER_AUTH_REDIRECT_URL

apps/web/user/views.py

@@ -1580,256 +1580,6 @@ def asynTransactionRecord(request):
         })
 
 
-@permission_required(ROLE.myuser)
-def asynTransactionRecordForChangyuan(request):
-    # type: (WSGIRequest)->JsonResponse
-
-    """
-    用户消费记录
-    :param request:
-    :return: JsonResponse
-    """
-
-    pageIndex = int(request.GET.get('pageIndex', 1))
-    pageSize = int(request.GET.get('pageSize', 10))
-
-    startTime = request.GET.get('startTime', Const.QUERY_START_DATE)
-    endTime = request.GET.get('endTime', datetime.datetime.now().strftime('%Y-%m-%d'))
-
-    typeStrDict = {
-        'wechat': u'微信支付',
-        'alipay': u'支付宝支付',
-    }
-
-    if request.GET.has_key('cardTicketId') and request.GET.get('cardTicketId'):
-        _, dataList = VCardConsumeRecord.paginate(request.GET.get('cardTicketId'), pageIndex, pageSize)
-    else:
-        dealer_ids = MyUser.get_dealer_ids(openId = request.user.openId, productAgentId = request.user.productAgentId)
-        if len(dealer_ids) < 0:
-            return JsonResponse({'result': 1, 'description': '', 'payload': {'total': 0, 'dataList': []}})
-
-        query_set = ClientConsumeModelProxy.get_data_list(
-            ownerId__in = dealer_ids,
-            startTime = startTime,
-            endTime = endTime,
-            openId = request.user.openId,
-            isNormal = True,
-        )  # type: CustomQuerySet
-
-        rechargeIds = []
-        records = []
-        for _ in query_set.paginate(pageIndex, pageSize):  # type: ConsumeRecord
-            records.append(_)
-            if _.recharge_record_id:
-                rechargeIds.append(ObjectId(_.recharge_record_id))
-
-        if not records:
-            return JsonResponse({'result': 1, 'description': '', 'payload': {'total': 0, 'dataList': []}})
-
-        if rechargeIds:
-            recharge_records = ClientRechargeModelProxy.get_data_list(
-                ownerId__in = dealer_ids,
-                id__in = rechargeIds
-            )
-        else:
-            recharge_records = list()
-
-        rechargeDict = {}
-        for _ in recharge_records:  # type: RechargeRecord
-            rechargeDict[str(_.id)] = _
-
-        dataList = []
-
-        for record in records:  # type: ConsumeRecord
-            if not record.recharge_record_id:
-                continue
-
-            rechargeRcd = rechargeDict.get(str(record.recharge_record_id), None)
-            if rechargeRcd is None and record.remarks != u'刷卡消费':  # 如果没有记录充值ID，是属于刷卡数据记录
-                continue
-
-            newData = record.to_user_detail()
-
-            if rechargeRcd.gateway in typeStrDict.keys():
-                typeStr = typeStrDict.get(rechargeRcd.gateway)
-            else:
-                typeStr = u'刷卡支付'
-
-            newData.update({'payType': typeStr})
-            newData.pop('elec', None)
-            newData.pop('needElec', None)
-
-            dataList.append(newData)
-
-        # 充值记录添加 昌源的充值记录分为卡充值（单纯充值没有消费）和消费充值（使用现金支付，立即有消费记录）
-        refundIds = {str(refund.rechargeObjId): str(refund.money) for refund in
-                     RefundMoneyRecord.objects.filter(openId = request.user.openId)}
-
-        query_set = ClientRechargeModelProxy.get_data_list(
-            ownerId__in = dealer_ids,
-            startTime = startTime,
-            endTime = endTime,
-            openId = request.user.openId,
-            result = "success",
-            via = "chargeCard",
-            hint = [('openId', 1)])
-
-        for cardRechargeRecord in query_set.paginate(pageIndex, pageSize):
-            if cardRechargeRecord.gateway in typeStrDict.keys():
-                typeStr = typeStrDict.get(cardRechargeRecord.gateway)
-            else:
-                continue
-
-            newData = {
-                "id": str(cardRechargeRecord.id),
-                "payType": typeStr,
-                "createdTime": cardRechargeRecord.dateTimeAdded,
-                "address": cardRechargeRecord.address,
-                "devNo": cardRechargeRecord.devNo if cardRechargeRecord.devNo else "",
-                "logicalCode": cardRechargeRecord.logicalCode if cardRechargeRecord.logicalCode else "",
-                'groupNumber': cardRechargeRecord.groupNumber,
-                'groupName': cardRechargeRecord.groupName,
-                'devTypeName': cardRechargeRecord.dev_type_name,
-                "money": cardRechargeRecord.money,
-                "description": cardRechargeRecord.my_description,
-                "ownerId": cardRechargeRecord.ownerId,
-                "consumeType": u"cardRecharge"
-            }
-
-            if str(cardRechargeRecord.id) in refundIds.keys():
-                refundedMoney = refundIds.get(str(cardRechargeRecord.id))
-                newData.update({"refundedMoney": refundedMoney})
-
-            dataList.append(newData)
-
-        recharge_query_set = ClientRechargeModelProxy.get_data_list(
-            ownerId__in=dealer_ids,
-            startTime=startTime,
-            endTime=endTime,
-            openId=request.user.openId,
-            result="success",
-            via="recharge",
-            hint=[('openId', 1)])
-
-        for rechargeRcd in recharge_query_set.paginate(pageIndex, pageSize):
-            if rechargeRcd.attachParas.get('startKey', '') != '':
-                continue
-
-            if rechargeRcd.gateway in typeStrDict.keys():
-                typeStr = typeStrDict.get('gateway')
-            else:
-                continue
-
-            newData = {
-                "id": str(rechargeRcd.id),
-                "payType": typeStr,
-                "createdTime": rechargeRcd.dateTimeAdded,
-                "address": rechargeRcd.address,
-                "devNo": rechargeRcd.devNo if rechargeRcd.devNo else "",
-                "logicalCode": rechargeRcd.logicalCode if rechargeRcd.logicalCode else "",
-                'groupNumber': rechargeRcd.groupNumber,
-                'groupName': rechargeRcd.groupName,
-                'devTypeName': rechargeRcd.dev_type_name,
-                "money": rechargeRcd.money,
-                "description": rechargeRcd.my_description,
-                "ownerId": rechargeRcd.ownerId,
-                "consumeType": u"rechargeCoins"
-            }
-
-            dataList.append(newData)
-
-        dataList.sort(key = lambda x: x.get("createdTime"), reverse = True)
-
-    return JsonResponse(
-        {
-            'result': 1,
-            'description': '',
-            'payload': {'total': 10000, 'dataList': dataList}
-        })
-
-
-@permission_required(ROLE.myuser)
-def getChargeRecord(request):
-    # type: (WSGIRequest)->JsonResponse
-    """
-    用户充值记录
-    :param request:
-    :return: JsonResponse
-    """
-
-    pageIndex = int(request.GET.get('pageIndex', 1))
-    pageSize = int(request.GET.get('pageSize', 10))
-
-    startTime = request.GET.get('startTime', Const.QUERY_START_DATE)
-    endTime = request.GET.get('endTime', datetime.datetime.now().strftime('%Y-%m-%d'))
-
-    openId = request.user.openId
-    if not openId:
-        return JsonErrorResponse(description = u'无法获取用户相关信息，请重新扫描二维码')
-
-    cardId = request.GET.get('cardTicketId', None)
-    if cardId:
-        orderNoList = VirtualCardRechargeRecord.get_link_orderNo_list(
-            cardId = cardId,
-            startTime = to_datetime(startTime, '%Y-%m-%d'),
-            endTime = to_datetime(endTime, '%Y-%m-%d'),
-            openId = openId)
-
-        queryFilter = {
-            'orderNo__in': orderNoList,
-            'hint': [("orderNo", 1)]
-        }
-    else:
-        queryFilter = {
-            'ownerId__in': MyUser.get_dealer_ids(
-                openId = request.user.openId, productAgentId = request.user.productAgentId),
-            'openId': openId,
-            'result': 'success',
-            'via__in': [
-                RechargeRecordVia.Balance,
-                RechargeRecordVia.Refund,
-                RechargeRecordVia.SendCoin,
-                RechargeRecordVia.Card,
-                RechargeRecordVia.VirtualCard,
-                RechargeRecordVia.MonthlyPackage,
-                RechargeRecordVia.RefundCash,
-                RechargeRecordVia.Cash
-            ],
-            'hint': [('openId', 1)]
-        }
-
-    records = ClientRechargeModelProxy.get_data_list(
-        startTime = startTime, endTime = endTime, **queryFilter)  # type: CustomQuerySet
-
-    if not records:
-        return JsonResponse({'result': 1, 'description': '', 'payload': {'total': 0, 'dataList': []}})
-
-    total = records.count()
-
-    dataList = []
-    for record in records.paginate(pageIndex, pageSize):  # type: RechargeRecord
-        data = {
-            'id': str(record.id),
-            'createdTime': record.to_datetime_str(record.dateTimeAdded),
-            'amount': record.my_amount,
-            'groupName': record.groupName,
-            'ownerId': record.ownerId,
-            'via': record.via
-        }
-
-        dataList.append(data)
-
-    return JsonResponse(
-        {
-            'result': 1,
-            'description': '',
-            'payload': {
-                'total': total, 'dataList': dataList
-            }
-        }
-    )
-
-
 @permission_required(ROLE.myuser)
 def getChargeRecordDetail(request):
     # type: (WSGIRequest)->JsonResponse

urls.py

@@ -22,18 +22,6 @@ urlpatterns = patterns('',
 
                        url(r'^dealer/', include('apps.web.dealer.urls')),
 
-                       # url(r'^api/cy4/', include('apps.web.api.cy4.urls')),
-                       # url(r'^api/dc/', include('apps.web.api.dc.urls')),
-                       # url(r'^api/jh/', include('apps.web.api.jh.urls')),
-                       # url(r'^api/jn/', include('apps.web.api.jn.urls')),
-                       # url(r'^api/openluat/', include('apps.web.api.openluat.urls')),
-                       # url(r'^api/test/', include('apps.web.api.test.urls')),
-                       # url(r'^api/v1/', include('apps.web.api.v1.urls')),
-                       # url(r'^api/ymd/', include('apps.web.api.ymd.urls')),
-                       # url(r'^api/ytb/', include('apps.web.api.ytb.urls')),
-                       # url(r'^api/ywt/', include('apps.web.api.ywt.urls')),
-                       # url(r'^api/swap/', include('apps.web.api.swap.urls')),
-                       url(r'^api/', include('apps.web.api.urls')),
                        url(r'^knowledge/', include('apps.web.knowledge.urls')),
                        url(r'^superadmin/', include('apps.web.superadmin.urls')),
                        url(r'^userLogin$', userLogin, name = 'userLogin'),
@@ -44,7 +32,6 @@ urlpatterns = patterns('',
                        url(r'^adAccess$', adAccess, name = 'adAccess'),
                        url(r'^wechat3rd/', include('apps.web.wechat3rd.urls')),
                        url(r'^interconnection/', include('apps.web.dealer.urls')),
-
                        )
 
 urlpatterns = urlpatterns + static(settings.LOGO_URL, document_root = settings.LOGO_ROOT)