|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
from rest_framework import serializers
|
|
from rest_framework import serializers
|
|
from django.conf import settings
|
|
from django.conf import settings
|
|
-
|
|
|
|
|
|
+from django.utils import timezone
|
|
from apps.upload.models import Upload
|
|
from apps.upload.models import Upload
|
|
from .models import Commodity, CommodityImages
|
|
from .models import Commodity, CommodityImages
|
|
from apps.base import Formater
|
|
from apps.base import Formater
|
|
@@ -16,7 +16,6 @@ class CommoditySerializer(serializers.ModelSerializer):
|
|
list_image_url = serializers.CharField(source='list_image.picture', read_only=True)
|
|
list_image_url = serializers.CharField(source='list_image.picture', read_only=True)
|
|
detail_image = serializers.SerializerMethodField()
|
|
detail_image = serializers.SerializerMethodField()
|
|
price = PriceShowCharField()
|
|
price = PriceShowCharField()
|
|
- amount = PriceShowCharField(read_only=True)
|
|
|
|
status_text = serializers.CharField(source='get_status_display', read_only=True)
|
|
status_text = serializers.CharField(source='get_status_display', read_only=True)
|
|
|
|
|
|
def get_detail_image(self, obj):
|
|
def get_detail_image(self, obj):
|
|
@@ -30,19 +29,19 @@ class CommoditySerializer(serializers.ModelSerializer):
|
|
def create(self, validated_data):
|
|
def create(self, validated_data):
|
|
validated_data['create_user'] = self.context['request'].user
|
|
validated_data['create_user'] = self.context['request'].user
|
|
validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
|
|
validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
|
|
- validated_data['amount'] = Formater.formatPrice(self.initial_data['price']) * int(self.initial_data['days'])
|
|
|
|
|
|
+ validated_data['refresh_time'] = timezone.now()
|
|
|
|
|
|
instance = super(CommoditySerializer, self).create(validated_data)
|
|
instance = super(CommoditySerializer, self).create(validated_data)
|
|
return instance
|
|
return instance
|
|
|
|
|
|
def update(self, instance, validated_data):
|
|
def update(self, instance, validated_data):
|
|
validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
|
|
validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
|
|
- validated_data['amount'] = Formater.formatPrice(self.initial_data['price']) * int(self.initial_data['days'])
|
|
|
|
|
|
+ validated_data['refresh_time'] = timezone.now()
|
|
instance = super(CommoditySerializer, self).update(instance, validated_data)
|
|
instance = super(CommoditySerializer, self).update(instance, validated_data)
|
|
return instance
|
|
return instance
|
|
|
|
|
|
class WxCommoditySerizlizer(serializers.ModelSerializer):
|
|
class WxCommoditySerizlizer(serializers.ModelSerializer):
|
|
- amount = PriceShowCharField()
|
|
|
|
|
|
+ price = PriceShowCharField()
|
|
list_image = serializers.SerializerMethodField()
|
|
list_image = serializers.SerializerMethodField()
|
|
|
|
|
|
def get_list_image(self, obj):
|
|
def get_list_image(self, obj):
|
|
@@ -53,14 +52,13 @@ class WxCommoditySerizlizer(serializers.ModelSerializer):
|
|
|
|
|
|
class Meta:
|
|
class Meta:
|
|
model = Commodity
|
|
model = Commodity
|
|
- fields = ('id', 'name', 'introduce', 'amount', 'list_image', )
|
|
|
|
|
|
+ fields = ('id', 'name', 'introduce', 'price', 'list_image', )
|
|
|
|
|
|
|
|
|
|
class WxCommodityDetailsSerializer(serializers.ModelSerializer):
|
|
class WxCommodityDetailsSerializer(serializers.ModelSerializer):
|
|
- amount = PriceShowCharField()
|
|
|
|
|
|
+ price = PriceShowCharField()
|
|
main_image = serializers.SerializerMethodField()
|
|
main_image = serializers.SerializerMethodField()
|
|
detail_images = serializers.SerializerMethodField()
|
|
detail_images = serializers.SerializerMethodField()
|
|
- price = PriceShowCharField()
|
|
|
|
|
|
|
|
def get_main_image(self, obj):
|
|
def get_main_image(self, obj):
|
|
if obj.main_image:
|
|
if obj.main_image:
|
|
@@ -78,5 +76,5 @@ class WxCommodityDetailsSerializer(serializers.ModelSerializer):
|
|
class Meta:
|
|
class Meta:
|
|
model = Commodity
|
|
model = Commodity
|
|
fields = (
|
|
fields = (
|
|
- 'id', 'name', 'amount', 'introduce', 'main_image', 'detail_images', 'price', 'days'
|
|
|
|
|
|
+ 'id', 'name', 'price', 'introduce', 'main_image', 'detail_images', 'discount', 'stock'
|
|
)
|
|
)
|