xt / Flutter-ReserveApp · Commits

Go to a project

Commit 938068475e738f6bc9419e178502a393854080e1

Authored by wdn127929
2 parents b563aac8 97b8b6ce
build: skipped

已点菜品页面总价未计算多份

Inline Side-by-side
Showing 5 changed files with 27 additions and 18 deletions
@@ -524,6 +524,7 @@ @@ -524,6 +524,7 @@
524 CURRENT_PROJECT_VERSION = 506; 524 CURRENT_PROJECT_VERSION = 506;
525 525
526 526
  527 +
527 DEVELOPMENT_TEAM = 8J59HM8B82; 528 DEVELOPMENT_TEAM = 8J59HM8B82;
528 ENABLE_BITCODE = NO; 529 ENABLE_BITCODE = NO;
529 FLUTTER_BUILD_MODE = release; 530 FLUTTER_BUILD_MODE = release;
@@ -718,6 +719,7 @@ @@ -718,6 +719,7 @@
718 CURRENT_PROJECT_VERSION = 506; 719 CURRENT_PROJECT_VERSION = 506;
719 720
720 721
  722 +
721 DEVELOPMENT_TEAM = 8J59HM8B82; 723 DEVELOPMENT_TEAM = 8J59HM8B82;
722 ENABLE_BITCODE = NO; 724 ENABLE_BITCODE = NO;
723 FLUTTER_BUILD_MODE = release; 725 FLUTTER_BUILD_MODE = release;
@@ -128,6 +128,9 @@ class SellerList extends Object { @@ -128,6 +128,9 @@ class SellerList extends Object {
128 @JsonKey(name: 'cdate') 128 @JsonKey(name: 'cdate')
129 String cdate; 129 String cdate;
130 130
  131 + @JsonKey(name: 'remaining_time')
  132 + int remainingTime;
  133 +
131 String get cdateStr { 134 String get cdateStr {
132 if (cdate != null) { 135 if (cdate != null) {
133 DateTime dateTime = DateTime.fromMillisecondsSinceEpoch( 136 DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(
@@ -145,18 +148,18 @@ class SellerList extends Object { @@ -145,18 +148,18 @@ class SellerList extends Object {
145 } 148 }
146 149
147 SellerList( 150 SellerList(
148 - this.id,  
149 - this.sellerid,  
150 - this.createUser,  
151 - this.uid,  
152 - this.aid,  
153 - this.gid,  
154 - this.content,  
155 - this.isUpdate,  
156 - this.finishedStatus,  
157 - this.edate,  
158 - this.cdate,  
159 - ); 151 + this.id,
  152 + this.sellerid,
  153 + this.createUser,
  154 + this.uid,
  155 + this.aid,
  156 + this.gid,
  157 + this.content,
  158 + this.isUpdate,
  159 + this.finishedStatus,
  160 + this.edate,
  161 + this.cdate,
  162 + this.remainingTime);
160 163
161 factory SellerList.fromJson(Map<String, dynamic> srcJson) => 164 factory SellerList.fromJson(Map<String, dynamic> srcJson) =>
162 _$SellerListFromJson(srcJson); 165 _$SellerListFromJson(srcJson);
@@ -79,6 +79,7 @@ SellerList _$SellerListFromJson(Map<String, dynamic> json) { @@ -79,6 +79,7 @@ SellerList _$SellerListFromJson(Map<String, dynamic> json) {
79 json['finished_status'] as String, 79 json['finished_status'] as String,
80 json['edate'] as String, 80 json['edate'] as String,
81 json['cdate'] as String, 81 json['cdate'] as String,
  82 + json['remaining_time'] as int,
82 ); 83 );
83 } 84 }
84 85
@@ -95,4 +96,5 @@ Map<String, dynamic> _$SellerListToJson(SellerList instance) => @@ -95,4 +96,5 @@ Map<String, dynamic> _$SellerListToJson(SellerList instance) =>
95 'finished_status': instance.finishedStatus, 96 'finished_status': instance.finishedStatus,
96 'edate': instance.edate, 97 'edate': instance.edate,
97 'cdate': instance.cdate, 98 'cdate': instance.cdate,
  99 + 'remaining_time': instance.remainingTime,
98 }; 100 };
@@ -83,13 +83,15 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { @@ -83,13 +83,15 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
83 double sumMemberPrice = 0; 83 double sumMemberPrice = 0;
84 _orderFoodProvider.createdOrderSunModel.cookbooklist.forEach((element) { 84 _orderFoodProvider.createdOrderSunModel.cookbooklist.forEach((element) {
85 sumPrice += 85 sumPrice +=
86 - element.specPrice == null ? 0 : double.parse(element.specPrice);  
87 - sumMemberPrice += double.parse(  
88 - element.specMemberPrice == '0' || element.specMemberPrice == null 86 + (element.specPrice == null ? 0 : double.parse(element.specPrice)) *
  87 + int.parse(element.number);
  88 + sumMemberPrice += double.parse(element.specMemberPrice == '0' ||
  89 + element.specMemberPrice == null
89 ? element.specPrice == null 90 ? element.specPrice == null
90 ? '0' 91 ? '0'
91 : element.specPrice 92 : element.specPrice
92 - : element.specMemberPrice); 93 + : element.specMemberPrice) *
  94 + int.parse(element.number);
93 }); 95 });
94 sumPriceShow = 96 sumPriceShow =
95 (NumUtil.getNumByValueDouble(sumPrice, 2)).toStringAsFixed(2); 97 (NumUtil.getNumByValueDouble(sumPrice, 2)).toStringAsFixed(2);
@@ -146,9 +146,9 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> { @@ -146,9 +146,9 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> {
146 HEmptyView(10), 146 HEmptyView(10),
147 Expanded( 147 Expanded(
148 child: Text( 148 child: Text(
149 - data.edate == null 149 + data.remainingTime == null
150 ? '无限制' 150 ? '无限制'
151 - : '剩余${11111}天', 151 + : '剩余${data.remainingTime}天',
152 overflow: TextOverflow.ellipsis, 152 overflow: TextOverflow.ellipsis,
153 style: TextStyle( 153 style: TextStyle(
154 color: MyColours.color_333333, 154 color: MyColours.color_333333,