首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0

浏览代码
Opt

Brightcells 7 年之前
父节点
4e979066f6
当前提交
548f4827df
共有 5 个文件被更改，包括 25 次插入 和 4 次删除
显示文件统计
  1. 1 1
      account/models.py
  2. 6 1
      api/model_views.py
  3. 2 2
      mch/admin.py
  4. 15 0
      mch/models.py
  5. 1 0
      page/sale_views.py

+ 1 - 1
account/models.py
查看文件 

@@ -390,7 +390,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
390 390 
             except SaleclerkInfo.DoesNotExist:
391 391 
                 saleclerk_info = {}
392 392 
         else:
393 
-            saleclerk_info = False
393 
+            saleclerk_info = {}
394 394 
         return {
395 395 
             'user_id': self.user_id,
396 396 
             'name': self.name,

+ 6 - 1
api/model_views.py
查看文件 

@@ -18,6 +18,7 @@ def model_add(request):
18 18 
     model_uni_name = request.POST.get('model_uni_name', '')
19 19 
     model_full_name = request.POST.get('model_full_name', '')
20 20 
     image_path = request.POST.get('image_path', '')
21 
+    image2_path = request.POST.get('image2_path', '')
21 22 
     factory_yuan = request.POST.get('factory_yuan', 1000)
22 23 
     integral = int(request.POST.get('integral', 100))
23 24 
 
@@ -40,6 +41,7 @@ def model_add(request):
40 41 
         category=category,
41 42 
         warehouse=warehouse,
42 43 
         image=image_path,
44 
+        image2=image2_path,
43 45 
         factory_yuan=factory_yuan,
44 46 
         factory_fee=monetary.Yuan2Fen(factory_yuan),
45 47 
         integral=integral,
 
@@ -78,6 +80,7 @@ def model_update(request):
78 80 
     model_uni_name = request.POST.get('model_uni_name', '')
79 81 
     model_full_name = request.POST.get('model_full_name', '')
80 82 
     image_path = request.POST.get('image_path', '')
83 
+    image2_path = request.POST.get('image2_path', '')
81 84 
     factory_yuan = request.POST.get('factory_yuan', 1000)
82 85 
     integral = int(request.POST.get('integral', 100))
83 86 
 
@@ -109,7 +112,9 @@ def model_update(request):
109 112 
     if warehouse:
110 113 
         modelObj.warehouse = warehouse
111 114 
     if image_path:
112 
-        modelObj.distributor_province_name = image_path
115 
+        modelObj.image = image_path
116 
+    if image2_path:
117 
+        modelObj.image2 = image2_path
113 118 
     if factory_yuan:
114 119 
         modelObj.factory_yuan = factory_yuan
115 120 
         modelObj.factory_fee = monetary.Yuan2Fen(factory_yuan)

+ 2 - 2
mch/admin.py
查看文件 

@@ -63,7 +63,7 @@ class BrandInfoAdmin(admin.ModelAdmin):
63 63
64 64
65 65 
 class ModelInfoAdmin(admin.ModelAdmin):
66 
-    list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'factory_yuan', 'integral', 'position', 'display', 'status', 'created_at', 'updated_at')
66 
+    list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'image2', 'factory_yuan', 'integral', 'position', 'display', 'status', 'created_at', 'updated_at')
67 67 
     list_filter = ('brand_name', 'category', 'warehouse', 'display', 'status')
68 68 
     readonly_fields = ('brand_name', 'factory_fee')
69 69 
     search_fields = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse')
 
@@ -114,7 +114,7 @@ class DistributorInfoAdmin(admin.ModelAdmin):
114 114
115 115
116 116 
 class SaleclerkInfoAdmin(admin.ModelAdmin):
117 
-    list_display = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_sex', 'clerk_phone', 'unionid', 'openid', 'integral', 'total_integral', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
117 
+    list_display = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_sex', 'clerk_phone', 'unionid', 'openid', 'num', 'integral', 'total_integral', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
118 118 
     list_filter = ('test_user', 'user_status', 'status')
119 119 
     search_fields = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_phone')
120 120

+ 15 - 0
mch/models.py
查看文件 

@@ -136,6 +136,8 @@ class ModelInfo(BaseModelMixin):
136 136 
     image = models.ImageField(_(u'image'), upload_to=upload_path, blank=True, null=True, help_text=u'图片')
137 137 
     url = models.CharField(_(u'url'), max_length=255, blank=True, null=True, help_text=u'链接')
138 138
139 
+    image2 = models.ImageField(_(u'image2'), upload_to=upload_path, blank=True, null=True, help_text=u'图片2')
140 
+
139 141 
     factory_yuan = models.FloatField(_(u'factory_yuan'), default=1000, help_text=u'出厂价(元)')
140 142 
     factory_fee = models.IntegerField(_(u'factory_fee'), default=100000, help_text=u'出厂价(分)')
141 143 
 
@@ -161,6 +163,14 @@ class ModelInfo(BaseModelMixin):
161 163 
         return upload_file_url(self.image)
162 164
163 165 
     @property
166 
+    def image2_path(self):
167 
+        return upload_file_path(self.image2)
168 
+
169 
+    @property
170 
+    def image2_url(self):
171 
+        return upload_file_url(self.image2)
172 
+
173 
+    @property
164 174 
     def data(self):
165 175 
         return {
166 176 
             'jancode': self.jancode,
 
@@ -195,6 +205,8 @@ class ModelInfo(BaseModelMixin):
195 205 
             'warehouse': self.warehouse,
196 206 
             'image_path': self.image_path,
197 207 
             'image_url': self.image_url,
208 
+            'image2_path': self.image2_path,
209 
+            'image2_url': self.image2_url,
198 210 
             'factory_yuan': self.factory_yuan,
199 211 
             'integral': self.integral,
200 212 
         }
 
@@ -303,6 +315,8 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):
303 315 
     unionid = models.CharField(_(u'unionid'), max_length=32, blank=True, null=True, help_text=u'微信 UnionID', db_index=True)
304 316 
     openid = models.CharField(_(u'openid'), max_length=32, blank=True, null=True, help_text=u'微信 OpenID', db_index=True)
305 317
318 
+    num = models.IntegerField(_(u'num'), default=0, help_text=u'支数')
319 
+
306 320 
     integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')
307 321 
     total_integral = models.IntegerField(_(u'total_integral'), default=0, help_text=u'全部积分')
308 322 
 
@@ -332,6 +346,7 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):
332 346 
             'clerk_name': self.clerk_name,
333 347 
             'clerk_sex': self.clerk_sex,
334 348 
             'clerk_phone': self.clerk_phone,
349 
+            'num': self.num,
335 350 
             'integral': self.integral,
336 351 
             'total_integral': self.total_integral,
337 352 
             'status': self.user_status,

+ 1 - 0
page/sale_views.py
查看文件 

@@ -111,6 +111,7 @@ def clerk_sale_submit_api(request):
111 111 
     # 店员积分
112 112 
     integral = model.integral
113 113
114 
+    clerk.num += 1
114 115 
     clerk.integral += integral
115 116 
     clerk.total_integral += integral
116 117 
     clerk.save()