诗仙太白积分报表

banquet/views.py

 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
+
+from inventory.views import points_changed
 from .models import *
 from .forms import *
 from company.models import Company, User
@@ -233,6 +235,8 @@ def ajaxBanquetApply(request):
                 apply.permiter_id = d['permiter_id']
 
             apply.save()
+            if 'status' in d and d['status']==1:
+                points_changed.send(apply)
 
             existCodes = []
             acs = Apply_Codes.objects.filter(apply_id=apply.id)
@@ -266,6 +270,11 @@ def ajaxBanquetApply(request):
                         product_id=product_id,
                         package_id=package_id
                     )
+                    if 'label_pk_id' in citem:
+                        ac.package_id =citem['package_id'],
+                        ac.label_id =citem['label_id'],
+                        ac.label_pk_id = citem['label_pk_id'],
+                        ac.parent_id = citem['parent_id'],
                     ac.save()
 
             

company/views.py

@@ -7560,38 +7560,42 @@ def bonusPoints_edit_list(request, cid, type=None):
         data['data'].append([ i[1],i[0],i[3],i[2]])
     return  JsonResponse(data)
 
-
 #积分报表
 @login_required
 def bonusPoints_list(request):
     data = {'data': [], 'clmns': [], 'e': [],
-            'subtt': ['渠道促销', '积分报表'], 'murl': '', 'dt': False, 'add': True}
-    data['clmns'] = ['区域', '兑换终端', '联系人', '兑换积分', '领取金额', '兑换时间','剩余可使用积分','终端累计总积分','备注']
+            'subtt': ['渠道促销', '积分报表'], 'murl': '', 'dt': True, 'add': True,'date_from':'','date_to':''}
+    data['clmns'] = ['兑换终端', '区域', '联系人', '兑换积分', '兑换金额', '兑换时间','剩余可用积分','累计兑换金额']
+    dt_default = datetime.datetime.now().strftime('%Y-%m-%d')
+    dt_fr_default = (datetime.datetime.now() - datetime.timedelta(days=7)).strftime('%Y-%m-%d')
+    dt_fr = request.GET.get('date_from', dt_fr_default)
+    dt_to = request.GET.get('date_to', dt_default)
+    data["date_from"] = dt_fr
+    data["date_to"] = dt_to
+    sWhere = " and (dt between '" + dt_fr + "' and '" + dt_to + "')"
+
     data['show_add'] = False
     # data['murl'] = '/company/bonusPoints/edit/'
     cur = connection.cursor()
     company_id = request.user.company_id
     ancestor_id = request.user.ancestor_id
-    if ancestor_id == company_id:
-        bps = PointsRedeemed.objects.filter(ancestor_id=ancestor_id)
-    else:
-        bps = PointsRedeemed.objects.filter(company_id=company_id)
-    for t in bps:
-        remark = t.remark
-        if not t.remark:
-            remark = ""
+    ancestor_id = 19318
+    company_id = 19318
+
     s=f"""
-            select  (select name from company_salesdivision where id=(select division_id from company_company where '{t.company_id}'=id limit 1),
-            (select username,lastname from company_user where {t.user_id}=id limit 1),
-            points from company_bonuspoints where {t.company_id}=id   
+        SELECT COALESCE(d.name,'未划分'),b.name,c.username,a.points::TEXT,a.amount::TEXT,to_char(a.tm,'yyyy-mm-dd HH24:MI:SS')tm,e.points::TEXT,f.amounts::TEXT  from (
+        SELECT * FROM logistics.company_pointsredeemed WHERE ancestor_id = {ancestor_id} {sWhere})A
+        left outer join (select id ,division_id,name from company_company WHERE ancestor_id = {ancestor_id} )b on b.id = a.company_id
+        left outer join (SELECT id ,username ,last_name from company_user WHERE ancestor_id = {ancestor_id})c on c.id =a.user_id 
+        left outer join (SELECT id ,name  from company_salesdivision )d on d.id =b.id 
+        left outer join (SELECT points,company_id from company_bonuspoints WHERE ancestor_id = {ancestor_id})e on e.company_id =a.company_id 
+        left outer join (SELECT sum(amount)amounts,company_id from company_pointsredeemed WHERE ancestor_id = {ancestor_id} GROUP BY company_id)f on f.company_id=a.company_id
     """
     cur.execute(s)
-        r = cur.fetchone()
-        a=r[3] + t.points
-        data['data'].append([r[0]
-            ,r[1],r[2],t.points,t.amount,t.tm,r[3],a,remark
-        ])
+    rs = cur.fetchall()
+    if rs:
+        for r in rs :
+            data['data'].append([r[1],r[0],r[2],r[3],r[4],r[5],r[6],r[7] ])
     return render(request, 'obj/list_points.html', data)
 
 
-

datacenter/urls.py

@@ -1211,6 +1211,7 @@ urlpatterns = [
 
     #用户积分信息
     url(r'^company/bonuspoints/infor/(?P<comapny_id>\d+)/$',company_views.bonuspoints_infor),
+    # 诗仙太白积分提现
     url(r'^company/sxtb/rebate/wx_withdraw/$', inventory_views.wx_withdraw_cash),
 
     # 诗仙太白积分活动

inventory/views.py

@@ -14303,9 +14303,9 @@ def wx_withdraw_cash(request):
     data={'e':''}
     k = sK
     e = time_key_check(request, k)
-    # if e:
-    #     data['e'] = e
-    #     return JsonResponse(data)
+    if e:
+        data['e'] = e
+        return JsonResponse(data)
     cur = connection.cursor()
     if request.method =='GET':
         pass