|
|
@ -4,16 +4,12 @@ import 'package:flutter/material.dart'; |
|
|
|
import 'package:flutter/services.dart'; |
|
|
|
import 'package:flutter/services.dart'; |
|
|
|
import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; |
|
|
|
import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; |
|
|
|
import 'package:flutter_baidu_mapapi_utils/flutter_baidu_mapapi_utils.dart'; |
|
|
|
import 'package:flutter_baidu_mapapi_utils/flutter_baidu_mapapi_utils.dart'; |
|
|
|
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; |
|
|
|
|
|
|
|
import 'package:flutter_svg/flutter_svg.dart'; |
|
|
|
|
|
|
|
import 'package:huixiang/generated/l10n.dart'; |
|
|
|
import 'package:huixiang/generated/l10n.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/address.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/address.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/base_data.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/base_data.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/findMiNiGroupList.dart'; |
|
|
|
|
|
|
|
import 'package:huixiang/retrofit/data/placeOrderFirst.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/placeOrderFirst.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/settleOrderInfo.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/settleOrderInfo.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/settlement_bean.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/settlement_bean.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/shoppingCart.dart'; |
|
|
|
|
|
|
|
import 'package:huixiang/retrofit/data/store_info.dart'; |
|
|
|
import 'package:huixiang/retrofit/data/store_info.dart'; |
|
|
|
import 'package:huixiang/retrofit/min_api.dart'; |
|
|
|
import 'package:huixiang/retrofit/min_api.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/activity_coupon_remarks.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/activity_coupon_remarks.dart'; |
|
|
@ -24,10 +20,8 @@ import 'package:huixiang/settlement/settlement_view/settlement_activity.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/settlement_coupon.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/settlement_coupon.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/settlement_order_commodity.dart'; |
|
|
|
import 'package:huixiang/settlement/settlement_view/settlement_order_commodity.dart'; |
|
|
|
import 'package:huixiang/utils/font_weight.dart'; |
|
|
|
import 'package:huixiang/utils/font_weight.dart'; |
|
|
|
import 'package:huixiang/utils/location.dart'; |
|
|
|
|
|
|
|
import 'package:huixiang/view_widget/my_appbar.dart'; |
|
|
|
import 'package:huixiang/view_widget/my_appbar.dart'; |
|
|
|
import 'package:huixiang/view_widget/round_button.dart'; |
|
|
|
import 'package:huixiang/view_widget/round_button.dart'; |
|
|
|
import 'package:intl/intl.dart'; |
|
|
|
|
|
|
|
import 'package:shared_preferences/shared_preferences.dart'; |
|
|
|
import 'package:shared_preferences/shared_preferences.dart'; |
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart'; |
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart'; |
|
|
|
|
|
|
|
|
|
|
@ -165,8 +159,7 @@ class _Settlement extends State<Settlement> { |
|
|
|
placeOrderFirst.storeId = storeInfo.id; |
|
|
|
placeOrderFirst.storeId = storeInfo.id; |
|
|
|
placeOrderFirst.subcribeTime = null; |
|
|
|
placeOrderFirst.subcribeTime = null; |
|
|
|
placeOrderFirst.tableId = 0; |
|
|
|
placeOrderFirst.tableId = 0; |
|
|
|
BaseData baseData = await minService |
|
|
|
BaseData baseData = await minService.placeOrderFirst(placeOrderFirst.toJson()) |
|
|
|
.placeOrderFirst(placeOrderFirst.toJson()) |
|
|
|
|
|
|
|
.catchError((error) {}); |
|
|
|
.catchError((error) {}); |
|
|
|
if (baseData != null && baseData.isSuccess) { |
|
|
|
if (baseData != null && baseData.isSuccess) { |
|
|
|
querySettlement(); |
|
|
|
querySettlement(); |
|
|
@ -186,8 +179,7 @@ class _Settlement extends State<Settlement> { |
|
|
|
settlementBean.promotionInfoDTO = PromotionInfoDTO(); |
|
|
|
settlementBean.promotionInfoDTO = PromotionInfoDTO(); |
|
|
|
settlementBean.promotionInfoDTO.couponId = 0; |
|
|
|
settlementBean.promotionInfoDTO.couponId = 0; |
|
|
|
settlementBean.promotionInfoDTO.promotionId = 0; |
|
|
|
settlementBean.promotionInfoDTO.promotionId = 0; |
|
|
|
BaseData baseData = |
|
|
|
BaseData baseData = await minService.settlementApi({}).catchError((error) {}); |
|
|
|
await minService.settlementApi({}).catchError((error) {}); |
|
|
|
|
|
|
|
if (baseData != null && baseData.isSuccess) {} |
|
|
|
if (baseData != null && baseData.isSuccess) {} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|