diff --git a/lib/models/promotion_goods_list_model.dart b/lib/models/promotion_goods_list_model.dart index f0c6f78..7bcb40f 100644 --- a/lib/models/promotion_goods_list_model.dart +++ b/lib/models/promotion_goods_list_model.dart @@ -27,10 +27,7 @@ class PromotionGoodsListModel extends Object { class PromotionModel extends Object { List goodsList; List activityList; - PromotionModel( - this.goodsList, - this.activityList - ); + PromotionModel(this.goodsList, this.activityList); factory PromotionModel.fromJson(Map srcJson) => _$PromotionModelFromJson(srcJson); @@ -43,13 +40,8 @@ class PromotionActivityModel extends Object { String activityUrl; String logoUrl; String topUrl; - - PromotionActivityModel( - this.id, - this.activityUrl, - this.logoUrl, - this.topUrl - ); + + PromotionActivityModel(this.id, this.activityUrl, this.logoUrl, this.topUrl); factory PromotionActivityModel.fromJson(Map srcJson) => _$PromotionActivityModelFromJson(srcJson); @@ -58,7 +50,6 @@ class PromotionActivityModel extends Object { @JsonSerializable() class PromotionGoodsModel extends Object { - /* { "goodsName":"左家右厨丰子恺清代古画", @@ -107,6 +98,10 @@ class PromotionGoodsModel extends Object { String brandName; String brandImg; num brandId; + num isImport; + num isFerme; + num storehouse; + PromotionGoodsModel( this.goodsId, this.goodsName, @@ -130,7 +125,10 @@ class PromotionGoodsModel extends Object { this.coupon, this.brandName, this.brandImg, - this.brandId + this.brandId, + this.isImport, + this.isFerme, + this.storehouse, ); factory PromotionGoodsModel.fromJson(Map srcJson) => @@ -138,7 +136,7 @@ class PromotionGoodsModel extends Object { Map toJson() => _$PromotionGoodsModelToJson(this); - getPromotionStatus(){ + getPromotionStatus() { return PromotionTimeTool.getPromotionStatusWithPGModel(this); } diff --git a/lib/models/promotion_goods_list_model.g.dart b/lib/models/promotion_goods_list_model.g.dart index e7d899e..69af4b5 100644 --- a/lib/models/promotion_goods_list_model.g.dart +++ b/lib/models/promotion_goods_list_model.g.dart @@ -24,35 +24,35 @@ Map _$PromotionGoodsListModelToJson( 'msg': instance.msg }; -PromotionModel _$PromotionModelFromJson( - Map json) { +PromotionModel _$PromotionModelFromJson(Map json) { return PromotionModel( - (json['goodsList'] as List) - ?.map((e) => - e == null ? null : PromotionGoodsModel.fromJson(e as Map)) - ?.toList(), - (json['activityList'] as List) - ?.map((e) => - e == null ? null : PromotionActivityModel.fromJson(e as Map)) - ?.toList(), - ); + (json['goodsList'] as List) + ?.map((e) => e == null + ? null + : PromotionGoodsModel.fromJson(e as Map)) + ?.toList(), + (json['activityList'] as List) + ?.map((e) => e == null + ? null + : PromotionActivityModel.fromJson(e as Map)) + ?.toList(), + ); } -Map _$PromotionModelToJson( - PromotionModel instance) => +Map _$PromotionModelToJson(PromotionModel instance) => { 'goodsList': instance.goodsList, 'activityList': instance.activityList, }; - -PromotionActivityModel _$PromotionActivityModelFromJson(Map json) { +PromotionActivityModel _$PromotionActivityModelFromJson( + Map json) { return PromotionActivityModel( - json['id'] as num, - json['activityUrl'] as String, - json['logoUrl'] as String, - json['topUrl'] as String, - ); + json['id'] as num, + json['activityUrl'] as String, + json['logoUrl'] as String, + json['topUrl'] as String, + ); } Map _$PromotionActivityModelToJson( @@ -64,35 +64,37 @@ Map _$PromotionActivityModelToJson( 'topUrl': instance.topUrl, }; - PromotionGoodsModel _$PromotionGoodsModelFromJson(Map json) { return PromotionGoodsModel( - json['goodsId'] as int, - json['goodsName'] as String, - json['description'] as String, - (json['price'] as num)?.toDouble(), - json['priceDesc'] as String, - (json['commission'] as num)?.toDouble(), - json['commissionDesc'] as String, - json['inventory'] as int, - json['inventoryDesc'] as String, - json['totalInventory'] as int, - json['totalInventoryDesc'] as String, - json['totalSalesVolume'] as int, - json['salesVolumeDesc'] as String, - json['startTime'] as String, - json['endTime'] as String, - json['percentageDesc'] as String, - (json['percentage'] as num)?.toDouble(), - json['picture'] == null - ? null - : Picture.fromJson(json['picture'] as Map), - json["primePrice"] as num, - json["coupon"] as num, - json['brandName'] as String, - json['brandImg'] as String, - json['brandId'] as num - ); + json['goodsId'] as int, + json['goodsName'] as String, + json['description'] as String, + (json['price'] as num)?.toDouble(), + json['priceDesc'] as String, + (json['commission'] as num)?.toDouble(), + json['commissionDesc'] as String, + json['inventory'] as int, + json['inventoryDesc'] as String, + json['totalInventory'] as int, + json['totalInventoryDesc'] as String, + json['totalSalesVolume'] as int, + json['salesVolumeDesc'] as String, + json['startTime'] as String, + json['endTime'] as String, + json['percentageDesc'] as String, + (json['percentage'] as num)?.toDouble(), + json['picture'] == null + ? null + : Picture.fromJson(json['picture'] as Map), + json["primePrice"] as num, + json["coupon"] as num, + json['brandName'] as String, + json['brandImg'] as String, + json['brandId'] as num, + json['isImport'] as num, + json['isFerme'] as num, + json['storehouse'] as num, + ); } Map _$PromotionGoodsModelToJson(