Skip to content

O
Opple-iOS
Commit 1c8a5b36 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：抽奖，京东E卡优化

parent 43e28d0d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 901 deletions
Class/AllCustomerViewController.m
View file @ 1c8a5b36
......@@ -147,7 +147,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(GETSHOPPERSCONSUMER) WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(GETSHOPPERSCONSUMER) WithCallClass:weakSelf WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
weakSelf.allCustomerTableview.emptyDataSetSource = weakSelf;
weakSelf.allCustomerTableview.emptyDataSetDelegate = weakSelf;
......
Class/CardAmplificationViewController.m
View file @ 1c8a5b36
......@@ -70,8 +70,7 @@
#pragma mark - <MDScratchImageViewDelegate>
- (void)mdScratchImageView:(MDScratchImageView *)scratchImageView didChangeMaskingProgress:(CGFloat)maskingProgress
{
NSLog(@"%f",maskingProgress);
if (maskingProgress == 1) {
if (maskingProgress >= 0.8) {
self.usedingButton.enabled = YES;
self.maskView.hidden = YES;
}
......
Class/CardAmplificationViewController.xib
View file @ 1c8a5b36
......@@ -45,9 +45,12 @@
<constraint firstAttribute="height" constant="120" id="S11-yk-vI9"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="密码: 2FF0-3F9D-DCC6-D1CD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bkG-iT-aBC">
<rect key="frame" x="17" y="301" width="330" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密码: 2FF0-3F9D-DCC6-D1CD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bkG-iT-aBC">
<rect key="frame" x="29" y="301" width="330" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Rfk-Yk-7j3"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
......@@ -62,9 +65,12 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="卡号: 12345678987643677" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z5Z-2z-1qL">
<rect key="frame" x="17" y="267" width="330" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="卡号: 12345678987643677" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z5Z-2z-1qL">
<rect key="frame" x="29" y="267" width="330" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="821-am-6bV"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
......@@ -75,41 +81,43 @@
<constraint firstAttribute="width" constant="100" id="w5u-oL-Y0U"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q0Y-Z3-9ec">
<rect key="frame" x="413" y="332" width="81" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="81" id="5JN-t8-HOZ"/>
<constraint firstAttribute="height" constant="30" id="o7o-uU-SKJ"/>
</constraints>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q0Y-Z3-9ec">
<rect key="frame" x="403" y="329" width="91" height="33"/>
<state key="normal" image="useing"/>
<connections>
<action selector="sureButtonClickAction:" destination="-1" eventType="touchUpInside" id="xP7-jg-LZQ"/>
</connections>
</button>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mask" translatesAutoresizingMaskIntoConstraints="NO" id="FAF-XN-Ibv" customClass="MDScratchImageView">
<imageView hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mask" translatesAutoresizingMaskIntoConstraints="NO" id="FAF-XN-Ibv" customClass="MDScratchImageView">
<rect key="frame" x="0.0" y="197" width="500" height="173"/>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="z5Z-2z-1qL" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="29" id="0gt-6E-uxW"/>
<constraint firstAttribute="trailing" secondItem="FOR-QQ-gKa" secondAttribute="trailing" id="1hS-sz-h5i"/>
<constraint firstAttribute="bottom" secondItem="X2G-su-iPO" secondAttribute="bottom" constant="36" id="4TV-4K-XHc"/>
<constraint firstAttribute="bottom" secondItem="q0Y-Z3-9ec" secondAttribute="bottom" constant="8" id="A5W-wD-rys"/>
<constraint firstItem="X2G-su-iPO" firstAttribute="leading" secondItem="z5Z-2z-1qL" secondAttribute="trailing" constant="23" id="5tR-2W-9Ry"/>
<constraint firstAttribute="bottom" secondItem="FAF-XN-Ibv" secondAttribute="bottom" id="ID7-4t-Qds"/>
<constraint firstAttribute="trailing" secondItem="X2G-su-iPO" secondAttribute="trailing" constant="18" id="PcV-pO-aDJ"/>
<constraint firstItem="cWQ-HK-qv1" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="QPP-sD-d3D"/>
<constraint firstAttribute="trailing" secondItem="cWQ-HK-qv1" secondAttribute="trailing" id="RaO-A5-Fg4"/>
<constraint firstAttribute="bottom" secondItem="bkG-iT-aBC" secondAttribute="bottom" constant="49" id="VG7-Yx-ndX"/>
<constraint firstItem="FAF-XN-Ibv" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="197" id="WXq-V4-xaM"/>
<constraint firstItem="bkG-iT-aBC" firstAttribute="top" secondItem="z5Z-2z-1qL" secondAttribute="bottom" constant="14" id="WlC-tK-fA0"/>
<constraint firstItem="cWQ-HK-qv1" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Ykn-55-Clv"/>
<constraint firstItem="X2G-su-iPO" firstAttribute="leading" secondItem="bkG-iT-aBC" secondAttribute="trailing" constant="23" id="Z6r-wy-ycb"/>
<constraint firstAttribute="bottom" secondItem="cWQ-HK-qv1" secondAttribute="bottom" id="acN-C1-djR"/>
<constraint firstAttribute="bottom" secondItem="FOR-QQ-gKa" secondAttribute="bottom" id="cBq-Xz-B6M"/>
<constraint firstItem="FOR-QQ-gKa" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="cMD-Hv-jVl"/>
<constraint firstItem="bkG-iT-aBC" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="29" id="eR6-Uf-G2e"/>
<constraint firstAttribute="trailing" secondItem="FAF-XN-Ibv" secondAttribute="trailing" id="ehg-fz-Uz9"/>
<constraint firstItem="daL-7C-9So" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="42" id="em4-ep-2cI"/>
<constraint firstItem="z5Z-2z-1qL" firstAttribute="top" secondItem="daL-7C-9So" secondAttribute="bottom" constant="105" id="q5w-Pp-S26"/>
<constraint firstItem="FOR-QQ-gKa" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="197" id="sTB-V2-3bt"/>
<constraint firstItem="FAF-XN-Ibv" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="vZH-4h-gg3"/>
<constraint firstItem="daL-7C-9So" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="29" id="vsP-VJ-iJv"/>
<constraint firstAttribute="trailing" secondItem="q0Y-Z3-9ec" secondAttribute="trailing" constant="6" id="ydA-5i-Bxb"/>
<constraint firstItem="bkG-iT-aBC" firstAttribute="top" secondItem="z5Z-2z-1qL" secondAttribute="bottom" constant="14" id="vv5-Id-BK8"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
......
Class/CardBeenUseViewController.m
View file @ 1c8a5b36
......@@ -97,7 +97,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
weakSelf.beenUseCardCollectionView.emptyDataSetSource = self;
......@@ -132,7 +132,7 @@
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/CardDontUseViewController.m
View file @ 1c8a5b36
......@@ -112,7 +112,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
weakSelf.dontUseCardCollectionView.emptyDataSetSource = weakSelf;
......@@ -262,7 +262,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(ACTIVIATIONJDECARD),self.orderNumber,imagePath] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(ACTIVIATIONJDECARD),self.orderNumber,imagePath] WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/CardOrderInformationReusableView.xib
View file @ 1c8a5b36
This diff is collapsed.
Class/CardViewController.m
View file @ 1c8a5b36
......@@ -60,7 +60,7 @@
- (void)getCardDatasAction
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYALLJDECARD) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYALLJDECARD) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
weakSelf.cardCollectionView.emptyDataSetSource = weakSelf;
weakSelf.cardCollectionView.emptyDataSetDelegate = weakSelf;
......@@ -90,7 +90,7 @@
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/ChangePasswordViewController.m
View file @ 1c8a5b36
......@@ -80,7 +80,7 @@
//修改密码
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(MODIFYPASSWORD) WithRequestType:0 WithParameter:modify WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(MODIFYPASSWORD) WithCallClass:weakSelf WithRequestType:0 WithParameter:modify WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/ClientShoppingCarViewController.m
View file @ 1c8a5b36
......@@ -75,7 +75,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
weakSelf.clientShoppingCarTableView.emptyDataSetSource = weakSelf;
weakSelf.clientShoppingCarTableView.emptyDataSetDelegate = weakSelf;
......
Class/ClientViewController.m
View file @ 1c8a5b36
......@@ -155,7 +155,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(GETSHOPPERSCONSUMER) WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(GETSHOPPERSCONSUMER) WithCallClass:weakSelf WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
weakSelf.informationTableview.emptyDataSetSource = weakSelf;
weakSelf.informationTableview.emptyDataSetDelegate = weakSelf;
......@@ -455,7 +455,7 @@
customerEntity = [Customermanager manager].model;
customerEntity.picture = headerurl;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) WithCallClass:weakSelf WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -496,9 +496,9 @@
#pragma mark -设置为当前用户请求、写入访问时间
- (void)SetupUserRequest
{
__weak typeof(self) weskSelf = self;
WS(weakSelf);
MyclientEntityModel *model = [Customermanager manager].model;
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SAVEVISITEDTIME),model.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SAVEVISITEDTIME),model.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"写入客户访问时间成功");
......@@ -506,7 +506,7 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weskSelf promptCustomerWithString:@"网络连接已断开"];
[weakSelf promptCustomerWithString:@"网络连接已断开"];
} WithFailureBlock:^(id error) {
......@@ -596,7 +596,7 @@
}
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) WithCallClass:weakSelf WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -652,8 +652,8 @@
address.name = self.customerNameField.text;
address.miblephone = self.phoneNumberField.text;
address.address = self.customerAddress.text;
__weak typeof(self) weskSelf = self;
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) WithCallClass:weakSelf WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -661,12 +661,12 @@
}
else
{
[weskSelf ErrorMBProgressView:returnValue[@"message"]];
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weskSelf promptCustomerWithString:@"网络连接已断开"];
[weakSelf promptCustomerWithString:@"网络连接已断开"];
} WithFailureBlock:^(id error) {
......
Class/CustomerOrderViewController.m
View file @ 1c8a5b36
......@@ -134,7 +134,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYORDER) WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
weakSelf.customerOrderTableView.emptyDataSetSource = weakSelf;
weakSelf.customerOrderTableView.emptyDataSetDelegate = weakSelf;
......@@ -315,7 +315,7 @@
[weakSelf CreateMBProgressHUDLoding];
OrderBill *model = [weakSelf.datasArray objectAtIndex_opple:cellindex];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@",SERVERREQUESTURL(RESETORDER),model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@",SERVERREQUESTURL(RESETORDER),model.order.orderNumber,model.order.orderState,@"005"] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/Login/LoginViewController.m
View file @ 1c8a5b36
......@@ -196,7 +196,7 @@
login.username = self.userName.text;
login.password = self.passWord.text;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(LOGIN) WithRequestType:0 WithParameter:login WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(LOGIN) WithCallClass:weakSelf WithRequestType:0 WithParameter:login WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -336,7 +336,7 @@
[self CreateMBProgressHUDLoding];
//发送验证码
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMS),inputPhoneNumber,self.identityView.userName.text];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:urlString WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:urlString WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf ErrorMBProgressView:@"发送验证码成功"];
......@@ -433,7 +433,7 @@
passwrod.username = self.userName.text;
passwrod.smsCode = self.identityView.verificationCode.text;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(RESETPASSWORD) WithRequestType:0 WithParameter:passwrod WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(RESETPASSWORD) WithCallClass:weakSelf WithRequestType:0 WithParameter:passwrod WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -482,7 +482,7 @@
//获取服务端版本大小
WS(weakSelf);
NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=IOS&version=%@",version];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(string) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(string) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSDictionary *dict = returnValue[@"data"];
......
Class/LuckyDrawModel.h 0 → 100644
View file @ 1c8a5b36
//
// LuckyDrawModel.h
// Lighting
//
// Created by 曹云霄 on 2016/11/3.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface LuckyDrawModel : JSONModel
//** 促销对象 */
@property (nonatomic, copy) NSString *body;
//** 类型 */
@property (nonatomic, copy) NSString *type;
/// 抽奖ID
@property (nonatomic, copy) NSString *lotteryId;
//** 描述 */
@property (nonatomic, copy) NSString *descriptionString;
/// 优先
@property (nonatomic,copy) NSString *priority;
@end
Class/LuckyDrawModel.m 0 → 100644
View file @ 1c8a5b36
//
// LuckyDrawModel.m
// Lighting
//
// Created by 曹云霄 on 2016/11/3.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "LuckyDrawModel.h"
@implementation LuckyDrawModel
+ (JSONKeyMapper *)keyMapper
{
return [[JSONKeyMapper alloc]initWithDictionary:@{@"description":@"descriptionString"}];
}
+ (BOOL)propertyIsOptional:(NSString *)propertyName
{
return YES;
}
@end
Class/OrderRecordViewController.m
View file @ 1c8a5b36
......@@ -75,7 +75,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYORDER) WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
weakSelf.orderRecordTableView.emptyDataSetSource = weakSelf;
weakSelf.orderRecordTableView.emptyDataSetDelegate = weakSelf;
......
Class/OrderdetailsViewController.h
View file @ 1c8a5b36
......@@ -8,8 +8,13 @@
#import "BaseViewController.h"
@interface OrderdetailsViewController : BaseViewController
/**
* 订单详情tableview
*/
......
Class/OrderdetailsViewController.m
View file @ 1c8a5b36
This diff is collapsed.
Class/PaymentsViewController.m
View file @ 1c8a5b36
......@@ -99,7 +99,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PAYMENTS) WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PAYMENTS) WithCallClass:weakSelf WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
weakSelf.paymentsTableView.emptyDataSetSource = self;
weakSelf.paymentsTableView.emptyDataSetDelegate = self;
......
Class/ProductDetailsViewController.m
View file @ 1c8a5b36
......@@ -91,7 +91,7 @@
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSString *url = [NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(GOODSDETAILS),_goodsID];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -385,7 +385,7 @@
shopCar.count = self.headerView.goodsNumber.text;
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/ProductLibraryViewController.m
View file @ 1c8a5b36
......@@ -138,7 +138,7 @@
- (void)getScreeningdatasisRemoveArray:(BOOL)remove
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (remove) {
......@@ -170,7 +170,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
weakSelf.productCollectionView.emptyDataSetSource = weakSelf;
weakSelf.productCollectionView.emptyDataSetDelegate = weakSelf;
......@@ -340,7 +340,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(BARCODESEARCH),_barcode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(BARCODESEARCH),_barcode] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf endRefreshingForTableView:self.productCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
......@@ -721,7 +721,7 @@
shopCar.consumerId = [Customermanager manager].model.fid;
shopCar.goodsId = model.fid;
shopCar.count = @"1";
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
response();
}else
......
Class/RebateDetailsViewController.m
View file @ 1c8a5b36
......@@ -50,7 +50,7 @@
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:[NSString stringWithFormat:@"请确认提现金额:%@元",self.inputRebateTextField.text] preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[weakSelf CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(WITHDRAWAL) WithRequestType:0 WithParameter:@{@"amount":self.inputRebateTextField.text} WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(WITHDRAWAL) WithCallClass:weakSelf WithRequestType:0 WithParameter:@{@"amount":self.inputRebateTextField.text} WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -101,7 +101,7 @@
[self CreateMBProgressHUDLoding];
WS(weakSelf);
NSString *urlString = [NSString stringWithFormat:@"%@/%@",WITHDRAWALPROGRESSDETAILS,self.applyUUID];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
TOApplyBillEntity *result = [[TOApplyBillEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
......
Class/RebateViewController.m
View file @ 1c8a5b36
......@@ -167,7 +167,7 @@
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSString *URL = [NSString stringWithFormat:@"%@/%@",REBATE,[Shoppersmanager manager].Shoppers.employee.fid];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/SceneLibraryViewController.m
View file @ 1c8a5b36
......@@ -159,7 +159,7 @@
- (void)getdatasAction
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -184,7 +184,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
weakSelf.seceneLibararyCollectionView.emptyDataSetSource = weakSelf;
weakSelf.seceneLibararyCollectionView.emptyDataSetDelegate = weakSelf;
......
Class/SearchViewController.m
View file @ 1c8a5b36
......@@ -153,7 +153,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(HOTSEARCH) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(HOTSEARCH) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/SettlementViewController.h
View file @ 1c8a5b36
......@@ -19,9 +19,14 @@
@property (nonatomic,strong) NSArray *goodsArray;
/**
* 促销信息
* 促销信息（赠送商品、折扣）
*/
@property (nonatomic,assign) NSArray *promotionalArray;
@property (nonatomic,strong) NSArray *promotionalArray;
/**
* 促销信息（京东E卡、抽奖）
*/
@property (nonatomic,strong) NSArray *luckyDrawAndJDECardArray;
/**
* 商品总数量
......@@ -105,6 +110,13 @@
@property (nonatomic,copy) NSString *orderCode;
/**
* 京东E卡总额度
*/
@property (nonatomic,assign) NSInteger jdCardDenomation;
/**
* 支付成功回调
*/
......
Class/SettlementViewController.m
View file @ 1c8a5b36
......@@ -10,6 +10,7 @@
#import "PayViewController.h"
#import "PromotionalDeductionModel.h"
#import "PromotionalGoodsModel.h"
#import "LuckyDrawModel.h"
@interface SettlementViewController ()<ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate>
......@@ -30,7 +31,6 @@
@end
@implementation SettlementViewController
......@@ -114,7 +114,7 @@
- (void)getPayQrCode
{
WS(weakSelf);
[[NetworkRequestClassManager Manager ] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(QRCODE) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager ] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(QRCODE) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -305,8 +305,8 @@
order.orderNumber = _orderCode;
order.fnewstate = @"002";
order.oldstate = @"001";
//** 促销信息 */
order.realAmount = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:[[self.goodsAllPrice.text substringFromIndex:1] floatValue]];
/// 查询是否有赠送商品促销
order.realAmount = [NSNumber numberWithFloat:[[self.goodsAllPrice.text substringFromIndex:1] floatValue]];
NSMutableArray *goodsArray = [NSMutableArray array];
for (id object in self.promotionalArray) {
if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
......@@ -322,6 +322,26 @@
}
}
order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray;
/// 查询是否有京东E卡促销
NSInteger totalNumber;//促销卡面额
for (id object in self.luckyDrawAndJDECardArray) {
if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
if ([model.type isEqualToString:JDECardAction]) {
totalNumber += model.total;
}
}
}
order.jdCardDenomation = totalNumber;
/// 查询是否有客户抽奖机会
for (id object in self.luckyDrawAndJDECardArray) {
if ([object isKindOfClass:[LuckyDrawModel class]]) {
LuckyDrawModel *model = (LuckyDrawModel *)object;
if ([model.body isEqualToString:@"consumer"]) {
order.lotteryId = model.lotteryId;
}
}
}
//支付类型
if (self.payTreasureButton.selected) {
......@@ -353,10 +373,12 @@
}else if ([self.invoiceType.currentTitle isEqualToString:@"个人发票"] && [order.isbill isEqualToString:@"Y"])
{
order.billType = @"001";
}
}
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/Shoppingcart/AddressViewController.m
View file @ 1c8a5b36
......@@ -188,7 +188,7 @@
address.address = self.detailsAddress.text;
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDADDRESS) WithCallClass:weakSelf WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -246,7 +246,7 @@
address.fid = self.model.fid;
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CHANGEADDRESS) WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CHANGEADDRESS) WithCallClass:weakSelf WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -308,7 +308,7 @@
{
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(REMOVEADDRESS),_model.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(REMOVEADDRESS),_model.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 1c8a5b36
......@@ -111,9 +111,10 @@
- (void)getAddressDatasRequest
{
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHIPPINGADDRESS),[Customermanager manager].model.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHIPPINGADDRESS),[Customermanager manager].model.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsShippingAddrEntity *address = [[RsShippingAddrEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
......@@ -134,31 +135,31 @@
Newmodel.consumerId = model.consumerId;
Newmodel.address = model.address;
[[self.datasArray objectAtIndex_opple:1]insertObject:Newmodel atIndex:0];
[[weakSelf.datasArray objectAtIndex_opple:1]insertObject:Newmodel atIndex:0];
}
//地址数组
NSArray *addressArray = [self.datasArray objectAtIndex_opple:1];
NSArray *addressArray = [weakSelf.datasArray objectAtIndex_opple:1];
//增加cell
NSMutableArray *addCellArray = [NSMutableArray array];
for (int i=0; i<addressArray.count-1; i++) {
NSIndexPath *indexpath = [NSIndexPath indexPathForRow:i inSection:1];
[addCellArray addObject:indexpath];
}
[self.generateOrderTableview insertRowsAtIndexPaths:addCellArray withRowAnimation:UITableViewRowAnimationBottom];
[weakSelf.generateOrderTableview insertRowsAtIndexPaths:addCellArray withRowAnimation:UITableViewRowAnimationBottom];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) {
NSLog(@"%@",error);
[self RemoveMBProgressHUDLoding];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -413,7 +414,7 @@
order.orderdetailList = (NSArray<TOOrderdetailEntity> *)goodidArr;
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CREATEORDER) WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CREATEORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
//商品购物车id
......
Class/Shoppingcart/ShoppingViewController.m
View file @ 1c8a5b36
......@@ -237,7 +237,7 @@
shopcarNumber.dp = Newpage;
[self CreateMBProgressHUDLoding];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SHOPPINGBAG) WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
weakSelf.shoppingTableview.emptyDataSetSource = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.shoppingTableview];
......@@ -373,7 +373,7 @@
DeleteCartRequest *delecteGoods = [[DeleteCartRequest alloc]init];
delecteGoods.cartIds = goodsCode;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) WithRequestType:0 WithParameter:delecteGoods WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:delecteGoods WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -474,7 +474,7 @@
}
delecteGoods.cartIds = codeArr;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) WithRequestType:0 WithParameter:delecteGoods WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(REMOVESHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:delecteGoods WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -517,7 +517,7 @@
dispatch_group_enter(group);
NSLog(@"%@",[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -565,7 +565,7 @@
//商品数量
NSString *goodsNumberString = [NSString stringWithFormat:@"%ld",(long)goodsNumber];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%@",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),carid,goodsis,costpriceString,goodsNumberString] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%@",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),carid,goodsis,costpriceString,goodsNumberString] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
result(returnValue);//提供是否支持修改的参数
......
Class/UserViewController.m
View file @ 1c8a5b36
......@@ -56,7 +56,8 @@
#pragma mark -查询返利金额
- (void)queryShoppersCommission
{
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHOPPERSCOMMISSION),[Shoppersmanager manager].Shoppers.employee.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(SHOPPERSCOMMISSION),[Shoppersmanager manager].Shoppers.employee.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
// self.rebateLabe.text = [NSString stringWithFormat:@"￥%.2f",[returnValue[@"data"] floatValue]];
......@@ -170,7 +171,7 @@
employ.employee = [Shoppersmanager manager].Shoppers.employee;
employ.employee.picture = headerurl;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(MODITYSHOPPERSINFORMATION) WithRequestType:0 WithParameter:employ WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(MODITYSHOPPERSINFORMATION) WithCallClass:weakSelf WithRequestType:0 WithParameter:employ WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -207,7 +208,7 @@
[alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
[weakSelf CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(CANCELLOGIN) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(CANCELLOGIN) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -275,7 +276,7 @@
login.username = self.userName.text;
login.password = self.passWord.text;
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(LOGIN) WithRequestType:0 WithParameter:login WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(LOGIN) WithCallClass:weakSelf WithRequestType:0 WithParameter:login WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Class/WithdrawalViewController.m
View file @ 1c8a5b36
......@@ -98,7 +98,7 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(WITHDRAWALPROGRESS) WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(WITHDRAWALPROGRESS) WithCallClass:weakSelf WithRequestType:0 WithParameter:self.model WithReturnValueBlock:^(id returnValue) {
weakSelf.withdrawalTableView.emptyDataSetSource = self;
weakSelf.withdrawalTableView.emptyDataSetDelegate = self;
......
Lighting.xcodeproj/project.pbxproj
View file @ 1c8a5b36
......@@ -132,7 +132,7 @@
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */; };
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */; };
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */; };
29A9DCAE1CEB643C00A7567A /* PDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* PDFViewController.m */; };
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */; };
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */; };
29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */; };
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */; };
......@@ -151,6 +151,7 @@
29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FA1CEECDFF00A9787D /* goodsDetailsTableViewCell.m */; };
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */; };
29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */; };
29D991DF1DCAE5B700840776 /* LuckyDrawModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */; };
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */; };
29E2D3201DB8737000443170 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D31F1DB8737000443170 /* CardViewController.m */; };
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D3231DB878F200443170 /* XLPlainFlowLayout.m */; };
......@@ -421,8 +422,8 @@
29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProductDetailsHeaderView.xib; sourceTree = "<group>"; };
29A974C81D72F9C80012AFA1 /* RebateSuccessTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateSuccessTableViewController.h; sourceTree = "<group>"; };
29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; };
29A9DCAB1CEB643C00A7567A /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFViewController.h; sourceTree = "<group>"; };
29A9DCAC1CEB643C00A7567A /* PDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFViewController.m; sourceTree = "<group>"; };
29A9DCAB1CEB643C00A7567A /* CustomWKWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWKWebViewController.h; sourceTree = "<group>"; };
29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWKWebViewController.m; sourceTree = "<group>"; };
29BAA3A91DC9FB5B00927D04 /* PromptTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptTableViewCell.h; sourceTree = "<group>"; };
29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptTableViewCell.m; sourceTree = "<group>"; };
29BB27661CD9D38E009A0813 /* AllpriceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllpriceTableViewCell.h; sourceTree = "<group>"; };
......@@ -457,6 +458,8 @@
29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsTableViewCell.xib; sourceTree = "<group>"; };
29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MjRefreshHeaderCustom.h; sourceTree = "<group>"; };
29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MjRefreshHeaderCustom.m; sourceTree = "<group>"; };
29D991DD1DCAE5B700840776 /* LuckyDrawModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckyDrawModel.h; sourceTree = "<group>"; };
29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckyDrawModel.m; sourceTree = "<group>"; };
29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; };
29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; };
29E2D31E1DB8737000443170 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; };
......@@ -718,6 +721,8 @@
2921F2FB1DB5E75300D6439B /* PromotionalGoodsModel.m */,
2921F3011DB5EBD600D6439B /* PromotionalDeductionModel.h */,
2921F3021DB5EBD600D6439B /* PromotionalDeductionModel.m */,
29D991DD1DCAE5B700840776 /* LuckyDrawModel.h */,
29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */,
);
name = model;
sourceTree = "<group>";
......@@ -1312,8 +1317,8 @@
29A9DCAA1CEB63BD00A7567A /* PreviewPDF */ = {
isa = PBXGroup;
children = (
29A9DCAB1CEB643C00A7567A /* PDFViewController.h */,
29A9DCAC1CEB643C00A7567A /* PDFViewController.m */,
29A9DCAB1CEB643C00A7567A /* CustomWKWebViewController.h */,
29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */,
);
name = PreviewPDF;
sourceTree = "<group>";
......@@ -1898,6 +1903,7 @@
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */,
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */,
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
29D991DF1DCAE5B700840776 /* LuckyDrawModel.m in Sources */,
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */,
291A37771DBA58CC00299F0D /* GetJDCardView.m in Sources */,
......@@ -1910,7 +1916,7 @@
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */,
29A9DCAE1CEB643C00A7567A /* PDFViewController.m in Sources */,
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */,
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
2934B0AB1DB4E1F1009CBAC4 /* CYConstManager.m in Sources */,
29F14BAB1CF6B60D0005D3E5 /* QRViewController.m in Sources */,
......
Lighting/StoryboardwithCYX.storyboard
View file @ 1c8a5b36
......@@ -3906,28 +3906,14 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gD6-An-cx8">
<rect key="frame" x="206" y="22" width="84" height="21"/>
<rect key="frame" x="171" y="23" width="84" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="X21291291929129192" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UBn-rZ-q4s">
<rect key="frame" x="290" y="22" width="160" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="服务导购：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7od-1Z-yjM">
<rect key="frame" x="458" y="22" width="82" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="某某某" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2tu-Jm-J34">
<rect key="frame" x="533" y="22" width="120" height="21"/>
<rect key="frame" x="471" y="22" width="82" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......@@ -4077,6 +4063,20 @@
<action selector="delecteOrderButtonClick:" destination="YwA-DX-QXj" eventType="touchUpInside" id="mBs-ed-Tuz"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="X21291291929129192" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UBn-rZ-q4s">
<rect key="frame" x="249" y="23" width="201" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="某某某" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2tu-Jm-J34">
<rect key="frame" x="547" y="22" width="120" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
......
Podfile.lock
View file @ 1c8a5b36
......@@ -41,7 +41,7 @@ PODS:
- WYPopoverController (0.3.9)
DEPENDENCIES:
- AFNetworking
- AFNetworking (~> 3.1.0)
- Bugly
- DZNEmptyDataSet
- FDFullscreenPopGesture
......
Pods/Manifest.lock
View file @ 1c8a5b36
......@@ -41,7 +41,7 @@ PODS:
- WYPopoverController (0.3.9)
DEPENDENCIES:
- AFNetworking
- AFNetworking (~> 3.1.0)
- Bugly
- DZNEmptyDataSet
- FDFullscreenPopGesture
......
Tools/BaseViewController.m
View file @ 1c8a5b36
......@@ -20,6 +20,10 @@
*/
@property (nonatomic,strong) PromptinformationView *promptView;
/**
* 打印
*/
@property (nonatomic,strong) UIPrintInteractionController *printControl;
@end
@implementation BaseViewController
......@@ -64,6 +68,14 @@
return _webView;
}
- (UIPrintInteractionController *)printControl
{
if (!_printControl) {
_printControl = [UIPrintInteractionController sharedPrintController];
}
return _printControl;
}
- (void)viewDidLoad {
[super viewDidLoad];
......@@ -126,8 +138,8 @@
hud.mode = MBProgressHUDModeText;
hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.6];
hud.removeFromSuperViewOnHide = YES;
[hud hide:YES afterDelay:1.0f];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[hud hide:YES afterDelay:2.0f];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (completed) {
completed();
}
......@@ -178,7 +190,7 @@
hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.6];
hud.labelFont = [UIFont systemFontOfSize:12];
hud.labelText = successString;
[hud hide:YES afterDelay:1];
[hud hide:YES afterDelay:3];
}
#pragma mark -显示信息的提示框
......@@ -192,7 +204,7 @@
hud.animationType = MBProgressHUDAnimationZoom;
hud.mode = MBProgressHUDModeText;
hud.removeFromSuperViewOnHide = YES;
[hud hide:YES afterDelay:1.0f];
[hud hide:YES afterDelay:3.0f];
}
......@@ -207,7 +219,7 @@
hud.animationType = MBProgressHUDAnimationZoom;
hud.mode = MBProgressHUDModeText;
hud.removeFromSuperViewOnHide = YES;
[hud hide:YES afterDelay:1.0f];
[hud hide:YES afterDelay:3.0f];
}
......@@ -271,18 +283,16 @@
#pragma mark 调用airPrint无线打印机
- (void)callAirprintWithURL:(NSURL *)datasurl SuccessBlock:(void (^)())success ErrorBlock:(void (^)())failed
{
UIPrintInteractionController *pic = [UIPrintInteractionController sharedPrintController];
pic.delegate = self;
self.printControl.delegate = self;
[self.webView loadRequest:[NSURLRequest requestWithURL:datasurl]];//网页
self.webView.navigationDelegate = self;
pic.printFormatter = [self.webView viewPrintFormatter];//布局打印视图绘制的内容。
self.printControl.printFormatter = [self.webView viewPrintFormatter];//布局打印视图绘制的内容。
UIPrintInfo *printInfo = [UIPrintInfo printInfo];
printInfo.outputType = UIPrintInfoOutputGeneral;
printInfo.jobName = @"订单明细";
printInfo.duplex = UIPrintInfoDuplexShortEdge;
pic.printInfo = printInfo;
pic.showsPageRange = YES;
self.printControl.printInfo = printInfo;
self.printControl.showsPageRange = YES;
void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
if (completed)
{
......@@ -295,10 +305,9 @@
failed();
}
};
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
[pic presentAnimated:YES completionHandler:completionHandler];
[self.printControl presentAnimated:YES completionHandler:completionHandler];
}
}
......@@ -433,7 +442,7 @@
- (void)QueryShoppingCarNumber
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"更新购物车数量成功");
......
Tools/CYConstManager.h
View file @ 1c8a5b36
......@@ -257,6 +257,11 @@ extern NSString *const USEJDECARD;
* 抽奖
*/
extern NSString *const DRAW;
/**
* 拼接订单详情URL(打印/预览)
*/
extern NSString *const ORDERDETAILSURL;
/*****************************************接口地址*****************************************/
......@@ -299,3 +304,33 @@ extern NSString *const OPENCONTROLLER;
* 打开体验中心
*/
extern NSString *const OPENFOLLOWHEARTVC;
/**
* 微信卡劵
*/
extern NSString *const WXCardAction;
/**
* 京东E卡
*/
extern NSString *const JDECardAction;
/**
* 折扣金额
*/
extern NSString *const deductionAction;
/**
* 赠送商品
*/
extern NSString *const goodsAction;
/**
* 转盘抽奖
*/
extern NSString *const lotteryAction;
Tools/CYConstManager.m
View file @ 1c8a5b36
......@@ -256,6 +256,11 @@ NSString *const USEJDECARD = @"/jingdongecard/use?cardNumber=%@";
* 抽奖
*/
NSString *const DRAW = @"/tOLotteryController.do?lotteryAward&lotteryId=%@&drawId=%@&orderNumber=%@";
/**
* 拼接订单详情URL(打印/预览)
*/
NSString *const ORDERDETAILSURL = @"/tOOrderController.do?htmlOfPdf&reseller_id=%@&order_number=%@";
/*****************************************接口地址*****************************************/
......@@ -300,7 +305,30 @@ NSString *const OPENCONTROLLER = @"openController";
NSString *const OPENFOLLOWHEARTVC = @"FollowHeartVC";
/**
* 微信卡劵
*/
NSString *const WXCardAction = @"WXCardAction";
/**
* 京东E卡
*/
NSString *const JDECardAction = @"JDECardAction";
/**
* 折扣金额
*/
NSString *const deductionAction = @"deductionAction";
/**
* 赠送商品
*/
NSString *const goodsAction = @"goodsAction";
/**
* 转盘抽奖
*/
NSString *const lotteryAction = @"lotteryAction";
......
Tools/PDFViewController.h → Tools/CustomWKWebViewController.h
View file @ 1c8a5b36
......@@ -8,7 +8,7 @@
#import "BaseViewController.h"
@interface PDFViewController : BaseViewController
@interface CustomWKWebViewController : BaseViewController
......@@ -18,6 +18,12 @@
*/
@property (nonatomic,copy) NSString *pdfURLString;
/**
* 抽奖完成
*/
@property (nonatomic,weak) void(^luckyDrawFinishBlock)(NSDictionary *luckyDrawResultDict);
@end
Tools/PDFViewController.m → Tools/CustomWKWebViewController.m
View file @ 1c8a5b36
//
// PDFViewController.m
// CustomWKWebViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/17.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PDFViewController.h"
#import "CustomWKWebViewController.h"
#import <WebKit/WebKit.h>
@interface PDFViewController ()<WKNavigationDelegate>
@interface CustomWKWebViewController ()<WKNavigationDelegate,WKScriptMessageHandler>
@property (nonatomic,strong) WKWebView *webView;
@property (nonatomic,strong) WKWebViewConfiguration *config;
@end
@implementation PDFViewController
@implementation CustomWKWebViewController
#pragma mark - lazy
- (WKWebViewConfiguration *)config
{
if (!_config) {
_config = [[WKWebViewConfiguration alloc]init];
// 设置偏好设置
_config.preferences = [[WKPreferences alloc] init];
// 默认为0
_config.preferences.minimumFontSize = 10;
// 默认认为YES
_config.preferences.javaScriptEnabled = YES;
// 在iOS上默认为NO，表示不能自动通过窗口打开
_config.preferences.javaScriptCanOpenWindowsAutomatically = NO;
// 通过JS与webview内容交互
_config.userContentController = [[WKUserContentController alloc] init];
[_config.userContentController addScriptMessageHandler:self name:@"AppModel"];
}
return _config;
}
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
[self uiConfigAction];
[self addDismissButton];
}
#pragma mark -UI
- (void)uiConfigAction
{
self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds];
self.webView = [[WKWebView alloc] initWithFrame:self.view.bounds configuration:self.config];
[self.view addSubview:self.webView];
self.webView.navigationDelegate = self;
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.pdfURLString]]];
......@@ -48,6 +67,19 @@
[dismissButton addTarget:self action:@selector(dismissButtonClick) forControlEvents:UIControlEventTouchUpInside];
}
#pragma mark - WKScriptMessageHandler
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
{
if ([message.name isEqualToString:@"AppModel"]) {
// 打印所传过来的参数，只支持NSNumber, NSString, NSDate, NSArray,
// NSDictionary, and NSNull类型
NSLog(@"%@", message.body);
if (self.luckyDrawFinishBlock) {
self.luckyDrawFinishBlock(message.body);
}
}
}
#pragma mark -dismiss
- (void)dismissButtonClick
......
Tools/NetworkRequestClassManager.h
View file @ 1c8a5b36
......@@ -47,6 +47,7 @@ typedef enum {
* @param failureBlock 失败回调
*/
- (void)NetworkRequestWithURL:(NSString *) requestURLString
WithCallClass:(BaseViewController *)object
WithRequestType:(NetworkRequestType) requestType
WithParameter:(JSONModel *) jastorobject
WithReturnValueBlock:(ReturnValueBlock) successBlock
......@@ -69,6 +70,7 @@ typedef enum {
* @param failureBlock 失败回调
*/
- (void)NetworkWithDictionaryRequestWithURL:(NSString *) requestURLString
WithCallClass:(BaseViewController *)object
WithRequestType:(NetworkRequestType) requestType
WithParameter:(NSDictionary *) parameter
WithReturnValueBlock:(ReturnValueBlock) successBlock
......
Tools/NetworkRequestClassManager.m
View file @ 1c8a5b36
......@@ -65,6 +65,7 @@ static NetworkRequestClassManager *manager = nil;
*/
- (void)NetworkRequestWithURL:(NSString *) requestURLString
WithCallClass:(BaseViewController *)object
WithRequestType:(NetworkRequestType) requestType
WithParameter:(JSONModel *) jastorobject
WithReturnValueBlock:(ReturnValueBlock) successBlock
......@@ -87,7 +88,8 @@ static NetworkRequestClassManager *manager = nil;
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];return;
[object RemoveMBProgressHUDLoding];
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];
}else {
successBlock(responseObject);
}
......@@ -104,7 +106,8 @@ static NetworkRequestClassManager *manager = nil;
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];return;
[object RemoveMBProgressHUDLoding];
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];
}else{
successBlock(responseObject);
}
......@@ -129,6 +132,7 @@ static NetworkRequestClassManager *manager = nil;
* @param failureBlock 失败回调
*/
- (void)NetworkWithDictionaryRequestWithURL:(NSString *) requestURLString
WithCallClass:(BaseViewController *)object
WithRequestType:(NetworkRequestType) requestType
WithParameter:(NSDictionary *) parameter
WithReturnValueBlock:(ReturnValueBlock) successBlock
......@@ -147,7 +151,13 @@ static NetworkRequestClassManager *manager = nil;
[manager POST:requestURLString parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
successBlock(responseObject);
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[object RemoveMBProgressHUDLoding];
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];
}else {
successBlock(responseObject);
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
......@@ -159,7 +169,13 @@ static NetworkRequestClassManager *manager = nil;
[manager GET:requestURLString parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
successBlock(responseObject);
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[object RemoveMBProgressHUDLoding];
[[NSNotificationCenter defaultCenter] postNotificationName:LOGINTIMEOUT object:nil];
}else{
successBlock(responseObject);
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
......
Tools/SceneViewController.m
View file @ 1c8a5b36
......@@ -234,7 +234,7 @@
{
WS(weakSelf);
//场景筛选条件
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -313,7 +313,7 @@
- (void)getSceneLibrarydatas:(SceneCondition *)condition isRemove:(BOOL)remove
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
weakSelf.sceneOrProductClollectionView.emptyDataSetSource = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.sceneOrProductClollectionView];
......@@ -406,7 +406,7 @@
- (void)getScreeningdatasisRemoveArray:(BOOL)remove
{
__weak typeof(self) weakSelf = self;
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -542,7 +542,7 @@
- (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
[weakSelf endRefreshingForTableView:weakSelf.sceneOrProductClollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Tools/ShareGoodsViewController.m
View file @ 1c8a5b36
......@@ -30,7 +30,7 @@
if (self.isShareOrderbill) {//分享订单
[weakSelf CreateMBProgressHUDLoding];
NSString *shareOrderString = [NSString stringWithFormat:@"%@/%@",SHAREORDERBILL,self.orderBillNumber];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(shareOrderString) WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(shareOrderString) WithCallClass:weakSelf WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......
Tools/ShoppingBagViewController.m
View file @ 1c8a5b36
......@@ -255,7 +255,7 @@
shopCar.goodsId = [goodsIds substringToIndex:goodsIds.length-1];
shopCar.count = [goodsCounts substringToIndex:goodsCounts.length-1];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithCallClass:weakSelf WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -309,7 +309,7 @@
//商品数量
NSString *goodsNumberString = [NSString stringWithFormat:@"%ld",(long)goodsNumber];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%@",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),carid,goodsis,costpriceString,goodsNumberString] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%@",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),carid,goodsis,costpriceString,goodsNumberString] WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
result(returnValue);//提供是否支持修改的参数
......
Tools/opple_objc_json_client.h
View file @ 1c8a5b36
This diff is collapsed.
Tools/opple_objc_json_client.m
View file @ 1c8a5b36
......@@ -184,49 +184,12 @@
@end
@implementation Draw
@synthesize fid;
@synthesize lotteryId;
@synthesize drawDate;
@synthesize winnerId;
@synthesize award;
@synthesize orderNumber;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation RsLotteryRequest
@synthesize guideIdEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation OrderFilter
@synthesize resellerCodeEquals;
@synthesize orderStateEquals;
@synthesize consumerNameOrMobileEquals;
@synthesize consumerIdEquals;
@synthesize dp;
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@synthesize consumer;
@synthesize employee;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -245,8 +208,10 @@
@synthesize billType;
@synthesize billTitle;
@synthesize realAmount;
@synthesize draw;
@synthesize drawId;
@synthesize lotteryId;
@synthesize promotionGoods;
@synthesize jdCardDenomation;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -264,10 +229,9 @@
@end
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
@implementation PromotionGoods
@synthesize goods;
@synthesize promotionNumber;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -289,8 +253,8 @@
@end
@implementation DeleteCartRequest
@synthesize cartIds;
@implementation RsShippingAddrEntity
@synthesize list;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -300,9 +264,10 @@
@end
@implementation ShopCartFilter
@implementation SaveShoppingCartRequest
@synthesize consumerId;
@synthesize dp;
@synthesize goodsId;
@synthesize count;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -312,9 +277,9 @@
@end
@implementation RsShareResponse
@synthesize shareId;
@synthesize url;
@implementation ShopCartFilter
@synthesize consumerId;
@synthesize dp;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -324,19 +289,22 @@
@end
@implementation TOCommissionHistEntity
@implementation TOApplyBillEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize resellerCode;
@synthesize employeeId;
@synthesize orderId;
@synthesize amount;
@synthesize afteramount;
@synthesize remark;
@synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize billNumber;
@synthesize guideId;
@synthesize guideName;
@synthesize applyMoney;
@synthesize beforeMoney;
@synthesize afterMoney;
@synthesize billStates;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -354,21 +322,21 @@
@end
@implementation TODrawEntity
@implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize lotteryId;
@synthesize drawDate;
@synthesize winnerId;
@synthesize award;
@synthesize orderNumber;
@synthesize state;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -875,54 +843,19 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOApplyBillEntity
@implementation TOCommissionHistEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize billNumber;
@synthesize guideId;
@synthesize guideName;
@synthesize applyMoney;
@synthesize beforeMoney;
@synthesize afterMoney;
@synthesize billStates;
@synthesize resellerCode;
@synthesize employeeId;
@synthesize orderId;
@synthesize amount;
@synthesize afteramount;
@synthesize remark;
@synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -940,10 +873,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation SaveShoppingCartRequest
@synthesize consumerId;
@synthesize goodsId;
@synthesize count;
@implementation RsShareResponse
@synthesize shareId;
@synthesize url;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -953,8 +885,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation RsShippingAddrEntity
@synthesize list;
@implementation DeleteCartRequest
@synthesize cartIds;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -964,9 +896,10 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation PromotionGoods
@synthesize goods;
@synthesize promotionNumber;
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -976,12 +909,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@synthesize consumer;
@synthesize employee;
@implementation OrderFilter
@synthesize resellerCodeEquals;
@synthesize orderStateEquals;
@synthesize consumerNameOrMobileEquals;
@synthesize consumerIdEquals;
@synthesize dp;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1032,13 +965,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
return YES;
}
+ (JSONKeyMapper *)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"typename": @"typeName",
}];
}
@end
......@@ -1150,27 +1076,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation TSBaseUser
@synthesize departid;
@synthesize signature;
@synthesize browser;
@synthesize userKey;
@synthesize status;
@synthesize activitiSync;
@synthesize password;
@synthesize userName;
@synthesize realName;
@synthesize currentDepart;
@synthesize userOrgList;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation TSDepart
......@@ -1200,8 +1105,18 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation OrderResponse
@synthesize orderBillList;
@implementation TSBaseUser
@synthesize departid;
@synthesize signature;
@synthesize browser;
@synthesize userKey;
@synthesize status;
@synthesize activitiSync;
@synthesize password;
@synthesize userName;
@synthesize realName;
@synthesize currentDepart;
@synthesize userOrgList;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1245,8 +1160,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation RsLotteryResponse
@synthesize list;
@implementation OrderResponse
@synthesize orderBillList;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......
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