Commit a52a03d17ac33640f0d8d07345d29ab78a999594

Authored by weixin_45529955
1 parent d8c9111a

交易记录增加会员充值和预订订金数据

... ... @@ -457,7 +457,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 556;
CURRENT_PROJECT_VERSION = 5600;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -466,7 +466,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.6;
MARKETING_VERSION = 5.6.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -640,7 +640,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 556;
CURRENT_PROJECT_VERSION = 5600;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -649,7 +649,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.6;
MARKETING_VERSION = 5.6.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -666,7 +666,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 556;
CURRENT_PROJECT_VERSION = 5600;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -675,7 +675,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.6;
MARKETING_VERSION = 5.6.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ...
... ... @@ -35,8 +35,8 @@ class DepositRecordModel {
class DepositRecordSunModel {
String? date;
double? total;
int? refundTotal;
dynamic total;
dynamic refundTotal;
List< DepositModel>? list;
DepositRecordSunModel({this.date, this.total, this.refundTotal, this.list});
... ... @@ -45,12 +45,12 @@ class DepositRecordSunModel {
if(json["date"] is String) {
date = json["date"];
}
if(json["total"] is double) {
total = json["total"];
}
if(json["refund_total"] is int) {
refundTotal = json["refund_total"];
}
total = json["total"]??0;
refundTotal = json["refund_total"]??0;
if(json["list"] is List) {
list = json["list"] == null ? null : (json["list"] as List).map((e) => DepositModel.fromJson(e)).toList();
}
... ...
... ... @@ -140,8 +140,8 @@ class DiscountOrderListModelData {
*/
String? date;
double? total;
double? refundTotal;
dynamic total;
dynamic refundTotal;
List<DiscountOrderListModelDataList?>? list;
DiscountOrderListModelData({
... ...
... ... @@ -38,8 +38,8 @@ class VipRecordModel {
class VipRecordSunModel {
String? date;
double? total;
int? refundTotal;
dynamic total;
dynamic refundTotal;
List<VipModel>? list;
VipRecordSunModel({this.date, this.total, this.refundTotal, this.list});
... ... @@ -48,12 +48,12 @@ class VipRecordSunModel {
if (json["date"] is String) {
date = json["date"];
}
if (json["total"] is double) {
total = json["total"];
}
if (json["refund_total"] is int) {
refundTotal = json["refund_total"];
}
total = json["total"]??0;
refundTotal = json["refund_total"]??0;
if (json["list"] is List) {
list = json["list"] == null
? null
... ...