Skip to content

A
ALand
Commit 51667527 authored by Sandy's avatar Sandy
Browse files
Options

修改登录信息model、订单详情界面调整

parent de8aac08
Hide whitespace changes
Inline Side-by-side
Showing with 922 additions and 358 deletions
ALand.xcodeproj/project.pbxproj
View file @ 51667527
......@@ -54,6 +54,11 @@
191AEE811CBCEE6B00F5E535 /* JavenOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 191AEE7D1CBCEE6B00F5E535 /* JavenOperator.m */; };
191AEE841CBCEE8C00F5E535 /* JavenHotTagsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 191AEE831CBCEE8C00F5E535 /* JavenHotTagsModel.m */; };
191AEE881CBCF8E000F5E535 /* CommoditySearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 191AEE861CBCF8E000F5E535 /* CommoditySearchViewController.m */; };
192118F31D41CE75000A56EA /* UserInfoBaseClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 192118F21D41CE75000A56EA /* UserInfoBaseClass.m */; };
192118F61D41CE80000A56EA /* UserInfoAppConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 192118F51D41CE80000A56EA /* UserInfoAppConfig.m */; };
192118F91D41CEDC000A56EA /* UserInfoConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = 192118F81D41CEDC000A56EA /* UserInfoConsumer.m */; };
192118FC1D41CF6C000A56EA /* UserInfoOwnerOrg.m in Sources */ = {isa = PBXBuildFile; fileRef = 192118FB1D41CF6C000A56EA /* UserInfoOwnerOrg.m */; };
192118FF1D41CF84000A56EA /* UserInfoReseller.m in Sources */ = {isa = PBXBuildFile; fileRef = 192118FE1D41CF84000A56EA /* UserInfoReseller.m */; };
1921EF6D1CE5987B00B0BC4A /* HomeCollectionFooterReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1921EF6C1CE5987B00B0BC4A /* HomeCollectionFooterReusableView.m */; };
1921EF701CE5C0E900B0BC4A /* ShopWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1921EF6F1CE5C0E900B0BC4A /* ShopWebViewController.m */; };
19272BD31CEB209B00735755 /* ChangeMyBankCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19272BD11CEB209B00735755 /* ChangeMyBankCardViewController.m */; };
......@@ -103,7 +108,6 @@
194FB0491CE2CAAF0089A3D5 /* MyAcountHelfViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0481CE2CAAF0089A3D5 /* MyAcountHelfViewController.m */; };
194FB0AA1CE2E95B0089A3D5 /* UserInfoAddress.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0871CE2E95B0089A3D5 /* UserInfoAddress.m */; };
194FB0AB1CE2E95B0089A3D5 /* UserInfoBankCards.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0891CE2E95B0089A3D5 /* UserInfoBankCards.m */; };
194FB0AC1CE2E95B0089A3D5 /* UserInfoBaseClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB08B1CE2E95B0089A3D5 /* UserInfoBaseClass.m */; };
194FB0AD1CE2E95B0089A3D5 /* UserInfoCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB08D1CE2E95B0089A3D5 /* UserInfoCertificate.m */; };
194FB0AE1CE2E95B0089A3D5 /* UserInfoCreateInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB08F1CE2E95B0089A3D5 /* UserInfoCreateInfo.m */; };
194FB0AF1CE2E95B0089A3D5 /* UserInfoIdCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0911CE2E95B0089A3D5 /* UserInfoIdCard.m */; };
......@@ -111,7 +115,6 @@
194FB0B11CE2E95B0089A3D5 /* UserInfoLoginControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0951CE2E95B0089A3D5 /* UserInfoLoginControl.m */; };
194FB0B21CE2E95B0089A3D5 /* UserInfoOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0971CE2E95B0089A3D5 /* UserInfoOperator.m */; };
194FB0B31CE2E95B0089A3D5 /* UserInfoOwner.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0991CE2E95B0089A3D5 /* UserInfoOwner.m */; };
194FB0B41CE2E95B0089A3D5 /* UserInfoOwnerOrg.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB09B1CE2E95B0089A3D5 /* UserInfoOwnerOrg.m */; };
194FB0B51CE2E95B0089A3D5 /* UserInfoPasswordControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB09D1CE2E95B0089A3D5 /* UserInfoPasswordControl.m */; };
194FB0B61CE2E95B0089A3D5 /* UserInfoPostalAddresses.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB09F1CE2E95B0089A3D5 /* UserInfoPostalAddresses.m */; };
194FB0B71CE2E95B0089A3D5 /* UserInfoReferrer.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0A11CE2E95B0089A3D5 /* UserInfoReferrer.m */; };
......@@ -434,6 +437,16 @@
191AEE831CBCEE8C00F5E535 /* JavenHotTagsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenHotTagsModel.m; sourceTree = "<group>"; };
191AEE851CBCF8E000F5E535 /* CommoditySearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommoditySearchViewController.h; sourceTree = "<group>"; };
191AEE861CBCF8E000F5E535 /* CommoditySearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommoditySearchViewController.m; sourceTree = "<group>"; };
192118F11D41CE75000A56EA /* UserInfoBaseClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoBaseClass.h; sourceTree = "<group>"; };
192118F21D41CE75000A56EA /* UserInfoBaseClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoBaseClass.m; sourceTree = "<group>"; };
192118F41D41CE80000A56EA /* UserInfoAppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoAppConfig.h; sourceTree = "<group>"; };
192118F51D41CE80000A56EA /* UserInfoAppConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoAppConfig.m; sourceTree = "<group>"; };
192118F71D41CEDC000A56EA /* UserInfoConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoConsumer.h; sourceTree = "<group>"; };
192118F81D41CEDC000A56EA /* UserInfoConsumer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoConsumer.m; sourceTree = "<group>"; };
192118FA1D41CF6C000A56EA /* UserInfoOwnerOrg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoOwnerOrg.h; sourceTree = "<group>"; };
192118FB1D41CF6C000A56EA /* UserInfoOwnerOrg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoOwnerOrg.m; sourceTree = "<group>"; };
192118FD1D41CF84000A56EA /* UserInfoReseller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoReseller.h; sourceTree = "<group>"; };
192118FE1D41CF84000A56EA /* UserInfoReseller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoReseller.m; sourceTree = "<group>"; };
1921EF6B1CE5987B00B0BC4A /* HomeCollectionFooterReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeCollectionFooterReusableView.h; sourceTree = "<group>"; };
1921EF6C1CE5987B00B0BC4A /* HomeCollectionFooterReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeCollectionFooterReusableView.m; sourceTree = "<group>"; };
1921EF6E1CE5C0E900B0BC4A /* ShopWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopWebViewController.h; sourceTree = "<group>"; };
......@@ -523,8 +536,6 @@
194FB0871CE2E95B0089A3D5 /* UserInfoAddress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoAddress.m; sourceTree = "<group>"; };
194FB0881CE2E95B0089A3D5 /* UserInfoBankCards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoBankCards.h; sourceTree = "<group>"; };
194FB0891CE2E95B0089A3D5 /* UserInfoBankCards.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoBankCards.m; sourceTree = "<group>"; };
194FB08A1CE2E95B0089A3D5 /* UserInfoBaseClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoBaseClass.h; sourceTree = "<group>"; };
194FB08B1CE2E95B0089A3D5 /* UserInfoBaseClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoBaseClass.m; sourceTree = "<group>"; };
194FB08C1CE2E95B0089A3D5 /* UserInfoCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoCertificate.h; sourceTree = "<group>"; };
194FB08D1CE2E95B0089A3D5 /* UserInfoCertificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoCertificate.m; sourceTree = "<group>"; };
194FB08E1CE2E95B0089A3D5 /* UserInfoCreateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoCreateInfo.h; sourceTree = "<group>"; };
......@@ -539,8 +550,6 @@
194FB0971CE2E95B0089A3D5 /* UserInfoOperator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoOperator.m; sourceTree = "<group>"; };
194FB0981CE2E95B0089A3D5 /* UserInfoOwner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoOwner.h; sourceTree = "<group>"; };
194FB0991CE2E95B0089A3D5 /* UserInfoOwner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoOwner.m; sourceTree = "<group>"; };
194FB09A1CE2E95B0089A3D5 /* UserInfoOwnerOrg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoOwnerOrg.h; sourceTree = "<group>"; };
194FB09B1CE2E95B0089A3D5 /* UserInfoOwnerOrg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoOwnerOrg.m; sourceTree = "<group>"; };
194FB09C1CE2E95B0089A3D5 /* UserInfoPasswordControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoPasswordControl.h; sourceTree = "<group>"; };
194FB09D1CE2E95B0089A3D5 /* UserInfoPasswordControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoPasswordControl.m; sourceTree = "<group>"; };
194FB09E1CE2E95B0089A3D5 /* UserInfoPostalAddresses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfoPostalAddresses.h; sourceTree = "<group>"; };
......@@ -1073,12 +1082,16 @@
191AEDFD1CBB818600F5E535 /* UserInfoModel */ = {
isa = PBXGroup;
children = (
192118F71D41CEDC000A56EA /* UserInfoConsumer.h */,
192118F81D41CEDC000A56EA /* UserInfoConsumer.m */,
194FB0861CE2E95B0089A3D5 /* UserInfoAddress.h */,
194FB0871CE2E95B0089A3D5 /* UserInfoAddress.m */,
192118F41D41CE80000A56EA /* UserInfoAppConfig.h */,
192118F51D41CE80000A56EA /* UserInfoAppConfig.m */,
194FB0881CE2E95B0089A3D5 /* UserInfoBankCards.h */,
194FB0891CE2E95B0089A3D5 /* UserInfoBankCards.m */,
194FB08A1CE2E95B0089A3D5 /* UserInfoBaseClass.h */,
194FB08B1CE2E95B0089A3D5 /* UserInfoBaseClass.m */,
192118F11D41CE75000A56EA /* UserInfoBaseClass.h */,
192118F21D41CE75000A56EA /* UserInfoBaseClass.m */,
194FB08C1CE2E95B0089A3D5 /* UserInfoCertificate.h */,
194FB08D1CE2E95B0089A3D5 /* UserInfoCertificate.m */,
194FB08E1CE2E95B0089A3D5 /* UserInfoCreateInfo.h */,
......@@ -1093,8 +1106,10 @@
194FB0971CE2E95B0089A3D5 /* UserInfoOperator.m */,
194FB0981CE2E95B0089A3D5 /* UserInfoOwner.h */,
194FB0991CE2E95B0089A3D5 /* UserInfoOwner.m */,
194FB09A1CE2E95B0089A3D5 /* UserInfoOwnerOrg.h */,
194FB09B1CE2E95B0089A3D5 /* UserInfoOwnerOrg.m */,
192118FA1D41CF6C000A56EA /* UserInfoOwnerOrg.h */,
192118FB1D41CF6C000A56EA /* UserInfoOwnerOrg.m */,
192118FD1D41CF84000A56EA /* UserInfoReseller.h */,
192118FE1D41CF84000A56EA /* UserInfoReseller.m */,
194FB09C1CE2E95B0089A3D5 /* UserInfoPasswordControl.h */,
194FB09D1CE2E95B0089A3D5 /* UserInfoPasswordControl.m */,
194FB09E1CE2E95B0089A3D5 /* UserInfoPostalAddresses.h */,
......@@ -2569,6 +2584,7 @@
19DC6AFC1CBF867E0064A9FD /* JavenShopModel.m in Sources */,
1929F1841CA0EA64000E9B26 /* MoneyView.m in Sources */,
190A46671CE06329006037CB /* JavenAddress.m in Sources */,
192118FF1D41CF84000A56EA /* UserInfoReseller.m in Sources */,
19ADD3801CA4D38B00EE6E5A /* SortView.m in Sources */,
191AEE881CBCF8E000F5E535 /* CommoditySearchViewController.m in Sources */,
194FB0CC1CE2F8E20089A3D5 /* JavenRoles.m in Sources */,
......@@ -2612,6 +2628,7 @@
199B4D6D1CABBF0800451E0E /* OrderDetailTopView.m in Sources */,
19DCCBC71C9AA0450072C3BF /* NSDate+FormatterAdditions.m in Sources */,
194FB0B51CE2E95B0089A3D5 /* UserInfoPasswordControl.m in Sources */,
192118FC1D41CF6C000A56EA /* UserInfoOwnerOrg.m in Sources */,
19DCCB6F1C9A9EB30072C3BF /* IBTUIButton.m in Sources */,
199B4D971CAE701F00451E0E /* StoreManagermentViewController.m in Sources */,
1913833A1CAB96D4005F6440 /* OrderTableViewCell.m in Sources */,
......@@ -2643,6 +2660,7 @@
197975421CAA23BC00407E3F /* UITableView+Category.m in Sources */,
19DCCB611C9A9EB30072C3BF /* IBTTableViewCellInfo.m in Sources */,
1912FD031CD0907D004CF976 /* MoreHotTagViewController.m in Sources */,
192118F31D41CE75000A56EA /* UserInfoBaseClass.m in Sources */,
190A465C1CE04265006037CB /* AgreementViewController.m in Sources */,
1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */,
197DCD381D40CC1F00589E2C /* OrderPayViewController.m in Sources */,
......@@ -2661,6 +2679,7 @@
19DCCBD31C9AA0450072C3BF /* UIScrollView+Content.m in Sources */,
197975271CA8FAE500407E3F /* CommodityDetailTopView.m in Sources */,
197975221CA8DA8200407E3F /* CommodityDetailViewController.m in Sources */,
192118F61D41CE80000A56EA /* UserInfoAppConfig.m in Sources */,
19DCCB771C9A9EB30072C3BF /* IBTUIViewController.m in Sources */,
191AEE5C1CBCC6D100F5E535 /* addCommodityRequestModel.m in Sources */,
19C135661D39465D00DC766F /* CalculateHelper.m in Sources */,
......@@ -2687,6 +2706,7 @@
19DCCBEF1C9AA1D50072C3BF /* QueryOrder.m in Sources */,
19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */,
19DC6B3D1CC0E06C0064A9FD /* CustomerTableViewCell.m in Sources */,
192118F91D41CEDC000A56EA /* UserInfoConsumer.m in Sources */,
19DCCB5E1C9A9EB30072C3BF /* IBTModel.m in Sources */,
19DCCBD51C9AA0450072C3BF /* UITableViewCell+Helper.m in Sources */,
19DC6B2C1CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m in Sources */,
......@@ -2718,7 +2738,6 @@
19DCCB621C9A9EB30072C3BF /* IBTTableViewInfo.m in Sources */,
19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */,
1952C2F21CED95230017E4D6 /* OrderListFooterView.m in Sources */,
194FB0AC1CE2E95B0089A3D5 /* UserInfoBaseClass.m in Sources */,
194FB0BE1CE2F8400089A3D5 /* JavenBankCards.m in Sources */,
191383351CAB95F5005F6440 /* NoPaymentTableViewController.m in Sources */,
19DCCB6B1C9A9EB30072C3BF /* IBTSegmentedControl.m in Sources */,
......@@ -2752,7 +2771,6 @@
19ADD37E1CA4D38B00EE6E5A /* CommodityListCollectionViewCell.m in Sources */,
194FB0AF1CE2E95B0089A3D5 /* UserInfoIdCard.m in Sources */,
19DCCBDC1C9AA0450072C3BF /* IBTDatePickerViewController.m in Sources */,
194FB0B41CE2E95B0089A3D5 /* UserInfoOwnerOrg.m in Sources */,
19DCCB781C9A9EB30072C3BF /* IBTWebProgressBar.m in Sources */,
194FB0B61CE2E95B0089A3D5 /* UserInfoPostalAddresses.m in Sources */,
194FB0AE1CE2E95B0089A3D5 /* UserInfoCreateInfo.m in Sources */,
......
ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
View file @ 51667527
......@@ -63,6 +63,7 @@
<constraints>
<constraint firstItem="J01-8B-y5r" firstAttribute="centerY" secondItem="Xru-fq-ja3" secondAttribute="centerY" id="1yq-ND-DOX"/>
<constraint firstAttribute="trailing" secondItem="rM9-W2-1PT" secondAttribute="trailing" constant="8" id="2TA-EB-U6d"/>
<constraint firstItem="rM9-W2-1PT" firstAttribute="top" secondItem="6Vh-Et-vJt" secondAttribute="bottom" constant="4" id="6oc-ZA-803"/>
<constraint firstItem="6Vh-Et-vJt" firstAttribute="top" secondItem="Xru-fq-ja3" secondAttribute="bottom" constant="8" id="7Xk-JU-bqo"/>
<constraint firstItem="v7R-er-zaD" firstAttribute="leading" secondItem="6Vh-Et-vJt" secondAttribute="trailing" constant="2" id="CNp-I7-IEP"/>
<constraint firstItem="rM9-W2-1PT" firstAttribute="centerY" secondItem="OeX-RE-d2m" secondAttribute="centerY" id="CZW-j3-3fO"/>
......@@ -86,9 +87,10 @@
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="nN0-rt-cNW"/>
<exclude reference="CZW-j3-3fO"/>
<exclude reference="DRA-Wo-4yR"/>
<exclude reference="aSi-VQ-cSz"/>
<exclude reference="nN0-rt-cNW"/>
</mask>
</variation>
</view>
......@@ -229,7 +231,7 @@
<outlet property="labelState" destination="nyc-Bh-qZx" id="A7V-bB-9BO"/>
<outlet property="viewExpress" destination="9bs-ar-XXb" id="rCv-CW-UTd"/>
</connections>
<point key="canvasLocation" x="333" y="231"/>
<point key="canvasLocation" x="396" y="231"/>
</view>
</objects>
<resources>
......
ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m
View file @ 51667527
......@@ -99,7 +99,7 @@
- (NSDictionary *)getGoodsParams
{
UserInfo *info = [UserInfo shareInstance];
UserInfoReseller *info = [UserInfo shareInstance].reseller;
NSDictionary *param = @{
@"operCtx": @{
......@@ -118,7 +118,7 @@
- (NSDictionary *)getRemoveGoodsParams
{
UserInfo *info = [UserInfo shareInstance];
UserInfoReseller *info = [UserInfo shareInstance].reseller;
NSDictionary *param = @{
@"operCtx": @{
......@@ -137,8 +137,8 @@
- (void)setUpWebView
{
UserInfo *userInfo = [UserInfo shareInstance];
NSString *urlStr = [NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/1/.html", userInfo.webShopBaseUrl, userInfo.shop.uuid, self.model.uuid];
UserInfoReseller *userInfo = [UserInfo shareInstance].reseller;
NSString *urlStr = [NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/1/.html", [UserInfo shareInstance].appConfig.webShopBaseUrl, userInfo.shop.uuid, self.model.uuid];
WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 67)];
NSURL *url = [NSURL URLWithString:urlStr];
self.webView = webView;
......
ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m
View file @ 51667527
......@@ -244,9 +244,9 @@
NSDictionary *params = @{@"defintion" : @{@"probePages" : @0,
@"orders" : @[@{@"field" : self.field,
@"direction" : self.direction}],
@"conditions" : @[@{@"parameters" : @[info.domain],
@"conditions" : @[@{@"parameters" : @[kDomain],
@"operation" : @"domain equals"},
@{@"parameters" : @[@[[UserInfo shareInstance].shop.uuid]],
@{@"parameters" : @[@[[UserInfo shareInstance].reseller.shop.uuid]],
@"operation" : @"shop uuid equals"},
@{@"parameters" : @[self.searchText],
@"operation" : self.condition}],
......
ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerManagementViewController.m
View file @ 51667527
......@@ -104,7 +104,7 @@
@{@"operation" : @"createInfo.time between",
@"parameters" : @[self.customerCreateDate, [NSNull null]]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]}
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]}
,
@{@"operation" : @"consumer mobilephone equals",
@"parameters" : @[_phoneNo]}
......@@ -121,7 +121,7 @@
@{@"operation" : @"createInfo.time between",
@"parameters" : @[self.customerCreateDate, [NSNull null]]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]}
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]}
],
@"orders" : @[@{@"field" : self.field,
@"direction" : self.direction}],
......
ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.m
View file @ 51667527
......@@ -90,7 +90,7 @@
NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]},
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]},
@{@"operation" : @"consumer uuid equals",
@"parameters" : @[self.customer.consumer.uuid]}],
@"orders" : @[@{@"field" : @"createInfo.time",
......
ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
View file @ 51667527
......@@ -124,7 +124,7 @@
[super viewWillAppear:animated];
WS(weakSelf)
NSString *strGetResseller = [NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].uuid];
NSString *strGetResseller = [NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].reseller.uuid];
[[HTTPCilent shareCilent] GET:strGetResseller parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject[@"code"] isEqualToNumber:@0]) {
......
ALand/CodeClass/Home/ViewController/HomeViewController.m
View file @ 51667527
......@@ -34,7 +34,7 @@
- (void)setUpdata {
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"shop/get/%@", [UserInfo shareInstance].shop.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"shop/get/%@", [UserInfo shareInstance].reseller.shop.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if (weakSelf.shopModel) {
[weakSelf.shopModel updateWithDictionary:responseObject[@"shop"]];
}else{
......
ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.m
View file @ 51667527
......@@ -27,7 +27,7 @@
}
- (void)setUpWebView {
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/visit.html", [UserInfo shareInstance].webShopBaseUrl];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/visit.html", [UserInfo shareInstance].appConfig.webShopBaseUrl];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:inviteWebUrl] cachePolicy:NSURLRequestReloadRevalidatingCacheData timeoutInterval:10];
WKWebView *webView = [WKWebView new];
webView.navigationDelegate = self;
......
ALand/CodeClass/Home/ViewController/InviteParterner/SeeMoreViewController.m
View file @ 51667527
......@@ -19,7 +19,7 @@
self.title = @"新营养部落分销政策概述";
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/abcShare.html", [UserInfo shareInstance].webShopBaseUrl];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/abcShare.html", [UserInfo shareInstance].appConfig.webShopBaseUrl];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:inviteWebUrl] cachePolicy:NSURLRequestReloadRevalidatingCacheData timeoutInterval:10];
WKWebView *webView = [WKWebView new];
......
ALand/CodeClass/Home/ViewController/ManagementViewController.m
View file @ 51667527
......@@ -169,7 +169,7 @@
@"direction" : self.direction}],
@"conditions" : @[@{@"parameters" : @[kDomain],
@"operation" : @"domain equals"},
@{@"parameters" : @[@[[UserInfo shareInstance].shop.uuid]],
@{@"parameters" : @[@[[UserInfo shareInstance].reseller.shop.uuid]],
@"operation" : @"shop uuid equals"},
@{@"parameters" : @[@""],
@"operation" : self.condition}],
......@@ -299,9 +299,9 @@
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
@"operator" : @{@"id" : [UserInfo shareInstance].uuid,
@"fullName" : [UserInfo shareInstance].name}},
@"shopUuid" : [UserInfo shareInstance].shop.uuid,
@"operator" : @{@"id" : [UserInfo shareInstance].reseller.uuid,
@"fullName" : [UserInfo shareInstance].reseller.name}},
@"shopUuid" : [UserInfo shareInstance].reseller.shop.uuid,
@"listGoodsUuid" : arrGoodsUuid};
WS(weakSelf)
[[HTTPCilent shareCilent] POST:questUrl parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
......
ALand/CodeClass/Home/ViewController/MyTeams/MyTeamViewController.m
View file @ 51667527
......@@ -50,7 +50,7 @@
- (void)setUpTotalData {
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/team/getTeamInfo/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/team/getTeamInfo/%@", [UserInfo shareInstance].reseller.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
NSNumber *teamNums = responseObject[@"memberCount"];
NSNumber *bonus = responseObject[@"commissionTotal"];
......@@ -67,7 +67,7 @@
NSDictionary *params = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]},
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]},
@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]}],
@"orders" : @[@{@"direction" : @"desc",
......
ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
View file @ 51667527
......@@ -43,7 +43,6 @@
self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
weakSelf.page = 0;
[MBProgressHUD showHUDAddedTo:kWindow animated:YES];
[weakSelf.arrDatas removeAllObjects];
[weakSelf setUpData];
}];
......@@ -67,6 +66,7 @@
WS(weakSelf)
[[HTTPCilent shareCilent] POST:@"order/query" parameters:[self getParams] success:^(NSURLSessionDataTask *task, id responseObject) {
[MBProgressHUD hideHUDForView:kWindow];
[weakSelf.arrDatas removeAllObjects];
[weakSelf.tableView.mj_header endRefreshing];
for (NSDictionary *dic in responseObject[@"queryResult"]) {
......@@ -87,6 +87,7 @@
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[MBProgressHUD hideHUDForView:kWindow];
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}];
......@@ -104,18 +105,38 @@
orderState = [NSNull null];
}
NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]},
@{@"operation" : @"order state equals",
@"parameters" : @[orderState]}],
@"orders" : @[@{@"field" : @"createInfo.time",
@"direction" : @"desc"}],
@"pageSize" : @(kPageSize),
@"page" : @(self.page),
@"probePages" : @0},
@"fetchParts" : @[@"string"]};
NSDictionary *myDictionary;
if ([self.orderTag isEqualToString:@"待支付"]) {
myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]},
@{@"operation" : @"my unpay order",
@"parameters" : @[[UserInfo shareInstance].consumer.uuid]},
@{@"operation" : @"order state equals",
@"parameters" : @[orderState]}],
@"orders" : @[@{@"field" : @"createInfo.time",
@"direction" : @"desc"}],
@"pageSize" : @(kPageSize),
@"page" : @(self.page),
@"probePages" : @0},
@"fetchParts" : @[@"string"]};
}else{
myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]},
@{@"operation" : @"order state equals",
@"parameters" : @[orderState]}],
@"orders" : @[@{@"field" : @"createInfo.time",
@"direction" : @"desc"}],
@"pageSize" : @(kPageSize),
@"page" : @(self.page),
@"probePages" : @0},
@"fetchParts" : @[@"string"]};
}
return myDictionary;
}
......
ALand/CodeClass/Home/ViewController/Order/OrderPayViewController.m
View file @ 51667527
......@@ -20,7 +20,7 @@
[super viewDidLoad];
WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 64)];
UserInfo *user = [UserInfo shareInstance];
NSString *url = [NSString stringWithFormat:@"%@Wap/orderDetail/id/%@/shop_id/%@/mobile/%@.html",user.webShopBaseUrl,self.model.billNumber,self.model.shop.uuid,user.mobilephone];
NSString *url = [NSString stringWithFormat:@"%@Wap/orderDetail/id/%@/shop_id/%@/mobile/%@.html",user.appConfig.webShopBaseUrl,self.model.billNumber,self.model.shop.uuid,user.reseller.mobilephone];
[webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
self.webView = webView;
......
ALand/CodeClass/Home/ViewController/ShopWebViewController.m
View file @ 51667527
......@@ -19,7 +19,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
UserInfo *userInfo = [UserInfo shareInstance];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@/mobile/%@.html", userInfo.webShopBaseUrl, userInfo.shop.uuid, userInfo.mobilephone];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@/mobile/%@.html", userInfo.appConfig.webShopBaseUrl, userInfo.reseller.shop.uuid, userInfo.reseller.mobilephone];
WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 64)];
[webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:inviteWebUrl]]];
self.webView = webView;
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m
View file @ 51667527
......@@ -36,7 +36,7 @@
[super viewDidLoad];
self.buttonBac.imageView.contentMode = UIViewContentModeScaleAspectFit;
UserInfo *userInfo = [UserInfo shareInstance];
self.urlStr = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@.html", userInfo.webShopBaseUrl, userInfo.shop.uuid];
self.urlStr = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@.html", userInfo.appConfig.webShopBaseUrl, userInfo.reseller.shop.uuid];
// Do any additional setup after loading the view from its nib.
}
......@@ -57,7 +57,7 @@
- (void)setUpdata {
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"shop/get/%@", [UserInfo shareInstance].shop.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"shop/get/%@", [UserInfo shareInstance].reseller.shop.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if (weakSelf.shopModel) {
[weakSelf.shopModel updateWithDictionary:responseObject[@"shop"]];
......@@ -191,7 +191,7 @@
- (NSDictionary *)getParamsWithImageUrl:(NSString *)imageUrl {
self.shopModel.pictures = [NSString stringWithFormat:@"http://o93sl2fym.bkt.clouddn.com/%@", imageUrl];
UserInfo *user = [UserInfo shareInstance];
UserInfoReseller *user = [UserInfo shareInstance].reseller;
NSDictionary *dicShop = [self.shopModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.m
View file @ 51667527
......@@ -38,8 +38,8 @@
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
@"operator" : @{@"id" : user.uuid,
@"fullName" : user.name}},
@"operator" : @{@"id" : user.reseller.uuid,
@"fullName" : user.reseller.name}},
@"shop" : dicShop};
......
ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.m
View file @ 51667527
......@@ -22,7 +22,7 @@
}
- (IBAction)safeIntroductionAction:(id)sender {
[self.view endEditing:YES];
UserInfo *user = [UserInfo shareInstance];
UserInfoReseller *user = [UserInfo shareInstance].reseller;
self.shopModel.internalBaseClassDescription = self.textViewInstroduction.text;
......
ALand/CodeClass/Login/LoginViewController.m
View file @ 51667527
......@@ -68,10 +68,9 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
UserInfo *info = [UserInfo shareInstance];
[info updateWithDictionary:responseObject[@"reseller"]];
info.webShopBaseUrl = responseObject[@"appConfig"][@"webShopBaseUrl"];
[info updateModelObjectWithDictionary:responseObject];
[MobClick profileSignInWithPUID:info.code];
[MobClick profileSignInWithPUID:info.reseller.code];
BaseViewController *baseVC = [[BaseViewController alloc] init];
baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
[weakSelf presentViewController:baseVC animated:YES completion:nil];
......
ALand/CodeClass/Login/ToLoginViewController.m
View file @ 51667527
......@@ -41,14 +41,13 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
UserInfo *info = [UserInfo shareInstance];
[info updateWithDictionary:responseObject[@"reseller"]];
info.webShopBaseUrl = responseObject[@"appConfig"][@"webShopBaseUrl"];
[info updateModelObjectWithDictionary:responseObject];
[[NSUserDefaults standardUserDefaults] setObject:weakSelf.phoneNumberTextFiled.text forKey:@"userName"];
[[NSUserDefaults standardUserDefaults] setObject:[weakSelf.passwordTextFiled.text MD5String] forKey:@"passWord"];
[MobClick profileSignInWithPUID:info.code];
[MobClick profileSignInWithPUID:info.reseller.code];
BaseViewController *baseVC = [[BaseViewController alloc] init];
baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
[weakSelf presentViewController:baseVC animated:YES completion:^{
......
ALand/CodeClass/MIne/ViewController/ChangePasswordViewController.m
View file @ 51667527
......@@ -37,9 +37,9 @@
return;
}
UserInfo *info = [UserInfo shareInstance];
UserInfoReseller *info = [UserInfo shareInstance].reseller;
[MBProgressHUD Javen_showMessage:@"修改中" onView:self.view];
NSDictionary *params = @{@"operCtx" : [info getOperCtx],
NSDictionary *params = @{@"operCtx" : [[UserInfo shareInstance] getOperCtx],
@"uuid" : info.uuid,
@"oldPassword" : [self.labelOldPassword.text MD5String],
@"newPassword" : [self.labelNewPassword.text MD5String],
......@@ -80,8 +80,7 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
UserInfo *info = [UserInfo shareInstance];
[info updateWithDictionary:responseObject[@"reseller"]];
info.webShopBaseUrl = responseObject[@"appConfig"][@"webShopBaseUrl"];
[info updateModelObjectWithDictionary:responseObject];
}else{
......
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.m
View file @ 51667527
......@@ -42,8 +42,8 @@
NSDictionary *reseller = [resellerModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
@"operator" : @{@"id" : user.uuid,
@"fullName" : user.name}},
@"operator" : @{@"id" : user.reseller.uuid,
@"fullName" : user.reseller.name}},
@"reseller" : reseller};
return params;
}
......
ALand/CodeClass/MIne/ViewController/MineViewController.m
View file @ 51667527
......@@ -41,7 +41,7 @@
- (void)setUpdata {
WS(weakSelf)
NSString *strGetResseller = [NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].uuid];
NSString *strGetResseller = [NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].reseller.uuid];
[[HTTPCilent shareCilent] GET:strGetResseller parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject[@"code"] isEqualToNumber:@0]) {
......@@ -108,7 +108,7 @@
- (void)getReseller{
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].reseller.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject[@"code"] isEqualToNumber:@0]) {
weakSelf.reseller = [JavenResellerBigModel modelObjectWithDictionary:responseObject[@"reseller"]];
......
ALand/CodeClass/MIne/ViewController/MyAcountHelfViewController.m
View file @ 51667527
......@@ -19,7 +19,7 @@
self.title = @"帮助";
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/helpVisit.html", [UserInfo shareInstance].webShopBaseUrl];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/helpVisit.html", [UserInfo shareInstance].appConfig.webShopBaseUrl];
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:inviteWebUrl]];
WKWebView *webView = [WKWebView new];
......
ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
View file @ 51667527
......@@ -44,7 +44,7 @@
- (void)setUpdata {
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].reseller.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if (kIsResponseSuccess(responseObject)) {
......
ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m
View file @ 51667527
......@@ -108,7 +108,7 @@
}
- (NSDictionary *)getParamsWithReseller:(JavenResellerBigModel *)resellerModel {
UserInfo *user = [UserInfo shareInstance];
UserInfoReseller *user = [UserInfo shareInstance].reseller;
NSDictionary *reseller = [resellerModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
......
ALand/CodeClass/MIne/ViewController/MyBandCard/ChangeMyBankCardViewController.m
View file @ 51667527
......@@ -102,7 +102,7 @@
}
- (NSDictionary *)getParamsWithReseller:(JavenResellerBigModel *)resellerModel {
UserInfo *user = [UserInfo shareInstance];
UserInfoReseller *user = [UserInfo shareInstance].reseller;
NSDictionary *reseller = [resellerModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
......
ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
View file @ 51667527
......@@ -99,7 +99,7 @@
- (void)getReseller{
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].reseller.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject[@"code"] isEqualToNumber:@0]) {
weakSelf.reseller = [JavenResellerBigModel modelObjectWithDictionary:responseObject[@"reseller"]];
[weakSelf.tableView reloadData];
......
ALand/CodeClass/MIne/ViewController/MyBillViewController.m
View file @ 51667527
......@@ -221,7 +221,7 @@
NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]},
@{@"operation" : @"reseller uuid equals",
@"parameters" : @[[UserInfo shareInstance].uuid]},
@"parameters" : @[[UserInfo shareInstance].reseller.uuid]},
@{@"operation" : @"action equals",
@"parameters" : self.state},
@{@"operation" : self.confirmed,
......
ALand/CodeClass/MIne/ViewController/SettingViewController.m
View file @ 51667527
......@@ -40,9 +40,9 @@
}
- (void)setDefaults {
if ([UserInfo shareInstance].mobilephone.length > 10) {
if ([UserInfo shareInstance].reseller.mobilephone.length > 10) {
NSString *cutPhoneNumber = [[UserInfo shareInstance].mobilephone substringWithRange:NSMakeRange(7, 4)];
NSString *cutPhoneNumber = [[UserInfo shareInstance].reseller.mobilephone substringWithRange:NSMakeRange(7, 4)];
self.phoneNumber.text = [NSString stringWithFormat:@"手机号码（%@）", cutPhoneNumber];
}
self.title = @"设置";
......@@ -210,7 +210,7 @@
//生成上传图片URL的参数
- (NSDictionary *)getParamsWithReseller:(JavenResellerBigModel *)resellerModel {
// resellerModel.ownerOrg = nil;
UserInfo *user = [UserInfo shareInstance];
UserInfoReseller *user = [UserInfo shareInstance].reseller;
NSDictionary *reseller = [resellerModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
......@@ -260,7 +260,7 @@
- (void)setUpdata {
WS(weakSelf)
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
[[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].reseller.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject[@"code"] isEqualToNumber:@0]) {
weakSelf.reseller = [JavenResellerBigModel modelObjectWithDictionary:responseObject[@"reseller"]];
......
ALand/CodeClass/Store/ViewController/StoreViewController.m
View file @ 51667527
......@@ -19,7 +19,7 @@
self.isShowNavigationBar = NO;
UserInfo *userInfo = [UserInfo shareInstance];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@/mobile/%@.html", userInfo.webShopBaseUrl, userInfo.shop.uuid, userInfo.mobilephone];
NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/index_shop/shop_id/%@/mobile/%@.html", userInfo.appConfig.webShopBaseUrl, userInfo.reseller.shop.uuid, userInfo.reseller.mobilephone];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:inviteWebUrl] cachePolicy:(NSURLRequestReloadRevalidatingCacheData) timeoutInterval:10.0f];
UIWebView *webView = [UIWebView new];
......
ALand/Global/HTTPCilent.m
View file @ 51667527
......@@ -41,6 +41,7 @@
success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure
{
CLog(@"POST success！-------->\n%@", [parameters mj_JSONString]);
[self.manager POST:URLString parameters:parameters progress:^(NSProgress * _Nonnull uploadProgress) {
} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
......
ALand/Global/JavenCustomerService.m
View file @ 51667527
......@@ -14,7 +14,7 @@
+ (void)startCustomerServices:(UIViewController *)vc {
//企业编号，必填
UserInfo *resellerInfo = [UserInfo shareInstance];
UserInfoReseller *resellerInfo = [UserInfo shareInstance].reseller;
NSString *sysNumber=@"1e5947ae875f4a11af054f153c9422ee";
......
ALand/Global/ShareView/ShareInstance.m
View file @ 51667527
......@@ -107,7 +107,8 @@
/** 邀请合伙人 */
- (void)invitePartner
{
NSString *urlStr = [NSString stringWithFormat:@"%@ShopUser/gpregister/invitationCode/%@.html", [UserInfo shareInstance].webShopBaseUrl, [UserInfo shareInstance].invitationCode];
NSString *urlStr = [NSString stringWithFormat:@"%@ShopUser/gpregister/invitationCode/%@.html", [UserInfo shareInstance].appConfig.webShopBaseUrl, [UserInfo shareInstance].reseller.invitationCode];
[self showWithTitle:@"欢迎加入新营养部落，一起共创健康未来。" content:@"在新营养部落开店，享受自由健康生活，免费游览欧洲北美。" url:urlStr image:[UIImage appIcon]];
}
......@@ -122,7 +123,7 @@
if (kIsResponseSuccess(responseObject)) {
NSString *description = responseObject[@"goodsBrand"][@"description"];
NSString *url = [NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/0/.html", [UserInfo shareInstance].webShopBaseUrl, [UserInfo shareInstance].shop.uuid, model.uuid];
NSString *url = [NSString stringWithFormat:@"%@Wap/detail/shop_id/%@/id/%@/hastbar/0/.html", [UserInfo shareInstance].appConfig.webShopBaseUrl, [UserInfo shareInstance].reseller.shop.uuid, model.uuid];
if (description && description.length > 0 && model.name.length > 0)
{
......
ALand/Global/UserInfo.h
View file @ 51667527
......@@ -9,7 +9,6 @@
#import "UserInfoBaseClass.h"
#import "JavenShopModel.h"
@interface UserInfo : UserInfoBaseClass
@property (nonatomic, copy) NSString *webShopBaseUrl;
+ (UserInfo *)shareInstance;
- (NSDictionary *)getOperCtx;
......
ALand/Global/UserInfo.m
View file @ 51667527
......@@ -23,9 +23,9 @@
- (NSDictionary *)getOperCtx
{
NSDictionary *dic = @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : self.domain,
@"operator" : @{@"id" : [UserInfo shareInstance].uuid,
@"fullName" : [UserInfo shareInstance].name}};
@"domain" : self.reseller.domain,
@"operator" : @{@"id" : [UserInfo shareInstance].reseller.uuid,
@"fullName" : [UserInfo shareInstance].reseller.name}};
return dic;
}
......@@ -34,10 +34,10 @@
{
NSDictionary *myDictionary = @{@"operCtx" : @{@"time" : @0,
@"domain" : @"string",
@"operator" : @{@"id" : [UserInfo shareInstance].uuid,
@"fullName" : [UserInfo shareInstance].name}},
@"operator" : @{@"id" : [UserInfo shareInstance].reseller.uuid,
@"fullName" : [UserInfo shareInstance].reseller.name}},
@"goodsUuid" : uuid,
@"shopUuid" : [UserInfo shareInstance].shop.uuid};
@"shopUuid" : [UserInfo shareInstance].reseller.shop.uuid};
[[HTTPCilent shareCilent] POST:@"shop/shopGoodsExists" parameters:myDictionary success:^(NSURLSessionDataTask *task, id responseObject) {
......
ALand/Global/UserInfoModel/UserInfoAppConfig.h 0 → 100644
View file @ 51667527
//
// UserInfoAppConfig.h
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface UserInfoAppConfig : NSObject <NSCoding, NSCopying>
@property (nonatomic, strong) NSString *webShopBaseUrl;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;
- (NSDictionary *)dictionaryRepresentation;
@end
ALand/Global/UserInfoModel/UserInfoAppConfig.m 0 → 100644
View file @ 51667527
//
// UserInfoAppConfig.m
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "UserInfoAppConfig.h"
NSString *const kUserInfoAppConfigWebShopBaseUrl = @"webShopBaseUrl";
@interface UserInfoAppConfig ()
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
@end
@implementation UserInfoAppConfig
@synthesize webShopBaseUrl = _webShopBaseUrl;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
{
return [[self alloc] initWithDictionary:dict];
}
- (instancetype)initWithDictionary:(NSDictionary *)dict
{
self = [super init];
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.webShopBaseUrl = [self objectOrNilForKey:kUserInfoAppConfigWebShopBaseUrl fromDictionary:dict];
}
return self;
}
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:self.webShopBaseUrl forKey:kUserInfoAppConfigWebShopBaseUrl];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
- (NSString *)description
{
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
}
#pragma mark - Helper Method
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
{
id object = [dict objectForKey:aKey];
return [object isEqual:[NSNull null]] ? nil : object;
}
#pragma mark - NSCoding Methods
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super init];
self.webShopBaseUrl = [aDecoder decodeObjectForKey:kUserInfoAppConfigWebShopBaseUrl];
return self;
}
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:_webShopBaseUrl forKey:kUserInfoAppConfigWebShopBaseUrl];
}
- (id)copyWithZone:(NSZone *)zone
{
UserInfoAppConfig *copy = [[UserInfoAppConfig alloc] init];
if (copy) {
copy.webShopBaseUrl = [self.webShopBaseUrl copyWithZone:zone];
}
return copy;
}
@end
ALand/Global/UserInfoModel/UserInfoBaseClass.h
View file @ 51667527
//
// UserInfoBaseClass.h
//
// Created by Z on 16/5/11
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "UserInfoOwnerOrg.h"
#import "UserInfoLastModifyInfo.h"
#import "UserInfoSocialContact.h"
#import "UserInfoCertificate.h"
#import "UserInfoBaseClass.h"
#import "UserInfoConsumer.h"
#import "UserInfoShop.h"
#import "UserInfoPasswordControl.h"
#import "UserInfoRoles.h"
#import "UserInfoPostalAddresses.h"
#import "UserInfoBankCards.h"
#import "UserInfoLastModifyInfo.h"
#import "UserInfoReseller.h"
#import "UserInfoIdCard.h"
#import "UserInfoReferrer.h"
#import "UserInfoShop.h"
#import "UserInfoCertificate.h"
#import "UserInfoOperator.h"
#import "UserInfoCreateInfo.h"
#import "UserInfoOwnerOrg.h"
#import "UserInfoAppConfig.h"
#import "UserInfoLoginControl.h"
@class UserInfoOwnerOrg, UserInfoLastModifyInfo, UserInfoSocialContact, UserInfoCertificate, UserInfoPasswordControl, UserInfoPostalAddresses, UserInfoIdCard, UserInfoReferrer, UserInfoShop, UserInfoCreateInfo, UserInfoLoginControl;
@interface UserInfoBaseClass : NSObject <NSCoding, NSCopying>
@property (nonatomic, assign) double birthday;
@property (nonatomic, strong) NSString *portrait;
@property (nonatomic, strong) UserInfoOwnerOrg *ownerOrg;
@property (nonatomic, strong) NSString *code;
@property (nonatomic, strong) NSString *telephone;
@property (nonatomic, strong) NSString *mobilephone;
@property (nonatomic, strong) NSString *uuid;
@property (nonatomic, strong) UserInfoLastModifyInfo *lastModifyInfo;
@property (nonatomic, strong) UserInfoSocialContact *socialContact;
@property (nonatomic, strong) UserInfoCertificate *certificate;
@property (nonatomic, assign) double version;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *invitationCode;
@property (nonatomic, strong) NSString *state;
@property (nonatomic, strong) NSString *domain;
@property (nonatomic, strong) UserInfoPasswordControl *passwordControl;
@property (nonatomic, strong) NSString *gender;
@property (nonatomic, strong) NSArray *roles;
@property (nonatomic, strong) UserInfoPostalAddresses *postalAddresses;
@property (nonatomic, strong) UserInfoIdCard *idCard;
@property (nonatomic, strong) UserInfoReferrer *referrer;
@property (nonatomic, strong) UserInfoShop *shop;
@property (nonatomic, strong) UserInfoCreateInfo *createInfo;
@property (nonatomic, assign) double order;
@property (nonatomic, strong) UserInfoLoginControl *loginControl;
@property (nonatomic, strong) NSString *internalBaseClassDescription;
@property (nonatomic, assign) double code;
@property (nonatomic, strong) NSString *message;
@property (nonatomic, strong) NSString *sessionId;
@property (nonatomic, strong) UserInfoAppConfig *appConfig;
@property (nonatomic, strong) UserInfoConsumer *consumer;
@property (nonatomic, strong) UserInfoReseller *reseller;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;
- (instancetype)updateWithDictionary:(NSDictionary *)dict;
- (NSDictionary *)dictionaryRepresentation;
- (instancetype)updateModelObjectWithDictionary:(NSDictionary *)dict;
@end
ALand/Global/UserInfoModel/UserInfoBaseClass.m
View file @ 51667527
//
// UserInfoBaseClass.m
//
// Created by Z on 16/5/11
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "UserInfoBaseClass.h"
#import "UserInfoOwnerOrg.h"
#import "UserInfoLastModifyInfo.h"
#import "UserInfoSocialContact.h"
#import "UserInfoCertificate.h"
#import "UserInfoPasswordControl.h"
#import "UserInfoRoles.h"
#import "UserInfoPostalAddresses.h"
#import "UserInfoIdCard.h"
#import "UserInfoReferrer.h"
#import "UserInfoShop.h"
#import "UserInfoCreateInfo.h"
#import "UserInfoLoginControl.h"
#import "UserInfoAppConfig.h"
#import "UserInfoConsumer.h"
#import "UserInfoReseller.h"
NSString *const kUserInfoBaseClassBirthday = @"birthday";
NSString *const kUserInfoBaseClassPortrait = @"portrait";
NSString *const kUserInfoBaseClassOwnerOrg = @"ownerOrg";
NSString *const kUserInfoBaseClassCode = @"code";
NSString *const kUserInfoBaseClassTelephone = @"telephone";
NSString *const kUserInfoBaseClassMobilephone = @"mobilephone";
NSString *const kUserInfoBaseClassUuid = @"uuid";
NSString *const kUserInfoBaseClassLastModifyInfo = @"lastModifyInfo";
NSString *const kUserInfoBaseClassSocialContact = @"socialContact";
NSString *const kUserInfoBaseClassCertificate = @"certificate";
NSString *const kUserInfoBaseClassVersion = @"version";
NSString *const kUserInfoBaseClassName = @"name";
NSString *const kUserInfoBaseClassInvitationCode = @"invitationCode";
NSString *const kUserInfoBaseClassState = @"state";
NSString *const kUserInfoBaseClassDomain = @"domain";
NSString *const kUserInfoBaseClassPasswordControl = @"passwordControl";
NSString *const kUserInfoBaseClassGender = @"gender";
NSString *const kUserInfoBaseClassRoles = @"roles";
NSString *const kUserInfoBaseClassPostalAddresses = @"postalAddresses";
NSString *const kUserInfoBaseClassIdCard = @"idCard";
NSString *const kUserInfoBaseClassReferrer = @"referrer";
NSString *const kUserInfoBaseClassShop = @"shop";
NSString *const kUserInfoBaseClassCreateInfo = @"createInfo";
NSString *const kUserInfoBaseClassOrder = @"order";
NSString *const kUserInfoBaseClassLoginControl = @"loginControl";
NSString *const kUserInfoBaseClassDescription = @"description";
NSString *const kUserInfoBaseClassMessage = @"message";
NSString *const kUserInfoBaseClassSessionId = @"sessionId";
NSString *const kUserInfoBaseClassAppConfig = @"appConfig";
NSString *const kUserInfoBaseClassConsumer = @"consumer";
NSString *const kUserInfoBaseClassReseller = @"reseller";
@interface UserInfoBaseClass ()
......@@ -56,32 +27,12 @@ NSString *const kUserInfoBaseClassDescription = @"description";
@implementation UserInfoBaseClass
@synthesize birthday = _birthday;
@synthesize portrait = _portrait;
@synthesize ownerOrg = _ownerOrg;
@synthesize code = _code;
@synthesize telephone = _telephone;
@synthesize mobilephone = _mobilephone;
@synthesize uuid = _uuid;
@synthesize lastModifyInfo = _lastModifyInfo;
@synthesize socialContact = _socialContact;
@synthesize certificate = _certificate;
@synthesize version = _version;
@synthesize name = _name;
@synthesize invitationCode = _invitationCode;
@synthesize state = _state;
@synthesize domain = _domain;
@synthesize passwordControl = _passwordControl;
@synthesize gender = _gender;
@synthesize roles = _roles;
@synthesize postalAddresses = _postalAddresses;
@synthesize idCard = _idCard;
@synthesize referrer = _referrer;
@synthesize shop = _shop;
@synthesize createInfo = _createInfo;
@synthesize order = _order;
@synthesize loginControl = _loginControl;
@synthesize internalBaseClassDescription = _internalBaseClassDescription;
@synthesize message = _message;
@synthesize sessionId = _sessionId;
@synthesize appConfig = _appConfig;
@synthesize consumer = _consumer;
@synthesize reseller = _reseller;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
......@@ -95,101 +46,37 @@ NSString *const kUserInfoBaseClassDescription = @"description";
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
[self updateWithDictionary:dict];
[self updateModelObjectWithDictionary:dict];
return self;
}
- (instancetype)updateWithDictionary:(NSDictionary *)dict
{
- (instancetype)updateModelObjectWithDictionary:(NSDictionary *)dict {
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.birthday = [[self objectOrNilForKey:kUserInfoBaseClassBirthday fromDictionary:dict] doubleValue];
self.portrait = [self objectOrNilForKey:kUserInfoBaseClassPortrait fromDictionary:dict];
self.ownerOrg = [UserInfoOwnerOrg modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassOwnerOrg]];
self.code = [self objectOrNilForKey:kUserInfoBaseClassCode fromDictionary:dict];
self.telephone = [self objectOrNilForKey:kUserInfoBaseClassTelephone fromDictionary:dict];
self.mobilephone = [self objectOrNilForKey:kUserInfoBaseClassMobilephone fromDictionary:dict];
self.uuid = [self objectOrNilForKey:kUserInfoBaseClassUuid fromDictionary:dict];
self.lastModifyInfo = [UserInfoLastModifyInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassLastModifyInfo]];
self.socialContact = [UserInfoSocialContact modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassSocialContact]];
self.certificate = [UserInfoCertificate modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassCertificate]];
self.version = [[self objectOrNilForKey:kUserInfoBaseClassVersion fromDictionary:dict] doubleValue];
self.name = [self objectOrNilForKey:kUserInfoBaseClassName fromDictionary:dict];
self.invitationCode = [self objectOrNilForKey:kUserInfoBaseClassInvitationCode fromDictionary:dict];
self.state = [self objectOrNilForKey:kUserInfoBaseClassState fromDictionary:dict];
self.domain = [self objectOrNilForKey:kUserInfoBaseClassDomain fromDictionary:dict];
self.passwordControl = [UserInfoPasswordControl modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassPasswordControl]];
self.gender = [self objectOrNilForKey:kUserInfoBaseClassGender fromDictionary:dict];
NSObject *receivedUserInfoRoles = [dict objectForKey:kUserInfoBaseClassRoles];
NSMutableArray *parsedUserInfoRoles = [NSMutableArray array];
if ([receivedUserInfoRoles isKindOfClass:[NSArray class]]) {
for (NSDictionary *item in (NSArray *)receivedUserInfoRoles) {
if ([item isKindOfClass:[NSDictionary class]]) {
[parsedUserInfoRoles addObject:[UserInfoRoles modelObjectWithDictionary:item]];
}
}
} else if ([receivedUserInfoRoles isKindOfClass:[NSDictionary class]]) {
[parsedUserInfoRoles addObject:[UserInfoRoles modelObjectWithDictionary:(NSDictionary *)receivedUserInfoRoles]];
}
self.roles = [NSArray arrayWithArray:parsedUserInfoRoles];
self.postalAddresses = [UserInfoPostalAddresses modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassPostalAddresses]];
self.idCard = [UserInfoIdCard modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassIdCard]];
self.referrer = [UserInfoReferrer modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassReferrer]];
self.shop = [UserInfoShop modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassShop]];
self.createInfo = [UserInfoCreateInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassCreateInfo]];
self.order = [[self objectOrNilForKey:kUserInfoBaseClassOrder fromDictionary:dict] doubleValue];
self.loginControl = [UserInfoLoginControl modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassLoginControl]];
self.internalBaseClassDescription = [self objectOrNilForKey:kUserInfoBaseClassDescription fromDictionary:dict];
self.code = [[self objectOrNilForKey:kUserInfoBaseClassCode fromDictionary:dict] doubleValue];
self.message = [self objectOrNilForKey:kUserInfoBaseClassMessage fromDictionary:dict];
self.sessionId = [self objectOrNilForKey:kUserInfoBaseClassSessionId fromDictionary:dict];
self.appConfig = [UserInfoAppConfig modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassAppConfig]];
self.consumer = [UserInfoConsumer modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassConsumer]];
self.reseller = [UserInfoReseller modelObjectWithDictionary:[dict objectForKey:kUserInfoBaseClassReseller]];
}
return self;
}
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:[NSNumber numberWithDouble:self.birthday] forKey:kUserInfoBaseClassBirthday];
[mutableDict setValue:self.portrait forKey:kUserInfoBaseClassPortrait];
[mutableDict setValue:[self.ownerOrg dictionaryRepresentation] forKey:kUserInfoBaseClassOwnerOrg];
[mutableDict setValue:self.code forKey:kUserInfoBaseClassCode];
[mutableDict setValue:self.telephone forKey:kUserInfoBaseClassTelephone];
[mutableDict setValue:self.mobilephone forKey:kUserInfoBaseClassMobilephone];
[mutableDict setValue:self.uuid forKey:kUserInfoBaseClassUuid];
[mutableDict setValue:[self.lastModifyInfo dictionaryRepresentation] forKey:kUserInfoBaseClassLastModifyInfo];
[mutableDict setValue:[self.socialContact dictionaryRepresentation] forKey:kUserInfoBaseClassSocialContact];
[mutableDict setValue:[self.certificate dictionaryRepresentation] forKey:kUserInfoBaseClassCertificate];
[mutableDict setValue:[NSNumber numberWithDouble:self.version] forKey:kUserInfoBaseClassVersion];
[mutableDict setValue:self.name forKey:kUserInfoBaseClassName];
[mutableDict setValue:self.invitationCode forKey:kUserInfoBaseClassInvitationCode];
[mutableDict setValue:self.state forKey:kUserInfoBaseClassState];
[mutableDict setValue:self.domain forKey:kUserInfoBaseClassDomain];
[mutableDict setValue:[self.passwordControl dictionaryRepresentation] forKey:kUserInfoBaseClassPasswordControl];
[mutableDict setValue:self.gender forKey:kUserInfoBaseClassGender];
NSMutableArray *tempArrayForRoles = [NSMutableArray array];
for (NSObject *subArrayObject in self.roles) {
if([subArrayObject respondsToSelector:@selector(dictionaryRepresentation)]) {
// This class is a model object
[tempArrayForRoles addObject:[subArrayObject performSelector:@selector(dictionaryRepresentation)]];
} else {
// Generic object
[tempArrayForRoles addObject:subArrayObject];
}
}
[mutableDict setValue:[NSArray arrayWithArray:tempArrayForRoles] forKey:kUserInfoBaseClassRoles];
[mutableDict setValue:[self.postalAddresses dictionaryRepresentation] forKey:kUserInfoBaseClassPostalAddresses];
[mutableDict setValue:[self.idCard dictionaryRepresentation] forKey:kUserInfoBaseClassIdCard];
[mutableDict setValue:[self.referrer dictionaryRepresentation] forKey:kUserInfoBaseClassReferrer];
[mutableDict setValue:[self.shop dictionaryRepresentation] forKey:kUserInfoBaseClassShop];
[mutableDict setValue:[self.createInfo dictionaryRepresentation] forKey:kUserInfoBaseClassCreateInfo];
[mutableDict setValue:[NSNumber numberWithDouble:self.order] forKey:kUserInfoBaseClassOrder];
[mutableDict setValue:[self.loginControl dictionaryRepresentation] forKey:kUserInfoBaseClassLoginControl];
[mutableDict setValue:self.internalBaseClassDescription forKey:kUserInfoBaseClassDescription];
[mutableDict setValue:[NSNumber numberWithDouble:self.code] forKey:kUserInfoBaseClassCode];
[mutableDict setValue:self.message forKey:kUserInfoBaseClassMessage];
[mutableDict setValue:self.sessionId forKey:kUserInfoBaseClassSessionId];
[mutableDict setValue:[self.appConfig dictionaryRepresentation] forKey:kUserInfoBaseClassAppConfig];
[mutableDict setValue:[self.consumer dictionaryRepresentation] forKey:kUserInfoBaseClassConsumer];
[mutableDict setValue:[self.reseller dictionaryRepresentation] forKey:kUserInfoBaseClassReseller];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
......@@ -213,64 +100,24 @@ NSString *const kUserInfoBaseClassDescription = @"description";
{
self = [super init];
self.birthday = [aDecoder decodeDoubleForKey:kUserInfoBaseClassBirthday];
self.portrait = [aDecoder decodeObjectForKey:kUserInfoBaseClassPortrait];
self.ownerOrg = [aDecoder decodeObjectForKey:kUserInfoBaseClassOwnerOrg];
self.code = [aDecoder decodeObjectForKey:kUserInfoBaseClassCode];
self.telephone = [aDecoder decodeObjectForKey:kUserInfoBaseClassTelephone];
self.mobilephone = [aDecoder decodeObjectForKey:kUserInfoBaseClassMobilephone];
self.uuid = [aDecoder decodeObjectForKey:kUserInfoBaseClassUuid];
self.lastModifyInfo = [aDecoder decodeObjectForKey:kUserInfoBaseClassLastModifyInfo];
self.socialContact = [aDecoder decodeObjectForKey:kUserInfoBaseClassSocialContact];
self.certificate = [aDecoder decodeObjectForKey:kUserInfoBaseClassCertificate];
self.version = [aDecoder decodeDoubleForKey:kUserInfoBaseClassVersion];
self.name = [aDecoder decodeObjectForKey:kUserInfoBaseClassName];
self.invitationCode = [aDecoder decodeObjectForKey:kUserInfoBaseClassInvitationCode];
self.state = [aDecoder decodeObjectForKey:kUserInfoBaseClassState];
self.domain = [aDecoder decodeObjectForKey:kUserInfoBaseClassDomain];
self.passwordControl = [aDecoder decodeObjectForKey:kUserInfoBaseClassPasswordControl];
self.gender = [aDecoder decodeObjectForKey:kUserInfoBaseClassGender];
self.roles = [aDecoder decodeObjectForKey:kUserInfoBaseClassRoles];
self.postalAddresses = [aDecoder decodeObjectForKey:kUserInfoBaseClassPostalAddresses];
self.idCard = [aDecoder decodeObjectForKey:kUserInfoBaseClassIdCard];
self.referrer = [aDecoder decodeObjectForKey:kUserInfoBaseClassReferrer];
self.shop = [aDecoder decodeObjectForKey:kUserInfoBaseClassShop];
self.createInfo = [aDecoder decodeObjectForKey:kUserInfoBaseClassCreateInfo];
self.order = [aDecoder decodeDoubleForKey:kUserInfoBaseClassOrder];
self.loginControl = [aDecoder decodeObjectForKey:kUserInfoBaseClassLoginControl];
self.internalBaseClassDescription = [aDecoder decodeObjectForKey:kUserInfoBaseClassDescription];
self.code = [aDecoder decodeDoubleForKey:kUserInfoBaseClassCode];
self.message = [aDecoder decodeObjectForKey:kUserInfoBaseClassMessage];
self.sessionId = [aDecoder decodeObjectForKey:kUserInfoBaseClassSessionId];
self.appConfig = [aDecoder decodeObjectForKey:kUserInfoBaseClassAppConfig];
self.consumer = [aDecoder decodeObjectForKey:kUserInfoBaseClassConsumer];
self.reseller = [aDecoder decodeObjectForKey:kUserInfoBaseClassReseller];
return self;
}
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeDouble:_birthday forKey:kUserInfoBaseClassBirthday];
[aCoder encodeObject:_portrait forKey:kUserInfoBaseClassPortrait];
[aCoder encodeObject:_ownerOrg forKey:kUserInfoBaseClassOwnerOrg];
[aCoder encodeObject:_code forKey:kUserInfoBaseClassCode];
[aCoder encodeObject:_telephone forKey:kUserInfoBaseClassTelephone];
[aCoder encodeObject:_mobilephone forKey:kUserInfoBaseClassMobilephone];
[aCoder encodeObject:_uuid forKey:kUserInfoBaseClassUuid];
[aCoder encodeObject:_lastModifyInfo forKey:kUserInfoBaseClassLastModifyInfo];
[aCoder encodeObject:_socialContact forKey:kUserInfoBaseClassSocialContact];
[aCoder encodeObject:_certificate forKey:kUserInfoBaseClassCertificate];
[aCoder encodeDouble:_version forKey:kUserInfoBaseClassVersion];
[aCoder encodeObject:_name forKey:kUserInfoBaseClassName];
[aCoder encodeObject:_invitationCode forKey:kUserInfoBaseClassInvitationCode];
[aCoder encodeObject:_state forKey:kUserInfoBaseClassState];
[aCoder encodeObject:_domain forKey:kUserInfoBaseClassDomain];
[aCoder encodeObject:_passwordControl forKey:kUserInfoBaseClassPasswordControl];
[aCoder encodeObject:_gender forKey:kUserInfoBaseClassGender];
[aCoder encodeObject:_roles forKey:kUserInfoBaseClassRoles];
[aCoder encodeObject:_postalAddresses forKey:kUserInfoBaseClassPostalAddresses];
[aCoder encodeObject:_idCard forKey:kUserInfoBaseClassIdCard];
[aCoder encodeObject:_referrer forKey:kUserInfoBaseClassReferrer];
[aCoder encodeObject:_shop forKey:kUserInfoBaseClassShop];
[aCoder encodeObject:_createInfo forKey:kUserInfoBaseClassCreateInfo];
[aCoder encodeDouble:_order forKey:kUserInfoBaseClassOrder];
[aCoder encodeObject:_loginControl forKey:kUserInfoBaseClassLoginControl];
[aCoder encodeObject:_internalBaseClassDescription forKey:kUserInfoBaseClassDescription];
[aCoder encodeDouble:_code forKey:kUserInfoBaseClassCode];
[aCoder encodeObject:_message forKey:kUserInfoBaseClassMessage];
[aCoder encodeObject:_sessionId forKey:kUserInfoBaseClassSessionId];
[aCoder encodeObject:_appConfig forKey:kUserInfoBaseClassAppConfig];
[aCoder encodeObject:_consumer forKey:kUserInfoBaseClassConsumer];
[aCoder encodeObject:_reseller forKey:kUserInfoBaseClassReseller];
}
- (id)copyWithZone:(NSZone *)zone
......@@ -279,32 +126,12 @@ NSString *const kUserInfoBaseClassDescription = @"description";
if (copy) {
copy.birthday = self.birthday;
copy.portrait = [self.portrait copyWithZone:zone];
copy.ownerOrg = [self.ownerOrg copyWithZone:zone];
copy.code = [self.code copyWithZone:zone];
copy.telephone = [self.telephone copyWithZone:zone];
copy.mobilephone = [self.mobilephone copyWithZone:zone];
copy.uuid = [self.uuid copyWithZone:zone];
copy.lastModifyInfo = [self.lastModifyInfo copyWithZone:zone];
copy.socialContact = [self.socialContact copyWithZone:zone];
copy.certificate = [self.certificate copyWithZone:zone];
copy.version = self.version;
copy.name = [self.name copyWithZone:zone];
copy.invitationCode = [self.invitationCode copyWithZone:zone];
copy.state = [self.state copyWithZone:zone];
copy.domain = [self.domain copyWithZone:zone];
copy.passwordControl = [self.passwordControl copyWithZone:zone];
copy.gender = [self.gender copyWithZone:zone];
copy.roles = [self.roles copyWithZone:zone];
copy.postalAddresses = [self.postalAddresses copyWithZone:zone];
copy.idCard = [self.idCard copyWithZone:zone];
copy.referrer = [self.referrer copyWithZone:zone];
copy.shop = [self.shop copyWithZone:zone];
copy.createInfo = [self.createInfo copyWithZone:zone];
copy.order = self.order;
copy.loginControl = [self.loginControl copyWithZone:zone];
copy.internalBaseClassDescription = [self.internalBaseClassDescription copyWithZone:zone];
copy.code = self.code;
copy.message = [self.message copyWithZone:zone];
copy.sessionId = [self.sessionId copyWithZone:zone];
copy.appConfig = [self.appConfig copyWithZone:zone];
copy.consumer = [self.consumer copyWithZone:zone];
copy.reseller = [self.reseller copyWithZone:zone];
}
return copy;
......
ALand/Global/UserInfoModel/UserInfoConsumer.h 0 → 100644
View file @ 51667527
//
// UserInfoConsumer.h
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
@class UserInfoOwnerOrg, UserInfoLastModifyInfo, UserInfoPasswordControl, UserInfoCreateInfo, UserInfoLoginControl;
@interface UserInfoConsumer : NSObject <NSCoding, NSCopying>
@property (nonatomic, assign) id birthday;
@property (nonatomic, assign) id portrait;
@property (nonatomic, strong) UserInfoOwnerOrg *ownerOrg;
@property (nonatomic, strong) NSString *code;
@property (nonatomic, assign) id telephone;
@property (nonatomic, strong) NSString *mobilephone;
@property (nonatomic, strong) NSString *uuid;
@property (nonatomic, strong) UserInfoLastModifyInfo *lastModifyInfo;
@property (nonatomic, assign) id socialContact;
@property (nonatomic, assign) double version;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *state;
@property (nonatomic, strong) NSString *domain;
@property (nonatomic, strong) UserInfoPasswordControl *passwordControl;
@property (nonatomic, assign) id idCard;
@property (nonatomic, strong) NSString *gender;
@property (nonatomic, assign) id postalAddresses;
@property (nonatomic, strong) UserInfoCreateInfo *createInfo;
@property (nonatomic, assign) double order;
@property (nonatomic, strong) UserInfoLoginControl *loginControl;
@property (nonatomic, assign) id consumerDescription;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;
- (NSDictionary *)dictionaryRepresentation;
@end
ALand/Global/UserInfoModel/UserInfoConsumer.m 0 → 100644
View file @ 51667527
//
// UserInfoConsumer.m
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "UserInfoConsumer.h"
#import "UserInfoOwnerOrg.h"
#import "UserInfoLastModifyInfo.h"
#import "UserInfoPasswordControl.h"
#import "UserInfoCreateInfo.h"
#import "UserInfoLoginControl.h"
NSString *const kUserInfoConsumerBirthday = @"birthday";
NSString *const kUserInfoConsumerPortrait = @"portrait";
NSString *const kUserInfoConsumerOwnerOrg = @"ownerOrg";
NSString *const kUserInfoConsumerCode = @"code";
NSString *const kUserInfoConsumerTelephone = @"telephone";
NSString *const kUserInfoConsumerMobilephone = @"mobilephone";
NSString *const kUserInfoConsumerUuid = @"uuid";
NSString *const kUserInfoConsumerLastModifyInfo = @"lastModifyInfo";
NSString *const kUserInfoConsumerSocialContact = @"socialContact";
NSString *const kUserInfoConsumerVersion = @"version";
NSString *const kUserInfoConsumerName = @"name";
NSString *const kUserInfoConsumerState = @"state";
NSString *const kUserInfoConsumerDomain = @"domain";
NSString *const kUserInfoConsumerPasswordControl = @"passwordControl";
NSString *const kUserInfoConsumerIdCard = @"idCard";
NSString *const kUserInfoConsumerGender = @"gender";
NSString *const kUserInfoConsumerPostalAddresses = @"postalAddresses";
NSString *const kUserInfoConsumerCreateInfo = @"createInfo";
NSString *const kUserInfoConsumerOrder = @"order";
NSString *const kUserInfoConsumerLoginControl = @"loginControl";
NSString *const kUserInfoConsumerDescription = @"description";
@interface UserInfoConsumer ()
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
@end
@implementation UserInfoConsumer
@synthesize birthday = _birthday;
@synthesize portrait = _portrait;
@synthesize ownerOrg = _ownerOrg;
@synthesize code = _code;
@synthesize telephone = _telephone;
@synthesize mobilephone = _mobilephone;
@synthesize uuid = _uuid;
@synthesize lastModifyInfo = _lastModifyInfo;
@synthesize socialContact = _socialContact;
@synthesize version = _version;
@synthesize name = _name;
@synthesize state = _state;
@synthesize domain = _domain;
@synthesize passwordControl = _passwordControl;
@synthesize idCard = _idCard;
@synthesize gender = _gender;
@synthesize postalAddresses = _postalAddresses;
@synthesize createInfo = _createInfo;
@synthesize order = _order;
@synthesize loginControl = _loginControl;
@synthesize consumerDescription = _consumerDescription;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
{
return [[self alloc] initWithDictionary:dict];
}
- (instancetype)initWithDictionary:(NSDictionary *)dict
{
self = [super init];
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.birthday = [self objectOrNilForKey:kUserInfoConsumerBirthday fromDictionary:dict];
self.portrait = [self objectOrNilForKey:kUserInfoConsumerPortrait fromDictionary:dict];
self.ownerOrg = [UserInfoOwnerOrg modelObjectWithDictionary:[dict objectForKey:kUserInfoConsumerOwnerOrg]];
self.code = [self objectOrNilForKey:kUserInfoConsumerCode fromDictionary:dict];
self.telephone = [self objectOrNilForKey:kUserInfoConsumerTelephone fromDictionary:dict];
self.mobilephone = [self objectOrNilForKey:kUserInfoConsumerMobilephone fromDictionary:dict];
self.uuid = [self objectOrNilForKey:kUserInfoConsumerUuid fromDictionary:dict];
self.lastModifyInfo = [UserInfoLastModifyInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoConsumerLastModifyInfo]];
self.socialContact = [self objectOrNilForKey:kUserInfoConsumerSocialContact fromDictionary:dict];
self.version = [[self objectOrNilForKey:kUserInfoConsumerVersion fromDictionary:dict] doubleValue];
self.name = [self objectOrNilForKey:kUserInfoConsumerName fromDictionary:dict];
self.state = [self objectOrNilForKey:kUserInfoConsumerState fromDictionary:dict];
self.domain = [self objectOrNilForKey:kUserInfoConsumerDomain fromDictionary:dict];
self.passwordControl = [UserInfoPasswordControl modelObjectWithDictionary:[dict objectForKey:kUserInfoConsumerPasswordControl]];
self.idCard = [self objectOrNilForKey:kUserInfoConsumerIdCard fromDictionary:dict];
self.gender = [self objectOrNilForKey:kUserInfoConsumerGender fromDictionary:dict];
self.postalAddresses = [self objectOrNilForKey:kUserInfoConsumerPostalAddresses fromDictionary:dict];
self.createInfo = [UserInfoCreateInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoConsumerCreateInfo]];
self.order = [[self objectOrNilForKey:kUserInfoConsumerOrder fromDictionary:dict] doubleValue];
self.loginControl = [UserInfoLoginControl modelObjectWithDictionary:[dict objectForKey:kUserInfoConsumerLoginControl]];
self.consumerDescription = [self objectOrNilForKey:kUserInfoConsumerDescription fromDictionary:dict];
}
return self;
}
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:self.birthday forKey:kUserInfoConsumerBirthday];
[mutableDict setValue:self.portrait forKey:kUserInfoConsumerPortrait];
[mutableDict setValue:[self.ownerOrg dictionaryRepresentation] forKey:kUserInfoConsumerOwnerOrg];
[mutableDict setValue:self.code forKey:kUserInfoConsumerCode];
[mutableDict setValue:self.telephone forKey:kUserInfoConsumerTelephone];
[mutableDict setValue:self.mobilephone forKey:kUserInfoConsumerMobilephone];
[mutableDict setValue:self.uuid forKey:kUserInfoConsumerUuid];
[mutableDict setValue:[self.lastModifyInfo dictionaryRepresentation] forKey:kUserInfoConsumerLastModifyInfo];
[mutableDict setValue:self.socialContact forKey:kUserInfoConsumerSocialContact];
[mutableDict setValue:[NSNumber numberWithDouble:self.version] forKey:kUserInfoConsumerVersion];
[mutableDict setValue:self.name forKey:kUserInfoConsumerName];
[mutableDict setValue:self.state forKey:kUserInfoConsumerState];
[mutableDict setValue:self.domain forKey:kUserInfoConsumerDomain];
[mutableDict setValue:[self.passwordControl dictionaryRepresentation] forKey:kUserInfoConsumerPasswordControl];
[mutableDict setValue:self.idCard forKey:kUserInfoConsumerIdCard];
[mutableDict setValue:self.gender forKey:kUserInfoConsumerGender];
[mutableDict setValue:self.postalAddresses forKey:kUserInfoConsumerPostalAddresses];
[mutableDict setValue:[self.createInfo dictionaryRepresentation] forKey:kUserInfoConsumerCreateInfo];
[mutableDict setValue:[NSNumber numberWithDouble:self.order] forKey:kUserInfoConsumerOrder];
[mutableDict setValue:[self.loginControl dictionaryRepresentation] forKey:kUserInfoConsumerLoginControl];
[mutableDict setValue:self.consumerDescription forKey:kUserInfoConsumerDescription];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
- (NSString *)description
{
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
}
#pragma mark - Helper Method
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
{
id object = [dict objectForKey:aKey];
return [object isEqual:[NSNull null]] ? nil : object;
}
#pragma mark - NSCoding Methods
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super init];
self.birthday = [aDecoder decodeObjectForKey:kUserInfoConsumerBirthday];
self.portrait = [aDecoder decodeObjectForKey:kUserInfoConsumerPortrait];
self.ownerOrg = [aDecoder decodeObjectForKey:kUserInfoConsumerOwnerOrg];
self.code = [aDecoder decodeObjectForKey:kUserInfoConsumerCode];
self.telephone = [aDecoder decodeObjectForKey:kUserInfoConsumerTelephone];
self.mobilephone = [aDecoder decodeObjectForKey:kUserInfoConsumerMobilephone];
self.uuid = [aDecoder decodeObjectForKey:kUserInfoConsumerUuid];
self.lastModifyInfo = [aDecoder decodeObjectForKey:kUserInfoConsumerLastModifyInfo];
self.socialContact = [aDecoder decodeObjectForKey:kUserInfoConsumerSocialContact];
self.version = [aDecoder decodeDoubleForKey:kUserInfoConsumerVersion];
self.name = [aDecoder decodeObjectForKey:kUserInfoConsumerName];
self.state = [aDecoder decodeObjectForKey:kUserInfoConsumerState];
self.domain = [aDecoder decodeObjectForKey:kUserInfoConsumerDomain];
self.passwordControl = [aDecoder decodeObjectForKey:kUserInfoConsumerPasswordControl];
self.idCard = [aDecoder decodeObjectForKey:kUserInfoConsumerIdCard];
self.gender = [aDecoder decodeObjectForKey:kUserInfoConsumerGender];
self.postalAddresses = [aDecoder decodeObjectForKey:kUserInfoConsumerPostalAddresses];
self.createInfo = [aDecoder decodeObjectForKey:kUserInfoConsumerCreateInfo];
self.order = [aDecoder decodeDoubleForKey:kUserInfoConsumerOrder];
self.loginControl = [aDecoder decodeObjectForKey:kUserInfoConsumerLoginControl];
self.consumerDescription = [aDecoder decodeObjectForKey:kUserInfoConsumerDescription];
return self;
}
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:_birthday forKey:kUserInfoConsumerBirthday];
[aCoder encodeObject:_portrait forKey:kUserInfoConsumerPortrait];
[aCoder encodeObject:_ownerOrg forKey:kUserInfoConsumerOwnerOrg];
[aCoder encodeObject:_code forKey:kUserInfoConsumerCode];
[aCoder encodeObject:_telephone forKey:kUserInfoConsumerTelephone];
[aCoder encodeObject:_mobilephone forKey:kUserInfoConsumerMobilephone];
[aCoder encodeObject:_uuid forKey:kUserInfoConsumerUuid];
[aCoder encodeObject:_lastModifyInfo forKey:kUserInfoConsumerLastModifyInfo];
[aCoder encodeObject:_socialContact forKey:kUserInfoConsumerSocialContact];
[aCoder encodeDouble:_version forKey:kUserInfoConsumerVersion];
[aCoder encodeObject:_name forKey:kUserInfoConsumerName];
[aCoder encodeObject:_state forKey:kUserInfoConsumerState];
[aCoder encodeObject:_domain forKey:kUserInfoConsumerDomain];
[aCoder encodeObject:_passwordControl forKey:kUserInfoConsumerPasswordControl];
[aCoder encodeObject:_idCard forKey:kUserInfoConsumerIdCard];
[aCoder encodeObject:_gender forKey:kUserInfoConsumerGender];
[aCoder encodeObject:_postalAddresses forKey:kUserInfoConsumerPostalAddresses];
[aCoder encodeObject:_createInfo forKey:kUserInfoConsumerCreateInfo];
[aCoder encodeDouble:_order forKey:kUserInfoConsumerOrder];
[aCoder encodeObject:_loginControl forKey:kUserInfoConsumerLoginControl];
[aCoder encodeObject:_consumerDescription forKey:kUserInfoConsumerDescription];
}
- (id)copyWithZone:(NSZone *)zone
{
UserInfoConsumer *copy = [[UserInfoConsumer alloc] init];
if (copy) {
copy.birthday = [self.birthday copyWithZone:zone];
copy.portrait = [self.portrait copyWithZone:zone];
copy.ownerOrg = [self.ownerOrg copyWithZone:zone];
copy.code = [self.code copyWithZone:zone];
copy.telephone = [self.telephone copyWithZone:zone];
copy.mobilephone = [self.mobilephone copyWithZone:zone];
copy.uuid = [self.uuid copyWithZone:zone];
copy.lastModifyInfo = [self.lastModifyInfo copyWithZone:zone];
copy.socialContact = [self.socialContact copyWithZone:zone];
copy.version = self.version;
copy.name = [self.name copyWithZone:zone];
copy.state = [self.state copyWithZone:zone];
copy.domain = [self.domain copyWithZone:zone];
copy.passwordControl = [self.passwordControl copyWithZone:zone];
copy.idCard = [self.idCard copyWithZone:zone];
copy.gender = [self.gender copyWithZone:zone];
copy.postalAddresses = [self.postalAddresses copyWithZone:zone];
copy.createInfo = [self.createInfo copyWithZone:zone];
copy.order = self.order;
copy.loginControl = [self.loginControl copyWithZone:zone];
copy.consumerDescription = [self.consumerDescription copyWithZone:zone];
}
return copy;
}
@end
ALand/Global/UserInfoModel/UserInfoOwnerOrg.h
View file @ 51667527
//
// UserInfoOwnerOrg.h
//
// Created by Z on 16/5/11
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
......@@ -11,8 +11,9 @@
@interface UserInfoOwnerOrg : NSObject <NSCoding, NSCopying>
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *code;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *extra;
@property (nonatomic, strong) NSString *uuid;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
......
ALand/Global/UserInfoModel/UserInfoOwnerOrg.m
View file @ 51667527
//
// UserInfoOwnerOrg.m
//
// Created by Z on 16/5/11
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "UserInfoOwnerOrg.h"
NSString *const kUserInfoOwnerOrgName = @"name";
NSString *const kUserInfoOwnerOrgCode = @"code";
NSString *const kUserInfoOwnerOrgName = @"name";
NSString *const kUserInfoOwnerOrgExtra = @"extra";
NSString *const kUserInfoOwnerOrgUuid = @"uuid";
......@@ -21,8 +22,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
@implementation UserInfoOwnerOrg
@synthesize name = _name;
@synthesize code = _code;
@synthesize name = _name;
@synthesize extra = _extra;
@synthesize uuid = _uuid;
......@@ -38,8 +40,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.name = [self objectOrNilForKey:kUserInfoOwnerOrgName fromDictionary:dict];
self.code = [self objectOrNilForKey:kUserInfoOwnerOrgCode fromDictionary:dict];
self.name = [self objectOrNilForKey:kUserInfoOwnerOrgName fromDictionary:dict];
self.extra = [self objectOrNilForKey:kUserInfoOwnerOrgExtra fromDictionary:dict];
self.uuid = [self objectOrNilForKey:kUserInfoOwnerOrgUuid fromDictionary:dict];
}
......@@ -51,8 +54,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:self.name forKey:kUserInfoOwnerOrgName];
[mutableDict setValue:self.code forKey:kUserInfoOwnerOrgCode];
[mutableDict setValue:self.name forKey:kUserInfoOwnerOrgName];
[mutableDict setValue:self.extra forKey:kUserInfoOwnerOrgExtra];
[mutableDict setValue:self.uuid forKey:kUserInfoOwnerOrgUuid];
return [NSDictionary dictionaryWithDictionary:mutableDict];
......@@ -77,8 +81,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
{
self = [super init];
self.name = [aDecoder decodeObjectForKey:kUserInfoOwnerOrgName];
self.code = [aDecoder decodeObjectForKey:kUserInfoOwnerOrgCode];
self.name = [aDecoder decodeObjectForKey:kUserInfoOwnerOrgName];
self.extra = [aDecoder decodeObjectForKey:kUserInfoOwnerOrgExtra];
self.uuid = [aDecoder decodeObjectForKey:kUserInfoOwnerOrgUuid];
return self;
}
......@@ -86,8 +91,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:_name forKey:kUserInfoOwnerOrgName];
[aCoder encodeObject:_code forKey:kUserInfoOwnerOrgCode];
[aCoder encodeObject:_name forKey:kUserInfoOwnerOrgName];
[aCoder encodeObject:_extra forKey:kUserInfoOwnerOrgExtra];
[aCoder encodeObject:_uuid forKey:kUserInfoOwnerOrgUuid];
}
......@@ -97,8 +103,9 @@ NSString *const kUserInfoOwnerOrgUuid = @"uuid";
if (copy) {
copy.name = [self.name copyWithZone:zone];
copy.code = [self.code copyWithZone:zone];
copy.name = [self.name copyWithZone:zone];
copy.extra = [self.extra copyWithZone:zone];
copy.uuid = [self.uuid copyWithZone:zone];
}
......
ALand/Global/UserInfoModel/UserInfoReseller.h 0 → 100644
View file @ 51667527
//
// UserInfoReseller.h
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
@class UserInfoOwnerOrg, UserInfoLastModifyInfo, UserInfoCertificate, UserInfoPasswordControl, UserInfoIdCard, UserInfoShop, UserInfoCreateInfo, UserInfoLoginControl;
@interface UserInfoReseller : NSObject <NSCoding, NSCopying>
@property (nonatomic, strong) NSString *birthday;
@property (nonatomic, strong) NSString *portrait;
@property (nonatomic, strong) UserInfoOwnerOrg *ownerOrg;
@property (nonatomic, strong) NSString *code;
@property (nonatomic, assign) id telephone;
@property (nonatomic, strong) NSString *mobilephone;
@property (nonatomic, strong) NSString *uuid;
@property (nonatomic, strong) UserInfoLastModifyInfo *lastModifyInfo;
@property (nonatomic, assign) id socialContact;
@property (nonatomic, strong) UserInfoCertificate *certificate;
@property (nonatomic, assign) double version;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *invitationCode;
@property (nonatomic, strong) NSString *state;
@property (nonatomic, strong) NSString *domain;
@property (nonatomic, strong) UserInfoPasswordControl *passwordControl;
@property (nonatomic, strong) NSString *gender;
@property (nonatomic, assign) id referrer;
@property (nonatomic, assign) id postalAddresses;
@property (nonatomic, strong) UserInfoIdCard *idCard;
@property (nonatomic, strong) UserInfoShop *shop;
@property (nonatomic, strong) UserInfoCreateInfo *createInfo;
@property (nonatomic, assign) double order;
@property (nonatomic, strong) UserInfoLoginControl *loginControl;
@property (nonatomic, strong) NSString *resellerDescription;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
- (instancetype)initWithDictionary:(NSDictionary *)dict;
- (NSDictionary *)dictionaryRepresentation;
@end
ALand/Global/UserInfoModel/UserInfoReseller.m 0 → 100644
View file @ 51667527
//
// UserInfoReseller.m
//
// Created by 杰 张 on 16/7/22
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "UserInfoReseller.h"
#import "UserInfoOwnerOrg.h"
#import "UserInfoLastModifyInfo.h"
#import "UserInfoCertificate.h"
#import "UserInfoPasswordControl.h"
#import "UserInfoIdCard.h"
#import "UserInfoShop.h"
#import "UserInfoCreateInfo.h"
#import "UserInfoLoginControl.h"
NSString *const kUserInfoResellerBirthday = @"birthday";
NSString *const kUserInfoResellerPortrait = @"portrait";
NSString *const kUserInfoResellerOwnerOrg = @"ownerOrg";
NSString *const kUserInfoResellerCode = @"code";
NSString *const kUserInfoResellerTelephone = @"telephone";
NSString *const kUserInfoResellerMobilephone = @"mobilephone";
NSString *const kUserInfoResellerUuid = @"uuid";
NSString *const kUserInfoResellerLastModifyInfo = @"lastModifyInfo";
NSString *const kUserInfoResellerSocialContact = @"socialContact";
NSString *const kUserInfoResellerCertificate = @"certificate";
NSString *const kUserInfoResellerVersion = @"version";
NSString *const kUserInfoResellerName = @"name";
NSString *const kUserInfoResellerInvitationCode = @"invitationCode";
NSString *const kUserInfoResellerState = @"state";
NSString *const kUserInfoResellerDomain = @"domain";
NSString *const kUserInfoResellerPasswordControl = @"passwordControl";
NSString *const kUserInfoResellerGender = @"gender";
NSString *const kUserInfoResellerReferrer = @"referrer";
NSString *const kUserInfoResellerPostalAddresses = @"postalAddresses";
NSString *const kUserInfoResellerIdCard = @"idCard";
NSString *const kUserInfoResellerShop = @"shop";
NSString *const kUserInfoResellerCreateInfo = @"createInfo";
NSString *const kUserInfoResellerOrder = @"order";
NSString *const kUserInfoResellerLoginControl = @"loginControl";
NSString *const kUserInfoResellerDescription = @"description";
@interface UserInfoReseller ()
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
@end
@implementation UserInfoReseller
@synthesize birthday = _birthday;
@synthesize portrait = _portrait;
@synthesize ownerOrg = _ownerOrg;
@synthesize code = _code;
@synthesize telephone = _telephone;
@synthesize mobilephone = _mobilephone;
@synthesize uuid = _uuid;
@synthesize lastModifyInfo = _lastModifyInfo;
@synthesize socialContact = _socialContact;
@synthesize certificate = _certificate;
@synthesize version = _version;
@synthesize name = _name;
@synthesize invitationCode = _invitationCode;
@synthesize state = _state;
@synthesize domain = _domain;
@synthesize passwordControl = _passwordControl;
@synthesize gender = _gender;
@synthesize referrer = _referrer;
@synthesize postalAddresses = _postalAddresses;
@synthesize idCard = _idCard;
@synthesize shop = _shop;
@synthesize createInfo = _createInfo;
@synthesize order = _order;
@synthesize loginControl = _loginControl;
@synthesize resellerDescription = _resellerDescription;
+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
{
return [[self alloc] initWithDictionary:dict];
}
- (instancetype)initWithDictionary:(NSDictionary *)dict
{
self = [super init];
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
self.birthday = [self objectOrNilForKey:kUserInfoResellerBirthday fromDictionary:dict];
self.portrait = [self objectOrNilForKey:kUserInfoResellerPortrait fromDictionary:dict];
self.ownerOrg = [UserInfoOwnerOrg modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerOwnerOrg]];
self.code = [self objectOrNilForKey:kUserInfoResellerCode fromDictionary:dict];
self.telephone = [self objectOrNilForKey:kUserInfoResellerTelephone fromDictionary:dict];
self.mobilephone = [self objectOrNilForKey:kUserInfoResellerMobilephone fromDictionary:dict];
self.uuid = [self objectOrNilForKey:kUserInfoResellerUuid fromDictionary:dict];
self.lastModifyInfo = [UserInfoLastModifyInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerLastModifyInfo]];
self.socialContact = [self objectOrNilForKey:kUserInfoResellerSocialContact fromDictionary:dict];
self.certificate = [UserInfoCertificate modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerCertificate]];
self.version = [[self objectOrNilForKey:kUserInfoResellerVersion fromDictionary:dict] doubleValue];
self.name = [self objectOrNilForKey:kUserInfoResellerName fromDictionary:dict];
self.invitationCode = [self objectOrNilForKey:kUserInfoResellerInvitationCode fromDictionary:dict];
self.state = [self objectOrNilForKey:kUserInfoResellerState fromDictionary:dict];
self.domain = [self objectOrNilForKey:kUserInfoResellerDomain fromDictionary:dict];
self.passwordControl = [UserInfoPasswordControl modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerPasswordControl]];
self.gender = [self objectOrNilForKey:kUserInfoResellerGender fromDictionary:dict];
self.referrer = [self objectOrNilForKey:kUserInfoResellerReferrer fromDictionary:dict];
self.postalAddresses = [self objectOrNilForKey:kUserInfoResellerPostalAddresses fromDictionary:dict];
self.idCard = [UserInfoIdCard modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerIdCard]];
self.shop = [UserInfoShop modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerShop]];
self.createInfo = [UserInfoCreateInfo modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerCreateInfo]];
self.order = [[self objectOrNilForKey:kUserInfoResellerOrder fromDictionary:dict] doubleValue];
self.loginControl = [UserInfoLoginControl modelObjectWithDictionary:[dict objectForKey:kUserInfoResellerLoginControl]];
self.resellerDescription = [self objectOrNilForKey:kUserInfoResellerDescription fromDictionary:dict];
}
return self;
}
- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
[mutableDict setValue:self.birthday forKey:kUserInfoResellerBirthday];
[mutableDict setValue:self.portrait forKey:kUserInfoResellerPortrait];
[mutableDict setValue:[self.ownerOrg dictionaryRepresentation] forKey:kUserInfoResellerOwnerOrg];
[mutableDict setValue:self.code forKey:kUserInfoResellerCode];
[mutableDict setValue:self.telephone forKey:kUserInfoResellerTelephone];
[mutableDict setValue:self.mobilephone forKey:kUserInfoResellerMobilephone];
[mutableDict setValue:self.uuid forKey:kUserInfoResellerUuid];
[mutableDict setValue:[self.lastModifyInfo dictionaryRepresentation] forKey:kUserInfoResellerLastModifyInfo];
[mutableDict setValue:self.socialContact forKey:kUserInfoResellerSocialContact];
[mutableDict setValue:[self.certificate dictionaryRepresentation] forKey:kUserInfoResellerCertificate];
[mutableDict setValue:[NSNumber numberWithDouble:self.version] forKey:kUserInfoResellerVersion];
[mutableDict setValue:self.name forKey:kUserInfoResellerName];
[mutableDict setValue:self.invitationCode forKey:kUserInfoResellerInvitationCode];
[mutableDict setValue:self.state forKey:kUserInfoResellerState];
[mutableDict setValue:self.domain forKey:kUserInfoResellerDomain];
[mutableDict setValue:[self.passwordControl dictionaryRepresentation] forKey:kUserInfoResellerPasswordControl];
[mutableDict setValue:self.gender forKey:kUserInfoResellerGender];
[mutableDict setValue:self.referrer forKey:kUserInfoResellerReferrer];
[mutableDict setValue:self.postalAddresses forKey:kUserInfoResellerPostalAddresses];
[mutableDict setValue:[self.idCard dictionaryRepresentation] forKey:kUserInfoResellerIdCard];
[mutableDict setValue:[self.shop dictionaryRepresentation] forKey:kUserInfoResellerShop];
[mutableDict setValue:[self.createInfo dictionaryRepresentation] forKey:kUserInfoResellerCreateInfo];
[mutableDict setValue:[NSNumber numberWithDouble:self.order] forKey:kUserInfoResellerOrder];
[mutableDict setValue:[self.loginControl dictionaryRepresentation] forKey:kUserInfoResellerLoginControl];
[mutableDict setValue:self.resellerDescription forKey:kUserInfoResellerDescription];
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
- (NSString *)description
{
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
}
#pragma mark - Helper Method
- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
{
id object = [dict objectForKey:aKey];
return [object isEqual:[NSNull null]] ? nil : object;
}
#pragma mark - NSCoding Methods
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super init];
self.birthday = [aDecoder decodeObjectForKey:kUserInfoResellerBirthday];
self.portrait = [aDecoder decodeObjectForKey:kUserInfoResellerPortrait];
self.ownerOrg = [aDecoder decodeObjectForKey:kUserInfoResellerOwnerOrg];
self.code = [aDecoder decodeObjectForKey:kUserInfoResellerCode];
self.telephone = [aDecoder decodeObjectForKey:kUserInfoResellerTelephone];
self.mobilephone = [aDecoder decodeObjectForKey:kUserInfoResellerMobilephone];
self.uuid = [aDecoder decodeObjectForKey:kUserInfoResellerUuid];
self.lastModifyInfo = [aDecoder decodeObjectForKey:kUserInfoResellerLastModifyInfo];
self.socialContact = [aDecoder decodeObjectForKey:kUserInfoResellerSocialContact];
self.certificate = [aDecoder decodeObjectForKey:kUserInfoResellerCertificate];
self.version = [aDecoder decodeDoubleForKey:kUserInfoResellerVersion];
self.name = [aDecoder decodeObjectForKey:kUserInfoResellerName];
self.invitationCode = [aDecoder decodeObjectForKey:kUserInfoResellerInvitationCode];
self.state = [aDecoder decodeObjectForKey:kUserInfoResellerState];
self.domain = [aDecoder decodeObjectForKey:kUserInfoResellerDomain];
self.passwordControl = [aDecoder decodeObjectForKey:kUserInfoResellerPasswordControl];
self.gender = [aDecoder decodeObjectForKey:kUserInfoResellerGender];
self.referrer = [aDecoder decodeObjectForKey:kUserInfoResellerReferrer];
self.postalAddresses = [aDecoder decodeObjectForKey:kUserInfoResellerPostalAddresses];
self.idCard = [aDecoder decodeObjectForKey:kUserInfoResellerIdCard];
self.shop = [aDecoder decodeObjectForKey:kUserInfoResellerShop];
self.createInfo = [aDecoder decodeObjectForKey:kUserInfoResellerCreateInfo];
self.order = [aDecoder decodeDoubleForKey:kUserInfoResellerOrder];
self.loginControl = [aDecoder decodeObjectForKey:kUserInfoResellerLoginControl];
self.resellerDescription = [aDecoder decodeObjectForKey:kUserInfoResellerDescription];
return self;
}
- (void)encodeWithCoder:(NSCoder *)aCoder
{
[aCoder encodeObject:_birthday forKey:kUserInfoResellerBirthday];
[aCoder encodeObject:_portrait forKey:kUserInfoResellerPortrait];
[aCoder encodeObject:_ownerOrg forKey:kUserInfoResellerOwnerOrg];
[aCoder encodeObject:_code forKey:kUserInfoResellerCode];
[aCoder encodeObject:_telephone forKey:kUserInfoResellerTelephone];
[aCoder encodeObject:_mobilephone forKey:kUserInfoResellerMobilephone];
[aCoder encodeObject:_uuid forKey:kUserInfoResellerUuid];
[aCoder encodeObject:_lastModifyInfo forKey:kUserInfoResellerLastModifyInfo];
[aCoder encodeObject:_socialContact forKey:kUserInfoResellerSocialContact];
[aCoder encodeObject:_certificate forKey:kUserInfoResellerCertificate];
[aCoder encodeDouble:_version forKey:kUserInfoResellerVersion];
[aCoder encodeObject:_name forKey:kUserInfoResellerName];
[aCoder encodeObject:_invitationCode forKey:kUserInfoResellerInvitationCode];
[aCoder encodeObject:_state forKey:kUserInfoResellerState];
[aCoder encodeObject:_domain forKey:kUserInfoResellerDomain];
[aCoder encodeObject:_passwordControl forKey:kUserInfoResellerPasswordControl];
[aCoder encodeObject:_gender forKey:kUserInfoResellerGender];
[aCoder encodeObject:_referrer forKey:kUserInfoResellerReferrer];
[aCoder encodeObject:_postalAddresses forKey:kUserInfoResellerPostalAddresses];
[aCoder encodeObject:_idCard forKey:kUserInfoResellerIdCard];
[aCoder encodeObject:_shop forKey:kUserInfoResellerShop];
[aCoder encodeObject:_createInfo forKey:kUserInfoResellerCreateInfo];
[aCoder encodeDouble:_order forKey:kUserInfoResellerOrder];
[aCoder encodeObject:_loginControl forKey:kUserInfoResellerLoginControl];
[aCoder encodeObject:_resellerDescription forKey:kUserInfoResellerDescription];
}
- (id)copyWithZone:(NSZone *)zone
{
UserInfoReseller *copy = [[UserInfoReseller alloc] init];
if (copy) {
copy.birthday = [self.birthday copyWithZone:zone];
copy.portrait = [self.portrait copyWithZone:zone];
copy.ownerOrg = [self.ownerOrg copyWithZone:zone];
copy.code = [self.code copyWithZone:zone];
copy.telephone = [self.telephone copyWithZone:zone];
copy.mobilephone = [self.mobilephone copyWithZone:zone];
copy.uuid = [self.uuid copyWithZone:zone];
copy.lastModifyInfo = [self.lastModifyInfo copyWithZone:zone];
copy.socialContact = [self.socialContact copyWithZone:zone];
copy.certificate = [self.certificate copyWithZone:zone];
copy.version = self.version;
copy.name = [self.name copyWithZone:zone];
copy.invitationCode = [self.invitationCode copyWithZone:zone];
copy.state = [self.state copyWithZone:zone];
copy.domain = [self.domain copyWithZone:zone];
copy.passwordControl = [self.passwordControl copyWithZone:zone];
copy.gender = [self.gender copyWithZone:zone];
copy.referrer = [self.referrer copyWithZone:zone];
copy.postalAddresses = [self.postalAddresses copyWithZone:zone];
copy.idCard = [self.idCard copyWithZone:zone];
copy.shop = [self.shop copyWithZone:zone];
copy.createInfo = [self.createInfo copyWithZone:zone];
copy.order = self.order;
copy.loginControl = [self.loginControl copyWithZone:zone];
copy.resellerDescription = [self.resellerDescription copyWithZone:zone];
}
return copy;
}
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment