|
|
@@ -33,6 +33,7 @@ class ProductView(APIView):
|
|
|
data.append(item)
|
|
|
return response_ok(data)
|
|
|
|
|
|
+
|
|
|
class DeleteProductImageView(APIView):
|
|
|
permission_classes = [isLogin, ]
|
|
|
|
|
|
@@ -140,6 +141,7 @@ class OrderListView(ListAPIView):
|
|
|
f = OrderFilter(self.request.GET, queryset=queryset)
|
|
|
return f.qs
|
|
|
|
|
|
+
|
|
|
class OrderCreatView(CreateAPIView):
|
|
|
# 匿名用户申报
|
|
|
queryset = Order.objects.filter()
|
|
|
@@ -166,6 +168,7 @@ class OrderCreatView(CreateAPIView):
|
|
|
except Exception as e:
|
|
|
return response_error(str(e))
|
|
|
|
|
|
+
|
|
|
class OrderUploadView(CreateAPIView):
|
|
|
# 匿名用户申报上传图片
|
|
|
queryset = Order.objects.filter()
|
|
|
@@ -216,6 +219,7 @@ class OrderUploadView(CreateAPIView):
|
|
|
except Exception as e:
|
|
|
return response_error(str(e))
|
|
|
|
|
|
+
|
|
|
class OrderDeleteImgView(CreateAPIView):
|
|
|
# 匿名用户申报上传图片
|
|
|
queryset = Order.objects.filter()
|
|
|
@@ -245,6 +249,7 @@ class OrderDeleteImgView(CreateAPIView):
|
|
|
except Exception as e:
|
|
|
return response_error(str(e))
|
|
|
|
|
|
+
|
|
|
class OrderViewSet(CustomModelViewSet):
|
|
|
permission_classes = [isLogin, ]
|
|
|
queryset = Order.objects.filter()
|
|
|
@@ -293,15 +298,15 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
else:
|
|
|
edit_file.append(item)
|
|
|
# 待审核，加载图片使用
|
|
|
- if instance.status == order.ZERO:
|
|
|
- images = OrderImages.objects.filter(order=instance)
|
|
|
- for image in images:
|
|
|
- item2 = {
|
|
|
- 'upload_id': image.image.id,
|
|
|
- 'url': image.image.get_path(),
|
|
|
- 'type': image.type,
|
|
|
- }
|
|
|
- edit_file2.append(item2)
|
|
|
+ # if instance.status == order.ZERO:
|
|
|
+ images = OrderImages.objects.filter(order=instance)
|
|
|
+ for image in images:
|
|
|
+ item2 = {
|
|
|
+ 'upload_id': image.image.id,
|
|
|
+ 'url': image.image.get_path(),
|
|
|
+ 'type': image.type,
|
|
|
+ }
|
|
|
+ edit_file2.append(item2)
|
|
|
result = {
|
|
|
'data': serializer.data,
|
|
|
'edit_values': edit_data,
|
|
|
@@ -341,6 +346,8 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
serializer = self.get_serializer(instance, data=request.data)
|
|
|
if serializer.is_valid(raise_exception=True):
|
|
|
instance = serializer.save()
|
|
|
+ instance.create_user = request.user
|
|
|
+ instance.save()
|
|
|
# 已上报的，修改，记录修改时间
|
|
|
if instance.category == order.ONE:
|
|
|
for key in data:
|
|
|
@@ -351,7 +358,7 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
edit.save()
|
|
|
instance.status = order.ZERO
|
|
|
instance.save()
|
|
|
- BizLog.objects.addnew(self.request.user, BizLog.INSERT,
|
|
|
+ BizLog.objects.addnew(request.user, BizLog.INSERT,
|
|
|
u'修改订单[%s]，id=%d' % (instance.name, instance.id), request.data)
|
|
|
return response_ok(instance.id)
|
|
|
except CustomError as e:
|
|
|
@@ -387,9 +394,14 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
if not len(data):
|
|
|
raise CustomError('请填写返回修改原因')
|
|
|
# 删除已修改过的历史修改信息
|
|
|
- OrderDetailEdit.objects.filter(order=instance, edit_time__isnull=False).delete()
|
|
|
+ rowss = OrderDetailEdit.objects.filter(order=instance, edit_time__isnull=False)
|
|
|
+ rowss.delete()
|
|
|
for item in json.loads(data):
|
|
|
- OrderDetailEdit.objects.create(order=instance, value=item['name'], reason=item['reason'],
|
|
|
+ edit = OrderDetailEdit.objects.filter(order=instance, value=item['name'], type=item['type'])
|
|
|
+ if edit:
|
|
|
+ edit.update(reason=item['reason'], edit_time=None)
|
|
|
+ else:
|
|
|
+ OrderDetailEdit.objects.create(order=instance, value=item['name'], reason=item['reason'],
|
|
|
type=item['type'])
|
|
|
if int(item['type']) == OrderDetailEdit.ONE:
|
|
|
OrderImages.objects.filter(order=instance, type=item['name']).update(enable=False)
|
|
|
@@ -484,7 +496,7 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
'waddress', 'itype_text', 'otype_text', 'position', 'wbst_text', 'bstname', 'bstcode', 'bsttel',
|
|
|
'bstaddress',
|
|
|
'cname', 'ctel', 'relation_text', 'caddress', 'ctname', 'cttel', 'thesame_text', 'tsname', 'tsbdate',
|
|
|
- 'tsitype_text', 'tsinumber', 'tstel', 'tsrelation_text', 'tsnaddress', 'tsmaddress', 'tsemail', 'tswx',
|
|
|
+ 'tsitype_text', 'tsinumber', 'tstel', 'tsrelation_text', 'tsnaddress', 'tsmaddress_text', 'tsemail', 'tswx',
|
|
|
'tswname', 'tswphone', 'tswaddress', 'tsmincome',
|
|
|
]
|
|
|
result = []
|
|
|
@@ -529,8 +541,8 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
item['images'].append(image.image.get_path())
|
|
|
files.append(item)
|
|
|
edit_dict = {
|
|
|
- 'order_info':result,
|
|
|
- 'image_info':files,
|
|
|
+ 'order_info': result,
|
|
|
+ 'image_info': files,
|
|
|
}
|
|
|
return response_ok(edit_dict)
|
|
|
|
|
|
@@ -545,7 +557,7 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
OrderDetailEdit.objects.filter(order=instance).delete()
|
|
|
images = OrderImages.objects.filter(order=instance)
|
|
|
for image in images:
|
|
|
- upload = Upload.objects.filter(id=image.image.id)
|
|
|
+ upload = Upload.objects.filter(id=image.image.id).first()
|
|
|
upload.del_images()
|
|
|
images.delete()
|
|
|
super(OrderViewSet, self).destroy(request, *args, **kwargs)
|
wushaodong
