订单显示修改

apps/web/dealer/views.py

@@ -1951,7 +1951,7 @@ def getIncomeList(request):
     groupId = request.GET.get('groupId')
 
     if groupId and groupId == 'undefined':
-        return JsonErrorResponse(description = u'地址过滤参数错误，请刷新后重试')
+        return JsonErrorResponse(description=u'地址过滤参数错误，请刷新后重试')
 
     if not groupId:
         groupIds = [ObjectId(groupId) for groupId in Group.get_group_ids_of_dealer_and_partner(current_dealer_id)]
@@ -1962,7 +1962,6 @@ def getIncomeList(request):
 
     filters = {
         "groupId__in": groupIds,
-        "hint": [('groupId', 1), ('dateTimeAdded', -1)],
     }
 
     if logicalCode:
@@ -1977,8 +1976,7 @@ def getIncomeList(request):
             DEALER_INCOME_SOURCE.RECHARGE,
             DEALER_INCOME_SOURCE.REDPACK,
             DEALER_INCOME_SOURCE.OFFLINE_COIN,
-            DEALER_INCOME_SOURCE.RECHARGE_CARD,
-            DEALER_INCOME_SOURCE.RECHARGE_VIRTUAL_CARD
+            DEALER_INCOME_SOURCE.LEDGER_CONSUME,
         ]
 
     filters.update({"source__in": sources})
@@ -2013,48 +2011,14 @@ def getIncomeList(request):
         incomes.append(_income)
         ref_ids.append(_income.ref_id)
 
-    # 取出所有的充值记录
-    recharges = dict()
-    if ref_ids:
-        for item in RechargeRecord.objects.filter(id__in=ref_ids):  # type: RechargeRecord
-            recharges[str(item.id)] = item
-
     # 最后看是否需要执行内存合单
     dataList = list()
     for _record in incomes:
-        if str(_record.ref_id) not in recharges:
-            logger.warning('order<id={}> not exist.'.format(str(_record.ref_id)))
-            continue
-
-        rechargeOrder = recharges[str(_record.ref_id)]  # type: RechargeRecord
-
-        # 找到同级的子单 然后一起合并
-        if rechargeOrder.isSubOrder:
-            _subOrders = RechargeRecord.objects.filter(
-                id__ne=rechargeOrder.id,
-                ownerId=rechargeOrder.ownerId,
-                devNo=rechargeOrder.devNo,
-                openId=rechargeOrder.openId,
-                wxOrderNo=rechargeOrder.wxOrderNo
-            )
 
-            # 找到该笔支付单的所有分账单proxy
-            _incomes = DealerIncomeProxy.objects.filter(ref_id__in=[_.id for _ in _subOrders])
-
-            _data = _record.to_dict(dealerId=current_dealer_id)
-            _data["subs"] = [_record.to_dict(current_dealer_id)]
-            for _income in _incomes:
-                _incomeDict = _income.to_dict(current_dealer_id)
-                _data["totalAmount"] += _incomeDict["totalAmount"]
-                _data["amount"] += _incomeDict["amount"]
-                _data["subs"].append(_incomeDict)
-
-        else:
-            _data = _record.to_dict(dealerId=current_dealer_id)
+        _data = _record.to_dict(dealerId=current_dealer_id)
 
         dataList.append(_data)
 
-
     return JsonResponse(
         {
             'result': 1,

taskmanager/config.py

@@ -101,11 +101,6 @@ CELERY_ROUTES = {
         'routing_key': MY_CELERY_ROUTING_KEY
     },
 
-    'tasks.report_service_complete_to_user_via_wechat': {
-        'queue': MY_CELERY_QUEUE,
-        'routing_key': MY_CELERY_ROUTING_KEY
-    },
-
     'tasks.add': {
         'queue': MY_CELERY_QUEUE,
         'routing_key': MY_CELERY_ROUTING_KEY