def record_sale_batch(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -713,14 +717,15 @@ def record_sale_batch(request):

     for log in logs:

         try:

             infos.append(SaleclerkSubmitLogInfo.objects.get(model_name__icontains=log['model_name'], code=log['code'], status=True, dupload=False).admindata)

-        except:

+        except SaleclerkSubmitLogInfo.DoesNotExist:

             unknows.append(log)

-    

+

     return response(200, 'Batch Get Record Sale Success', u'批量获取销售员销售记录', data={

         'logs': infos,

         'unknows': unknows

     })

+

 def model_list(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -776,11 +781,11 @@ def member_goods_order(request):

     except AdministratorInfo.DoesNotExist:

         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-    orders = GoodsOrderInfo.objects.filter(Q(phone__icontains=query) | Q(user_id=query) | Q(title__icontains=query) & Q(status=True)).order_by('-created_at')

+    orders = GoodsOrderInfo.objects.filter(Q(phone__icontains=query) | Q(user_id=query) | Q(title__icontains=query) & Q(status=True)).order_by('-pk')

     if good_type:

         orders = orders.filter(good_type=good_type)

-    

+

     # 未发货，即快递单号为空

     if order_status == 1:

         orders = orders.filter(Q(tracking_number__isnull=True) | Q(tracking_number=''))

@@ -816,6 +821,7 @@ def member_goods_order_update(request):

     return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')

+

 def member_goods_order_batch_update(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -833,7 +839,7 @@ def member_goods_order_batch_update(request):

     for order in orders:

         try:

             GoodsOrderInfo.objects.filter(order_id=order['order_id'], status=True).update(tracking_number=order['tracking_number'])

-        except:

+        except GoodsOrderInfo.DoesNotExist:

             err_orders.append(order['order_id'])

     if err_orders:

@@ -870,7 +876,7 @@ def record_warehouse(request):

         end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')

         logs = logs.filter(created_at__range=(start_time, end_time))

-    logs = logs.order_by('-created_at')

+    logs = logs.order_by('-pk')

     count = logs.count()

     logs, left = pagination(logs, page, num)

@@ -882,6 +888,7 @@ def record_warehouse(request):

         'count': count

     })

+

 def member_activity_list(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -905,9 +912,9 @@ def member_activity_list(request):

         start_time = datetime.strptime(start_time, '%Y%m%d')

         end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')

         logs = logs.filter(created_at__range=(start_time, end_time))

-    

-    logs = logs.order_by('-created_at')

- 

+

+    logs = logs.order_by('-pk')

+

     count = logs.count()

     logs, left = pagination(logs, page, num)

     logs = [log.admindata for log in logs]

@@ -917,6 +924,7 @@ def member_activity_list(request):

         'count': count

     })

+

 def member_activity_details(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -931,15 +939,16 @@ def member_activity_details(request):

     try:

         log = MemberActivityInfo.objects.get(activity_id=activity_id)

-    except:

+    except MemberActivityInfo.DoesNotExist:

         return response()

-    

+

     log = log.admindetails

     return response(200, 'Get Member Activity Record Details Success', u'获取会员活动详情成功', data={

         'log': log,

     })

+

 def member_activity_update(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -971,9 +980,9 @@ def member_activity_update(request):

     try:

         log = MemberActivityInfo.objects.get(activity_id=activity_id, status=True)

-    except:

+    except MemberActivityInfo.DoesNotExist:

         return response()

-    

+

     log.title = title

     log.subtitle = subtitle

     log.date = datetime.strptime(date + ' 23:59:59', '%Y-%m-%d %H:%M:%S')

@@ -994,6 +1003,7 @@ def member_activity_update(request):

     return response(200, 'MemberActivityInfo Update Success', u'会员活动更新成功')

+

 def member_activity_create(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1014,7 +1024,6 @@ def member_activity_create(request):

     share_h5_link = request.POST.get('share_h5_link', '')

     activity_state = int(request.POST.get('activity_state', 0))

-

     if brand_id != settings.KODO_DEFAULT_BRAND_ID:

         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

@@ -1045,6 +1054,7 @@ def member_activity_create(request):

     return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功')

+

 def member_activity_share_list(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1065,7 +1075,7 @@ def member_activity_share_list(request):

     total_integral = logs.aggregate(Sum('integral'))['integral__sum']

     logs = logs.values('share_user_id').annotate(integral_sum=Sum('integral'), group_count=Count('open_gid'), user_count=Count('click_user_id')).order_by('-user_count')

-    

+

     count = logs.count()

     logs, left = pagination(logs, page, num)

@@ -1076,6 +1086,7 @@ def member_activity_share_list(request):

         'total_integral': total_integral

     })

+

 def coupon_list(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1099,22 +1110,25 @@ def coupon_list(request):

         start_time = datetime.strptime(start_time, '%Y%m%d')

         end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')

         logs = logs.filter(created_at__range=(start_time, end_time))

-    

-    logs = logs.order_by('-created_at')

- 

+

+    logs = logs.order_by('-pk')

+

     count = logs.count()

     logs, left = pagination(logs, page, num)

     logs = [log.admindata for log in logs]

+

     return response(200, 'Get CouponInfo List Success', u'获取劵列表成功', data={

         'logs': logs,

         'left': left,

         'count': count

     })

+

 def coupon_details(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

     coupon_id = request.POST.get('coupon_id', '')

+

     if brand_id != settings.KODO_DEFAULT_BRAND_ID:

         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

@@ -1125,15 +1139,16 @@ def coupon_details(request):

     try:

         log = CouponInfo.objects.get(coupon_id=coupon_id)

-    except:

+    except CouponInfo.DoesNotExist:

         return response()

-    

+

     log = log.admindetails

     return response(200, 'Get Member Activity Record Details Success', u'获取会员活动详情成功', data={

         'log': log,

     })

+

 def coupon_create(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1155,14 +1170,14 @@ def coupon_create(request):

         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

     info = CouponInfo.objects.create(

-        brand_id = brand_id,

-        coupon_title = coupon_title,

-        coupon_detail = coupon_detail,

-        coupon_value = coupon_value,

-        coupon_image = coupon_image,

-        coupon_expire_type = coupon_expire_type,

-        coupon_valid_period = coupon_valid_period,

-        is_coupon_admin_writeoff = is_coupon_admin_writeoff

+        brand_id=brand_id,

+        coupon_title=coupon_title,

+        coupon_detail=coupon_detail,

+        coupon_value=coupon_value,

+        coupon_image=coupon_image,

+        coupon_expire_type=coupon_expire_type,

+        coupon_valid_period=coupon_valid_period,

+        is_coupon_admin_writeoff=is_coupon_admin_writeoff,

     )

     if coupon_expire_at:

@@ -1171,6 +1186,7 @@ def coupon_create(request):

     return response(200, 'CouponInfo Create Success', u'劵创建成功')

+

 def coupon_update(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1194,9 +1210,9 @@ def coupon_update(request):

     try:

         log = CouponInfo.objects.get(coupon_id=coupon_id, status=True)

-    except:

+    except CouponInfo.DoesNotExist:

         return response()

-    

+

     log.brand_id = brand_id

     log.coupon_title = coupon_title

     log.coupon_detail = coupon_detail

@@ -1211,6 +1227,7 @@ def coupon_update(request):

     return response(200, 'CouponInfo Update Success', u'劵更新成功')

+

 def coupon_delete(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1226,14 +1243,15 @@ def coupon_delete(request):

     try:

         log = CouponInfo.objects.get(coupon_id=coupon_id, status=True)

-    except:

+    except CouponInfo.DoesNotExist:

         return response()

-    

+

     log.status = False

     log.save()

     return response(200, 'CouponInfo Delete Success', u'劵删除成功')

+

 def member_goods_list(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1249,8 +1267,8 @@ def member_goods_list(request):

     except AdministratorInfo.DoesNotExist:

         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-    logs = GoodsInfo.objects.filter(title__icontains=title, only_for_member=False).order_by('-created_at')

-     

+    logs = GoodsInfo.objects.filter(title__icontains=title, only_for_member=False).order_by('-pk')

+

     count = logs.count()

     logs, left = pagination(logs, page, num)

     logs = [log.admindata for log in logs]

@@ -1260,10 +1278,12 @@ def member_goods_list(request):

         'count': count

     })

+

 def member_goods_details(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

     good_id = request.POST.get('good_id', '')

+

     if brand_id != settings.KODO_DEFAULT_BRAND_ID:

         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

@@ -1274,15 +1294,16 @@ def member_goods_details(request):

     try:

         log = GoodsInfo.objects.get(good_id=good_id)

-    except:

+    except GoodsInfo.DoesNotExist:

         return response()

-    

+

     log = log.admindetails

     return response(200, 'Get Member Goods Details Success', u'获取积分商品详情成功', data={

         'log': log,

     })

+

 def member_goods_update(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1307,9 +1328,9 @@ def member_goods_update(request):

     try:

         log = GoodsInfo.objects.get(good_id=good_id, status=True)

-    except:

+    except GoodsInfo.DoesNotExist:

         return response()

-    

+

     log.title = title

     log.desc = desc

     log.value = value

@@ -1323,6 +1344,7 @@ def member_goods_update(request):

     return response(200, 'GoodsInfo Update Success', u'积分商品更新成功')

+

 def member_goods_create(request):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

@@ -1359,4 +1381,4 @@ def member_goods_create(request):

         fee=fee,

     )

-    return response(200, 'GoodsInfo Create Success', u'积分商品创建成功')

+    return response(200, 'GoodsInfo Create Success', u'积分商品创建成功')

@@ -0,0 +1,52 @@

+# -*- coding: utf-8 -*-

+

+from __future__ import division

+

+from django_logit import logit

+from django_response import response

+

+from logs.models import ComplementCodeLogInfo

+from paginator import pagination

+

+

+@logit(res=True)

+def complement_code(request):

+    user_id = request.POST.get('user_id', '')

+    log_id = request.POST.get('log_id', '')

+    name = request.POST.get('name', '')

+    phone = request.POST.get('phone', '')

+    model_id = request.POST.get('model_id', '')

+    model_name = request.POST.get('model_name', '')

+    sn = request.POST.get('sn', '')

+    shot_path = request.POST.get('shot_path', '')

+    invoice_path = request.POST.get('invoice_path', '')

+

+    log = ComplementCodeLogInfo.objects.update_or_create(user_id=user_id, log_id=log_id, defaults={

+        'name': name,

+        'phone': phone,

+        'model_id': model_id,

+        'model_name': model_name,

+        'sn': sn,

+        'shot_path': shot_path,

+        'invoice_path': invoice_path,

+    })

+

+    return response(data={

+        'log_id': log.log_id,

+    })

+

+

+def complement_code_list(request):

+    user_id = request.POST.get('user_id', '')

+    page = request.POST.get('page', 1)

+    num = request.POST.get('num', 20)

+

+    logs = ComplementCodeLogInfo.objects.filter(user_id=user_id, status=True).order_by('-pk')

+

+    logs, left = pagination(logs, page, num)

+    logs = [log.admindata for log in logs]

+

+    return response(200, 'Get Complement Code List Success', u'获取补码列表成功', data={

+        'logs': logs,

+        'left': left,

+    })

@@ -356,11 +356,11 @@ def consumer_info_api(request):

             submit_pk=log.pk,

         )

-    #更新注册时间

+    # 更新注册时间

     if not dupload:

         user.resgister_at = log.created_at

         user.save()

-    

+

     if not user.test_user and not dupload:

         # TODO: Make statistic async

@@ -453,7 +453,7 @@ def consumer_info_api(request):

         user.integral += model.shot_member_integral

         # 配件不增加会员等级，只发放积分。

         to_send_coupon = False

-        if user.level < UserInfo.MEMBER_BLACK_GOLD and model.category != '调焦器' and model.category !='增倍镜':

+        if user.level < UserInfo.MEMBER_BLACK_GOLD and model.category != '调焦器' and model.category != '增倍镜':

             user.level += 1

             to_send_coupon = True

         user.save()

@@ -491,6 +491,7 @@ def consumer_snlist_api(request):

         'logs': logs,

     })

+

 @logit(res=True)

 @transaction.atomic

 def consumer_model_list(request):

@@ -501,11 +502,11 @@ def consumer_model_list(request):

         user = UserInfo.objects.get(user_id=user_id)

     except UserInfo.DoesNotExist:

         return response(UserStatusCode.USER_NOT_FOUND)

-    

-    #返回型号列表

+

+    # 返回型号列表

     models = ModelInfo.objects.filter(shot_type_id__isnull=False, status=True).order_by('-shot_member_name')

     models = [model.consumer_shot_data for model in models]

-    

+

     return response(200, 'Get Model List Success', u'获取型号列表成功', {

         'models': models,

-    })

+    })

@@ -71,7 +71,7 @@ def exec_del_clerk_sale_submit(pk, admin_id):

         clerk.total_integral -= integral

         clerk.save()

-        #记录删除日志

+        # 记录删除日志

         StaffDeleteClerkSaleSubmitLogInfo.objects.create(

             admin_id=admin_id,

             log_pk=pk,

@@ -239,6 +239,7 @@ def del_clerk_sale_submit_api(request):

     return response(200, 'Del Success', u'删除成功')

+

 @logit

 @transaction.atomic

 def batch_del_clerk_sale_submit_api(request):

@@ -290,8 +291,8 @@ def exec_del_consumer_submit(pk, admin_id):

         user = UserInfo.objects.select_for_update().get(user_id=ssli.user_id)

     except UserInfo.DoesNotExist:

         return response()

-    

-    #记录删除日志

+

+    # 记录删除日志

     StaffDeleteConsumerSubmitLogInfo.objects.create(

         admin_id=admin_id,

         log_pk=pk,

@@ -505,8 +506,8 @@ def batch_del_consumer_submit_api(request):

         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

     except AdministratorInfo.DoesNotExist:

         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-    

+

     for pk in pks:

         exec_del_consumer_submit(pk, admin_id)

-    return response(200, 'Del Success', u'删除成功')

+    return response(200, 'Del Success', u'删除成功')

@@ -3,15 +3,12 @@

 from django.conf.urls import url

 from django_file_upload import views as file_views

-from account import views as account_views

-from api import (admin_views, clerk_views, distributor_views, encrypt_views, log_views, mch_views, member_views,

+from api import (admin_views, clerk_views, complement_views, distributor_views, encrypt_views, log_views, mch_views, member_views,

                  model_views, operator_views, refresh_views, sr_views, staff_views, wx_views)

 from miniapp import qy_views

 from miniapp import views as mini_views

-from operation import views as op_views

 from page import oauth_views, sale_views, screen_views

 from sales import views as sales_views

-from server import server_views

 from statistic import views as tj_views

 # Mini App

@@ -163,13 +160,13 @@ urlpatterns += [

     url(r'^admin/member/goods/order$', admin_views.member_goods_order, name='member_goods_order'),

     url(r'^admin/member/goods/order/update$', admin_views.member_goods_order_update, name='member_goods_order_update'),

     url(r'^admin/member/goods/order/batch/update$', admin_views.member_goods_order_batch_update, name='member_goods_order_batch_update'),

-    

+

     url(r'^admin/member/activity/list$', admin_views.member_activity_list, name='member_activity_list'),

     url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'),

     url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'),

     url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'),

     url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'),

-    

+

     url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'),

     url(r'^admin/coupon/details$', admin_views.coupon_details, name='coupon_update'),

     url(r'^admin/coupon/create$', admin_views.coupon_create, name='coupon_create'),

@@ -240,3 +237,8 @@ urlpatterns += [

 urlpatterns += [

     url(r'^get_limit_scene_qrcode_url$', wx_views.get_limit_scene_qrcode_url, name='get_limit_scene_qrcode_url'),

 ]

+

+urlpatterns += [

+    url(r'^complement/code$', complement_views.complement_code, name='complement_code'),

+    url(r'^complement/code/list$', complement_views.complement_code_list, name='complement_code_list'),

+]

@@ -56,7 +56,7 @@ class CouponInfo(BaseModelMixin):

         if self.coupon_expire_type == CouponInfo.FIXED_EXPIRED_TIME:

             return self.coupon_expire_at

         return tc.utc_datetime(days=self.coupon_valid_period)

-    

+

     @property

     def admindata(self):

         return {

@@ -71,7 +71,7 @@ class CouponInfo(BaseModelMixin):

             'is_coupon_admin_writeoff': self.is_coupon_admin_writeoff,

             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),

         }

-    

+

     @property

     def admindetails(self):

         return {

@@ -3,7 +3,7 @@

 from django.contrib import admin

 from django_admin import ReadOnlyModelAdmin

-from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo, MchLogInfo, MchSearchModelAndCameraLogInfo

+from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo, MchLogInfo, MchSearchModelAndCameraLogInfo, ComplementCodeLogInfo

 class MchInfoEncryptLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):

@@ -22,18 +22,18 @@ class MchLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):

     search_fields = ('operator_id', 'app_version')

-class MchLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):

-    list_display = ('log_id', 'log_file', 'operator_id', 'app_version', 'status', 'created_at', 'updated_at')

-    list_filter = ('operator_id', 'app_version', 'status')

-    search_fields = ('operator_id', 'app_version')

-

-

 class MchSearchModelAndCameraLogInfoAdmin(admin.ModelAdmin):

     list_display = ('user_id', 'is_search_model', 'is_selected_model', 'is_search_camera', 'is_search_model_camera', 'is_search_camera_after_model', 'created_at')

     list_filter = ('is_search_model', 'is_selected_model', 'is_search_camera', 'is_search_model_camera', 'is_search_camera_after_model')

+class ComplementCodeLogInfoAdmin(admin.ModelAdmin):

+    list_display = ('user_id', 'log_id', 'name', 'phone', 'model_id', 'model_name', 'sn', 'shot_image', 'invoice_image', 'status', 'created_at', 'updated_at')

+    list_filter = ('model_id', 'status')

+

+

 admin.site.register(MchInfoDecryptLogInfo, MchInfoDecryptLogInfoAdmin)

 admin.site.register(MchInfoEncryptLogInfo, MchInfoEncryptLogInfoAdmin)

 admin.site.register(MchSearchModelAndCameraLogInfo, MchSearchModelAndCameraLogInfoAdmin)

 admin.site.register(MchLogInfo, MchLogInfoAdmin)

+admin.site.register(ComplementCodeLogInfo, ComplementCodeLogInfoAdmin)

@@ -0,0 +1,39 @@

+# -*- coding: utf-8 -*-

+# Generated by Django 1.11.29 on 2021-01-04 07:47

+from __future__ import unicode_literals

+

+from django.db import migrations, models

+import django_models_ext.fileext

+import shortuuidfield.fields

+

+

+class Migration(migrations.Migration):

+

+    dependencies = [

+        ('logs', '0012_auto_20201130_0131'),

+    ]

+

+    operations = [

+        migrations.CreateModel(

+            name='ComplementCodeLogInfo',

+            fields=[

+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

+                ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),

+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),

+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),

+                ('user_id', models.CharField(blank=True, db_index=True, help_text='\u7528\u6237\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='user_id')),

+                ('log_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u65e5\u5fd7\u552f\u4e00\u6807\u8bc6', max_length=22)),

+                ('name', models.CharField(blank=True, help_text='\u7528\u6237\u59d3\u540d', max_length=255, null=True, verbose_name='name')),

+                ('phone', models.CharField(blank=True, db_index=True, help_text='\u7528\u6237\u7535\u8bdd', max_length=11, null=True, verbose_name='phone')),

+                ('model_id', models.CharField(blank=True, db_index=True, help_text='\u578b\u53f7\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='model_id')),

+                ('model_name', models.CharField(blank=True, help_text='\u578b\u53f7\u540d\u79f0', max_length=255, null=True, verbose_name='model_name')),

+                ('sn', models.CharField(blank=True, db_index=True, help_text='\u5e8f\u5217\u53f7', max_length=32, null=True, verbose_name='sn')),

+                ('shot_image', models.ImageField(blank=True, help_text='\u955c\u5934\u673a\u8eab\u7167\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='shot_image')),

+                ('invoice_image', models.ImageField(blank=True, help_text='\u8d2d\u4e70\u51ed\u8bc1\u7167\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='invoice_image')),

+            ],

+            options={

+                'verbose_name': '\u8865\u7801\u8bb0\u5f55',

+                'verbose_name_plural': '\u8865\u7801\u8bb0\u5f55',

+            },

+        ),

+    ]

@@ -113,3 +113,27 @@ class MchSearchModelAndCameraLogInfo(BaseModelMixin):

     def __unicode__(self):

         return '%d' % self.pk

+

+

+class ComplementCodeLogInfo(BaseModelMixin):

+    user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)

+

+    log_id = ShortUUIDField(_(u'log_id'), max_length=32, help_text=u'日志唯一标识', db_index=True)

+

+    name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'用户姓名')

+    phone = models.CharField(_(u'phone'), max_length=11, blank=True, null=True, help_text=u'用户电话', db_index=True)

+

+    model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)

+    model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称')

+

+    sn = models.CharField(_(u'sn'), max_length=32, blank=True, null=True, help_text=u'序列号', db_index=True)

+

+    shot_image = models.ImageField(_(u'shot_image'), upload_to=upload_path, blank=True, null=True, help_text=u'镜头机身照片')

+    invoice_image = models.ImageField(_(u'invoice_image'), upload_to=upload_path, blank=True, null=True, help_text=u'购买凭证照片')

+

+    class Meta:

+        verbose_name = _(u'补码记录')

+        verbose_name_plural = _(u'补码记录')

+

+    def __unicode__(self):

+        return '%d' % self.pk

@@ -11,6 +11,7 @@ from TimeConvert import TimeConvert as tc

 from coupon.models import CouponInfo

+

 class AdministratorInfo(BaseModelMixin):

     ADMINISTRATOR = 0

     MAINTENANCE = 1

@@ -259,7 +260,7 @@ class ModelInfo(BaseModelMixin):

             'shot_image': self.shot_member_image_url,

             'integral': self.shot_member_integral,

         }

-    

+

     @property

     def consumer_shot_data(self):

         from member.models import ShotTypeInfo

@@ -276,6 +277,7 @@ class ModelInfo(BaseModelMixin):

             'shot_type_name': shot_type.shot_type_name

         }

+

 class ModelImageInfo(BaseModelMixin):

     model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)

     model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称')

@@ -102,7 +102,7 @@ class GoodsInfo(BaseModelMixin):

     def admindata(self):

         try:

             coupon = CouponInfo.objects.get(coupon_id=self.coupon_id).admindata

-        except:

+        except CouponInfo.DoesNotExist:

             coupon = {}

         return {

             'good_id': self.good_id,

@@ -119,12 +119,12 @@ class GoodsInfo(BaseModelMixin):

             'coupon': coupon,

             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),

         }

-    

+

     @property

     def admindetails(self):

         try:

             coupon = CouponInfo.objects.get(coupon_id=self.coupon_id).admindata

-        except:

+        except CouponInfo.DoesNotExist:

             coupon = {}

         return {

             'good_id': self.good_id,

@@ -143,6 +143,7 @@ class GoodsInfo(BaseModelMixin):

             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),

         }

+

 class GoodsOrderInfo(BaseModelMixin):

     PHYSICAL = 0

     VIRTUAL = 1

@@ -456,7 +457,7 @@ class MemberActivityInfo(BaseModelMixin):

             'is_signed': self.is_signed(user_id),

             'is_signup': self.is_signup,

         }

-    

+

     @property

     def admindata(self):

         return {

@@ -482,7 +483,7 @@ class MemberActivityInfo(BaseModelMixin):

             'activity_state': self.activity_state,

             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),

         }

-    

+

     @property

     def admindetails(self):

         return {

@@ -585,7 +586,7 @@ class MemberActivityGroupShareInfo(BaseModelMixin):

     class Meta:

         verbose_name = _(u'会员活动群组分享信息')

         verbose_name_plural = _(u'会员活动群组分享信息')

-        

+

         unique_together = (

             ('activity_id', 'share_user_id', 'click_user_id', 'open_gid', 'brand_id'),

         )

@@ -248,6 +248,7 @@ def membercard_extradata(request):

     return response(200, 'Get extraData Success', u'获取 extraData 成功', extraData)

+

 @logit

 @transaction.atomic

 def user_integral_add(request):

@@ -276,5 +277,3 @@ def user_integral_add(request):

     user.save()

     return response(200, 'Add User Integral Success', u'添加用户投稿积分成功')

-

-

@@ -68,6 +68,7 @@ def online_api(request):

         'online': app_settings.get('online', True),

     })

+

 @logit

 def splash_api(request):

     """ 启动页面 """

@@ -11,6 +11,7 @@ from mch.models import BrandInfo, DistributorInfo, SaleclerkInfo

 from utils.error.errno_utils import ProductBrandStatusCode, ProductDistributorStatusCode, SaleclerkStatusCode

 from utils.redis.connect import r

+

 def login_qrcode(request):

     lensman_type = int(request.GET.get('lt') or 0)

     unionid = request.GET.get('unionid', '')

@@ -577,7 +577,7 @@ def clerk_checkout_serialNo_api(request):

     except SaleclerkInfo.DoesNotExist:

         return response(SaleclerkStatusCode.CLERK_NOT_FOUND)

-    log = MchInfoEncryptLogInfo.objects.filter(model_pk=model_pk, sn=serialNo).order_by('-created_at')

+    log = MchInfoEncryptLogInfo.objects.filter(model_pk=model_pk, sn=serialNo).order_by('-pk')

     if not log:

         return response(ProductMachineStatusCode.SN_NOT_FOUND)

@@ -8,10 +8,10 @@ from staff.models import StaffDeleteClerkSaleSubmitLogInfo, StaffDeleteConsumerS

 class StaffDeleteClerkSaleSubmitLogInfoAdmin(admin.ModelAdmin):

     list_display = ('admin_id', 'log_pk', 'model_name', 'code', 'status', 'created_at', 'updated_at')

+

 class StaffDeleteConsumerSubmitLogInfoAdmin(admin.ModelAdmin):

     list_display = ('admin_id', 'log_pk', 'model_name', 'code', 'status', 'created_at', 'updated_at')

 admin.site.register(StaffDeleteClerkSaleSubmitLogInfo, StaffDeleteClerkSaleSubmitLogInfoAdmin)

 admin.site.register(StaffDeleteConsumerSubmitLogInfo, StaffDeleteConsumerSubmitLogInfoAdmin)

-

@@ -18,6 +18,7 @@ class StaffDeleteClerkSaleSubmitLogInfo(BaseModelMixin):

     def __unicode__(self):

         return '%d' % self.pk

+

 class StaffDeleteConsumerSubmitLogInfo(BaseModelMixin):

     admin_id = models.CharField(_(u'admin_id'), max_length=32, blank=True, null=True, help_text=u'管理员ID', db_index=True)

     log_pk = models.CharField(_(u'log_pk'), max_length=32, blank=True, null=True, help_text=u'消费者提交记录关联pk', db_index=True)

@@ -99,6 +99,7 @@ class MarketCodeStatusCode(BaseStatusCode):

     """ 一物一码相关错误码 5050xx """

     MARKET_CODE_NOT_FOUND = StatusCodeField(505001, 'Market Code Not Found', description=u'一物一码不存在')

+

 class AdministratorStatusCode(BaseStatusCode):

     """ 操作员相关错误码 4002xx """

     ADMINISTRATOR_NOT_FOUND = StatusCodeField(400201, 'Administrator Not Found', description=u'管理员不存在')

@@ -150,10 +151,12 @@ class WechatStatusCode(BaseStatusCode):

     UNIONID_NOT_FOUND = StatusCodeField(400702, 'Unionid Not Found', description=u'微信 UNIONID 不存在')

     OPENID_NOT_FOUND = StatusCodeField(400703, 'OPENID Not Found', description=u'微信 OPENID 不存在')

+

 class ScreenStatusCode(BaseStatusCode):

     """ 群组/团相关错误码 4030xx """

     QRCODE_NOT_SCAN = StatusCodeField(403001, 'QRCode Not Scan', description=u'二维码未扫描')

+

 class PermissionStatusCode(BaseStatusCode):

     """ 4099xx 权限相关错误码 """

     PERMISSION_DENIED = StatusCodeField(409900, 'Permission Denied', description=u'权限不足')

Página Inicial Explorar Ajuda

Registrar Entrar

Kodo

/

kodo

Observar 2

Favorito 0

Fork 0

Problemas 0 Pull Requests 0 Commits 962 Versões 0

Nenhuma Descrição

SSH HTTPS

ZIP TAR.GZ

• Árvore: 23e88fb058

  Branches Tags

  demo

  py3.11dj4.x

  tamron

  wine
• kodo

  /

  sales

  /

  admin.py

admin.py 1.4KB

Histórico Cru

# -*- coding: utf-8 -*- from django.contrib import admin from sales.models import (SalesResponsibilityInfo, SalesResponsibilityInfoModelsSaleStatisticInfo, SuperSalesResponsibilityInfoModelsSaleStatisticInfo) class SalesResponsibilityInfoAdmin(admin.ModelAdmin): list_display = ('brand_id', 'brand_name', 'sr_id', 'user_id', 'name', 'phone', 'user_status', 'is_auth', 'is_super', 'status', 'created_at', 'updated_at') list_filter = ('brand_id', 'user_status', 'is_auth', 'is_super', 'status') class SalesResponsibilityInfoModelsSaleStatisticInfoAdmin(admin.ModelAdmin): list_display = ('brand_id', 'distributor_id', 'distributor_name', 'model_id', 'model_name', 'is_important', 'ymd', 'today_num', 'yesterday_num', 'current_month', 'last_month', 'position', 'status', 'created_at', 'updated_at') class SuperSalesResponsibilityInfoModelsSaleStatisticInfoAdmin(admin.ModelAdmin): list_display = ('brand_id', 'sr_id', 'sr_name', 'ymd', 'today_num', 'yesterday_num', 'current_month', 'last_month', 'position', 'status', 'created_at', 'updated_at') admin.site.register(SalesResponsibilityInfo, SalesResponsibilityInfoAdmin) admin.site.register(SalesResponsibilityInfoModelsSaleStatisticInfo, SalesResponsibilityInfoModelsSaleStatisticInfoAdmin) admin.site.register(SuperSalesResponsibilityInfoModelsSaleStatisticInfo, SuperSalesResponsibilityInfoModelsSaleStatisticInfoAdmin)