caoyunxiao

Lighting/Class/ClientDetailsTableViewCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "ShopcarModel.h"
 @interface ClientDetailsTableViewCell : UITableViewCell
 
 
@@ -43,5 +43,9 @@
 @property (weak, nonatomic) IBOutlet UILabel *goodsPrice;
 
 
+/**
+ *  商品模型
+ */
+@property (nonatomic,strong) ShopcarModel *model;
 
 @end

Lighting/Class/ClientDetailsTableViewCell.m

@@ -15,6 +15,15 @@
     // Initialization code
 }
 
+
+
+#pragma mark -赋值
+- (void)setModel:(ShopcarModel *)model
+{
+    _model = model;
+    
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/ClientViewController.m

@@ -188,6 +188,7 @@
 #pragma mark -设置为当前客户回调
 - (void)SetCustomerButtonClick:(NSInteger)index;
 {
+    
     for (InformationTableViewCell *cell in self.informationTableview.visibleCells) {
         
         cell.setCurrentCustomer.selected = NO;
@@ -202,9 +203,13 @@
     self.customerNameField.text = model.name;
     self.phoneNumberField.text = model.mobile;
     self.customerAddress.text = model.address;
-    //保存客户ID
+    //保存客户信息
     [Shoppersmanager manager].currentCustomer = YES;
     [Customermanager manager].customerID = model.fid;
+    [Customermanager manager].customerName = model.name;
+    [Customermanager manager].customerPhoneNumber = model.mobile;
+    [Customermanager manager].companyAddress = model.address;
+    [Customermanager manager].cutomerAddress = model.address;
     [self.addpersonInformationButton setTitle:@"退出当前客户" forState:UIControlStateNormal];
     self.changePersonInformationButton.hidden = NO;
 }
@@ -280,8 +285,13 @@
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-            //保存客户ID
+            //保存客户信息
             [Customermanager manager].customerID = returnValue[@"data"];
+            [Customermanager manager].customerName = customerEntity.name;
+            [Customermanager manager].customerPhoneNumber = customerEntity.mobile;
+            [Customermanager manager].companyAddress = customerEntity.address;
+            [Customermanager manager].cutomerAddress = customerEntity.address;
+            
             [Shoppersmanager manager].currentCustomer = YES;
             [self SuccessMBProgressView:returnValue[@"新增成功"]];
             [self.addpersonInformationButton setTitle:@"退出当前客户" forState:UIControlStateNormal];

Lighting/Class/ClientdetailsViewController.m

@@ -10,6 +10,8 @@
 #import "ClientDetailsTableViewCell.h"
 #import "OrderTableViewCell.h"
 #import "OrderdetailsViewController.h"
+#import "ShopcarModel.h"
+
 
 @interface ClientdetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -18,12 +20,50 @@
  */
 @property (weak, nonatomic) IBOutlet UITableView *ClientdetailsTableview;
 
+/**
+ *  购物车数据源
+ */
+@property (nonatomic,strong) NSMutableArray *shopResponseArray;
+
+/**
+ *  订单记录数据
+ */
+@property (nonatomic,strong) NSMutableArray *orderRecordArray;
+
 
 
 @end
 
 @implementation ClientdetailsViewController
 
+
+/**
+ *  购物袋数据源
+ */
+- (NSMutableArray *)shopResponseArray
+{
+    if (_shopResponseArray == nil) {
+        
+        _shopResponseArray = [NSMutableArray array];
+    }
+    return _shopResponseArray;
+}
+
+
+/**
+ *  订单记录数据源
+ */
+- (NSMutableArray *)orderRecordArray
+{
+    if (_orderRecordArray == nil) {
+        
+        _orderRecordArray = [NSMutableArray array];
+    }
+    return _orderRecordArray;
+}
+
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -69,6 +109,7 @@
         
         ClientDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ClientDetails" forIndexPath:indexPath];
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        cell.model = [self.orderRecordArray objectAtIndex_opple:indexPath.row];
         return cell;
         
     }else if (self.orderRecordButton.selected)
@@ -80,11 +121,21 @@
     return  nil;
 }
 
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 20;
+    if (self.shoppingBagButton.selected) {
+        
+        return self.shopResponseArray.count;
+    }
+    if (self.orderRecordButton.selected) {
+        
+        return self.orderRecordArray.count;
+    }
+    return 0;
 }
 
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (self.shoppingBagButton.selected) {
@@ -105,7 +156,58 @@
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
     OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
     [self.navigationController pushViewController:orderdetails animated:YES];
+}
+
+
+
+#pragma mark -获取购物车商品
+- (void)getShoppingCardata
+{
     
+    ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
+    shopcarNumber.consumerId = [Customermanager manager].customerID;
+    DataPage *Newpage = [[DataPage alloc]init];
+    Newpage.page = 0;
+    shopcarNumber.dp = Newpage;
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            //自定义属性
+            for (TOShopcartEntity *objc in shopcar.shopcart) {
+                
+                ShopcarModel *model = [[ShopcarModel alloc]init];
+                model.goods = objc.goods;
+                model.fid = objc.fid;
+                model.createName = objc.createName;
+                model.createBy = objc.createBy;
+                model.createDate = objc.createDate;
+                model.updateName = objc.updateName;
+                model.updateBy = objc.updateBy;
+                model.updateDate = objc.updateDate;
+                model.goodsId = objc.goodsId;
+                model.goodsNum = objc.goodsNum;
+                model.consumerId = objc.consumerId;
+                
+                [self.shopResponseArray addObject:model];
+            }
+            
+            [self.ClientdetailsTableview reloadData];
+            
+        }else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+    } WithFailureBlock:^(id error) {
+        
+        [self RemoveMBProgressHUDLoding];
+    }];
 }
 
 
@@ -131,6 +233,7 @@
     sender.selected = YES;
     self.orderRecordButton.selected = NO;
     self.orderRecordButton.backgroundColor = kMainBlueColor;
+    
     [self.ClientdetailsTableview reloadData];
 }
 

Lighting/Class/CommodityListTableViewCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "ShopcarModel.h"
 @interface CommodityListTableViewCell : UITableViewCell
 
 
@@ -37,6 +37,9 @@
 @property (weak, nonatomic) IBOutlet UILabel *totalPrice;
 
 
-
+/**
+ *  数据源model
+ */
+@property (nonatomic,strong) ShopcarModel *model;
 
 @end

Lighting/Class/CommodityListTableViewCell.m

@@ -15,6 +15,23 @@
     // Initialization code
 }
 
+#pragma mark 赋值
+- (void)setModel:(ShopcarModel *)model
+{
+    _model = model;
+    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:ReplaceImage];
+    self.goodsName.text = _model.goods.name;
+    self.goodsNumber.text = _model.goods.number;
+    self.clinchPrice.text = [_model.goods.costPrice stringValue];
+    //计算总价格
+    NSInteger number = [_model.goods.number integerValue];
+    NSInteger price = [_model.goods.costPrice integerValue];
+    NSInteger allPrice = number*price;
+    self.totalPrice.text = [NSString stringWithFormat:@"%ld",allPrice];
+}
+
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/OrderdetailsViewController.h

@@ -17,5 +17,8 @@
 @property (weak, nonatomic) IBOutlet UITableView *orderDetailsTableview;
 
 
-
+/**
+ *  订单详情
+ */
+@property (nonatomic,copy) NSString *orderCode;
 @end

Lighting/Class/OrderdetailsViewController.m

@@ -40,6 +40,13 @@
     [self CreateTableviewFooterView];
 }
 
+#pragma mark -获取订单详情
+
+
+
+
+
+
 #pragma mark -TableviewHeader------根据不同的订单状态判断是否显示
 - (void)CreateTableviewHeaderView
 {

Lighting/Class/ProductDetailsViewController.m

@@ -246,6 +246,9 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
             [self SuccessMBProgressView:@"加入购物车成功"];
+            //刷新购物车
+            [[NSNotificationCenter defaultCenter]postNotificationName:@"GOODSNUMBER" object:returnValue[@"data"]];
+            
         }else
         {
             [self ErrorMBProgressView:returnValue[@"message"]];
@@ -271,6 +274,12 @@
 
 
 
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

Lighting/Class/Shoppingcart/AddressViewController.m

@@ -9,13 +9,13 @@
 #import "AddressViewController.h"
 #import "ModifyShippingAddressView.h"
 
-@interface AddressViewController ()
+@interface AddressViewController ()<CityselectedDelegate>
 
 
 /**
  *  城市选择器
  */
-@property (nonatomic,strong)ModifyShippingAddressView *citySelecteview;
+@property (nonatomic,strong) ModifyShippingAddressView *citySelecteview;
 @end
 
 @implementation AddressViewController
@@ -31,7 +31,7 @@
     if (_citySelecteview == nil) {
         
         _citySelecteview = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
-                                                          owner:self options:nil]lastObject];
+                                                          owner:self options:nil] lastObject];
     }
     return _citySelecteview;
 }
@@ -44,7 +44,6 @@
     [self uiConfigAction];
 }
 
-
 #pragma mark -布局
 - (void)uiConfigAction
 {
@@ -56,6 +55,7 @@
     self.detailsAddressBackview.layer.cornerRadius = kCornerRadius;
     self.citySelected.layer.masksToBounds = YES;
     self.citySelected.layer.cornerRadius = kCornerRadius;
+    [self.citySelected addTarget:self action:@selector(SelectedCityButtonClick) forControlEvents:UIControlEventTouchUpInside];
     
 }
 
@@ -73,6 +73,7 @@
     
     self.citySelecteview.frame = CGRectMake(0, self.view.frame.size.height, self.view.frame.size.width, 160);
     [self.view addSubview:self.citySelecteview];
+    self.citySelecteview.delegate = self;
     [self.citySelecteview.selectedCityButton addTarget:self action:@selector(CompleteButton) forControlEvents:UIControlEventTouchUpInside];
     [UIView animateWithDuration:0.2 animations:^{
         
@@ -107,6 +108,75 @@
 }
 
 
+#pragma mark 完成城市选择后
+- (void)citySelected:(NSString *)cityString
+{
+    [self.citySelected setTitle:cityString forState:UIControlStateNormal];
+}
+
+
+#pragma mark 新增按钮点击，或者修改
+- (IBAction)addAddressButtonClick:(UIButton *)sender {
+    
+    [self addAddressInformationRequest];
+}
+
+
+
+#pragma mark -新增地址信息
+- (void)addAddressInformationRequest
+{
+    TOShippingAddrEntity *address = [[TOShippingAddrEntity alloc]init];
+    address.consumerId = [Customermanager manager].customerID;
+    address.name = self.recipientPerson.text;
+    address.miblephone = self.PhoneNumber.text;
+    address.city = [self.citySelected currentTitle];
+    address.address = self.detailsAddress.text;
+    
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shippingAddress/save"] WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) {
+        
+        NSLog(@"%@",returnValue);
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        NSLog(@"%@",error);
+    }];
+    
+    
+}
+//@synthesize fid;
+//@synthesize createDate;
+//@synthesize sysOrgCode;
+//@synthesize name;
+//@synthesize miblephone;
+//@synthesize province;
+//@synthesize city;
+//@synthesize country;
+//@synthesize address;
+//@synthesize state;
+//@synthesize consumerId;
+
+
+#pragma mark -修改收货地址
+- (void)ChangeAddressRequest
+{
+    
+    TOShippingAddrEntity *change = [[TOShippingAddrEntity alloc]init];
+    
+    
+}
+
+
+
+
+#pragma mark -取消新增地址，或者删除
+- (IBAction)cancelButtonClick:(UIButton *)sender {
+    
+}
+
 
 
 /*

Lighting/Class/Shoppingcart/AddressViewController.xib

@@ -79,14 +79,20 @@
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="51b-5f-c5c">
                             <rect key="frame" x="19" y="271" width="120" height="35"/>
                             <color key="backgroundColor" red="1" green="0.70412693910000002" blue="0.69044467629999995" alpha="1" colorSpace="calibratedRGB"/>
-                            <state key="normal" title="删除"/>
+                            <state key="normal" title="取消"/>
+                            <connections>
+                                <action selector="cancelButtonClick:" destination="-1" eventType="touchUpInside" id="N17-5d-yqF"/>
+                            </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EMy-g3-6JD">
                             <rect key="frame" x="176" y="271" width="120" height="35"/>
                             <color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
-                            <state key="normal" title="修改">
+                            <state key="normal" title="新增">
                                 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </state>
+                            <connections>
+                                <action selector="addAddressButtonClick:" destination="-1" eventType="touchUpInside" id="AJG-5a-ivS"/>
+                            </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QSY-YC-rrl">
                             <rect key="frame" x="98" y="162" width="160" height="30"/>

Lighting/Class/Shoppingcart/GenerateOrdersTableViewCell.h

@@ -10,4 +10,31 @@
 
 @interface GenerateOrdersTableViewCell : UITableViewCell
 
+
+
+@property (nonatomic,strong) TOShippingAddrEntity *NewModel;
+
+
+/**
+ *  收货人姓名
+ */
+@property (weak, nonatomic) IBOutlet UILabel *consigneeName;
+
+/**
+ *  收货人电话
+ */
+@property (weak, nonatomic) IBOutlet UILabel *consigneemobile;
+
+/**
+ *  收货人地址
+ */
+@property (weak, nonatomic) IBOutlet UILabel *consigneeAddress;
+
+
+/**
+ *  是否选中
+ */
+@property (weak, nonatomic) IBOutlet UIButton *isSelectedButton;
+
+
 @end

Lighting/Class/Shoppingcart/GenerateOrdersTableViewCell.m

@@ -15,6 +15,26 @@
     // Initialization code
 }
 
+
+
+
+#pragma mark -赋值
+- (void)setNewModel:(TOShippingAddrEntity *)NewModel
+{
+    _NewModel = NewModel;
+    self.consigneeName.text = _NewModel.name;
+    self.consigneemobile.text = _NewModel.miblephone;
+    self.consigneeAddress.text = _NewModel.address;
+}
+
+
+#pragma mark -选中按钮
+- (IBAction)SelectedButtonClick:(UIButton *)sender {
+    
+    
+}
+
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

Lighting/Class/Shoppingcart/GenerateOrdersViewController.h

@@ -33,4 +33,12 @@
  */
 @property (weak, nonatomic) IBOutlet UIView *BackView;
 
+
+
+/**
+ *  结算的商品数据源
+ */
+@property (nonatomic,strong) NSArray *settlementGoodsdatas;
+
+
 @end

Lighting/Class/Shoppingcart/GenerateOrdersViewController.m

@@ -26,12 +26,42 @@
 
 
 
+/**
+ *  数据源
+ */
+@property (nonatomic,strong) NSMutableArray *datasArray;
+
+
 @property (nonatomic,strong) UIView *Tabbarview;
 @end
 
 @implementation GenerateOrdersViewController
 
-
+/**
+ *  初始化数据源
+ */
+- (NSMutableArray *)datasArray
+{
+    if (_datasArray == nil) {
+        
+        _datasArray = [NSMutableArray array];
+        for (int i=0; i<3; i++) {
+            NSMutableArray *arr = [NSMutableArray array];
+            [_datasArray addObject:arr];
+        }
+        //加入客户信息model
+        Customermanager *customerModel = [Customermanager manager];
+        [[_datasArray firstObject] addObject:customerModel];
+        
+        //地址占位
+        [[_datasArray objectAtIndex_opple:1] addObject:@"地址占位"];
+        
+        //加入商品信息
+        [_datasArray replaceObjectAtIndex:2 withObject:_settlementGoodsdatas];
+    }
+    
+    return _datasArray;
+}
 
 
 
@@ -39,6 +69,7 @@
     [super viewDidLoad];
     
     [self uiConfigAction];
+    [self getAddressDatasRequest];
 }
 
 #pragma mark -UI
@@ -50,6 +81,39 @@
 }
 
 
+#pragma mark -获得地址信息
+- (void)getAddressDatasRequest
+{
+    
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/shippingAddress/listAddress/",[Customermanager manager].customerID] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        NSLog(@"%@",returnValue);
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+         
+            RsShippingAddrEntity *address = [[RsShippingAddrEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
+    
+            for (NSInteger i=address.list.count-1; i>=0; i--) {
+                
+                TOShippingAddrEntity *model = [address.list objectAtIndex_opple:i];
+                [[self.datasArray objectAtIndex_opple:1]insertObject:model atIndex:0];
+            }
+            
+            
+            [self.generateOrderTableview reloadData];
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        NSLog(@"%@",error);
+    }];
+}
+
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -58,16 +122,25 @@
     if (indexPath.section == 0 && indexPath.row == 0) {
         
         PersonInformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"secondcell" forIndexPath:indexPath];
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
         return cell;
     }
     else if (indexPath.section == 1)
     {
-        if (indexPath.row == 1) {
+        NSArray *Addressarr = [self.datasArray objectAtIndex_opple:indexPath.section];
+        if (indexPath.row == Addressarr.count-1) {
+            
+            GenerateOrdersModifyTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"consigneecell" forIndexPath:indexPath];
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
             
-            GenerateOrdersModifyTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Modifycell" forIndexPath:indexPath];
             return cell;
         }
-        GenerateOrdersTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"consigneecell" forIndexPath:indexPath];
+        GenerateOrdersTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Modifycell" forIndexPath:indexPath];
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        cell.backgroundColor = kTCColor(242, 242, 242);
+        TOShippingAddrEntity *model = [self.datasArray objectAtIndex_opple:indexPath.section][indexPath.row];
+        NSLog(@"%@",model);
+        cell.NewModel = model;
         return cell;
     }
     else if (indexPath.section == 2)
@@ -76,10 +149,12 @@
         if (indexPath.row == 1) {
             
             AllpriceTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"sixthcell" forIndexPath:indexPath];
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
             return cell;
         }
         CommodityListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fourthcell" forIndexPath:indexPath];
-        
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        cell.model = [self.datasArray objectAtIndex_opple:indexPath.section][indexPath.row];
         return cell;
     }
     return nil;
@@ -88,27 +163,30 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    switch (section) {
-        case 0:
-        {
-            return 1;
-        }
-            break;
-        case 1:
-        {
-            return 2;
-        }
-            break;
-        case 2:
-        {
-            return 2;
-        }
-            break;
-            
-        default:
-            break;
-    }
-    return 0;
+//    return [[self.datasArray objectAtIndex_opple:section] count];
+    NSArray *arr = [self.datasArray objectAtIndex_opple:section];
+    return arr.count;
+//    switch (section) {
+//        case 0:
+//        {
+//            return 1;
+//        }
+//            break;
+//        case 1:
+//        {
+//            return 2;
+//        }
+//            break;
+//        case 2:
+//        {
+//            return 2;
+//        }
+//            break;
+//            
+//        default:
+//            break;
+//    }
+//    return 0;
 }
 
 
@@ -117,7 +195,7 @@
     switch (indexPath.section) {
         case 0:
         {
-            return 160;
+            return 140;
         }
             break;
         case 1:
@@ -168,16 +246,42 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
-    view.backgroundColor = [UIColor redColor];
-    return view;
+    switch (section) {
+        case 1:
+        {
+            UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 10)];
+            imageView.image = TCImage(@"lineNew");
+            UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
+            [view addSubview:imageView];
+            return view;
+        }
+            break;
+        case 2:
+        {
+            UILabel *titleLabe = [[UILabel alloc]initWithFrame:CGRectMake(50, 0, 100, 44)];
+            titleLabe.text = @"购物袋清单";
+            UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
+            [view addSubview:titleLabe];
+            
+            //横线
+            UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(0, 43, ScreenWidth, 1)];
+            lineView.backgroundColor = kTCColor(242, 242, 242);
+            [view addSubview:lineView];
+            return view;
+        }
+            break;
+            
+        default:
+            break;
+    }
+    return nil;
 }
 
 
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return 3;
+    return self.datasArray.count;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
@@ -205,8 +309,51 @@
 #pragma mark -生成订单
 - (IBAction)CreateOrderButtonClick:(UIButton *)sender {
     
-    OrderdetailsViewController *orderDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
-    [self.navigationController pushViewController:orderDetails animated:YES];
+    
+    OrderBill *order = [[OrderBill alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    
+    TOOrderEntity *orderReceiver = [[TOOrderEntity alloc]init];
+    orderReceiver.receiverName = @"caoyunxiao";
+    orderReceiver.receiverMobile = @"15121161964";
+    orderReceiver.receiverAddress = @"dasdsssssssssss";
+    
+    TOOrderdetailEntity *orderGoods = [[TOOrderdetailEntity alloc]init];
+    orderGoods.goodsId = [[[self.datasArray lastObject] lastObject] goodsId];
+    
+    order.datapage = page;
+    order.order = orderReceiver;
+    NSArray *arr = @[orderGoods];
+    order.orderdetailList = arr;
+    
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/save"] WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
+        
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+         
+            OrderdetailsViewController *orderDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
+            orderDetails.orderCode = returnValue[@"data"];
+            [self.navigationController pushViewController:orderDetails animated:YES];
+            
+        }else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(id error) {
+        
+        NSLog(@"%@",error);
+        [self RemoveMBProgressHUDLoding];
+    }];
+    
+    
+
 }
 
 
@@ -224,8 +371,6 @@
 
 
 
-
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

Lighting/Class/Shoppingcart/ModifyShippingAddressView.h

@@ -8,6 +8,14 @@
 
 #import <UIKit/UIKit.h>
 
+
+@protocol CityselectedDelegate <NSObject>
+
+//城市选择
+- (void)citySelected:(NSString *)cityString;
+
+@end
+
 @interface ModifyShippingAddressView : UIView<UIPickerViewDelegate,UIPickerViewDataSource>
 
 
@@ -23,6 +31,10 @@
  */
 @property (weak, nonatomic) IBOutlet UIPickerView *cityPickerView;
 
+/**
+ *  城市选择代理
+ */
+@property (nonatomic,assign) id<CityselectedDelegate>delegate;
 
 
 

Lighting/Class/Shoppingcart/ModifyShippingAddressView.m

@@ -114,6 +114,10 @@
             break;
     }
     
+    if ([self.delegate respondsToSelector:@selector(citySelected:)]) {
+        [self.delegate citySelected:cityString];
+    }
+    
 }
 
 

Lighting/Class/Shoppingcart/ShoppingTableViewCell.h

@@ -55,9 +55,16 @@
 @property (nonatomic,strong) ShopcarModel *model;
 
 
+/**
+ *  传入cel下标
+ */
+@property (nonatomic,assign) NSInteger cellindex;
 
 
-
+/**
+ *  传回选中状态
+ */
+@property (nonatomic,copy) void(^returnCellblock)(NSInteger index);
 
 
 

Lighting/Class/Shoppingcart/ShoppingTableViewCell.m

@@ -20,6 +20,7 @@
 - (void)setModel:(ShopcarModel *)model
 {
     _model = model;
+    self.selectedButton.selected = _model.isSelected;
     [self.goodsImageView sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:ReplaceImage];
     self.goodsInformationLabe.text = _model.goods.name;
     self.tagsPriceLabe.text = [_model.goods.tagPrice stringValue];
@@ -36,12 +37,54 @@
     
     //sender.tag == 100   减少
     //sender.tag == 101   增加
+    NSLog(@"%ld",sender.tag);
+    
+    
+    NSInteger goodsNumber = [self.goodsNumbersLabe.text integerValue];
+    switch (sender.tag) {
+        case 100://减少
+        {
+            if (goodsNumber <= 1) {
+                
+                //不能小于1
+                return;
+            }
+            goodsNumber --;
+            self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%ld",goodsNumber];
+            
+        }
+            break;
+        case 101://增加
+        {
+            if (goodsNumber >= [_model.goods.number integerValue]) {
+                
+                //不能大于库存
+                
+                return;
+            }
+            goodsNumber ++;
+            self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%ld",goodsNumber];
+            
+        }
+            break;
+            
+        default:
+            break;
+    }
+    
+    
+    
+    
 }
 
 
 #pragma mark -商品选中
 - (IBAction)selectedButtonClick:(UIButton *)sender {
     
+    if (self.returnCellblock) {
+        
+        self.returnCellblock(_cellindex);
+    }
     sender.selected = YES;
 }
 

Lighting/Class/Shoppingcart/ShoppingViewController.m

@@ -32,7 +32,7 @@
 /**
  *  数据源
  */
-- (NSMutableArray *)datasArray
+- (NSMutableArray *)shopResponseArray
 {
     if (_shopResponseArray == nil) {
         
@@ -64,7 +64,7 @@
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    
+    [self getShoppingCardata];
     // 开启
     if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
         self.navigationController.interactivePopGestureRecognizer.enabled = YES;
@@ -99,9 +99,7 @@
         [self RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-            NSLog(@"%@",returnValue);
             ShopCartResponse *shopcar = [[ShopCartResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            
             //自定义属性
             for (TOShopcartEntity *objc in shopcar.shopcart) {
                 
@@ -117,11 +115,10 @@
                 model.goodsId = objc.goodsId;
                 model.goodsNum = objc.goodsNum;
                 model.consumerId = objc.consumerId;
-                model.sysOrgCode = objc.sysOrgCode;
                 
                 [self.shopResponseArray addObject:model];
-                
             }
+            [self.shoppingTableview reloadData];
             
         }else
         {
@@ -135,7 +132,6 @@
         
         [self RemoveMBProgressHUDLoding];
     }];
-    
 }
 
 
@@ -146,6 +142,13 @@
     ShoppingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Shopping" forIndexPath:indexPath];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
+    cell.cellindex = indexPath.row;
+    //cell选中回调
+    [cell setReturnCellblock:^(NSInteger index) {
+        
+        [self setSelectedButton:index];
+        
+    }];
     return  cell;
 }
 
@@ -168,10 +171,42 @@
 
 
 
+#pragma mark -设置为当前客户回调
+- (void)setSelectedButton:(NSInteger)index;
+{
+    
+    for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
+        
+        cell.selectedButton.selected = NO;
+    }
+    for (ShopcarModel *model in self.shopResponseArray) {
+        
+        model.isSelected = NO;
+    }
+    ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:index];
+    model.isSelected = YES;
+}
+
+
 #pragma mark -结算
 - (IBAction)settlementButtonClick:(UIButton *)sender {
     
+    
+    NSMutableArray *array = [NSMutableArray array];
+    for (ShopcarModel *model in self.shopResponseArray) {
+        
+        if (model.isSelected) {
+            
+            [array addObject:model];
+        }
+    }
+    if (array.count == 0) {
+        
+        [self ErrorMBProgressView:@"没有选中任何商品"];
+        return;
+    }
     GenerateOrdersViewController *generateOrder = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"generateorders"];
+    generateOrder.settlementGoodsdatas = array;
     [self.navigationController pushViewController:generateOrder animated:YES];
 }
 

Lighting/Class/Tabbar/Toolview.m

@@ -94,22 +94,28 @@
         [button setTitle:[titleArray objectAtIndex_opple:i-1] forState:UIControlStateNormal];
         button.tag = 100+i-1;
         [button addTarget:self action:@selector(ButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        if (i == 4) {
-          button.instructionsNumber = i;
-        }
+  
         [button setImage:TCImage([imageArray objectAtIndex_opple:i-1]) forState:UIControlStateNormal];
         [self addSubview:button];
     }
-    
 //    //创建下划线
 //    CustomButton *button = (CustomButton *)[self viewWithTag:102];
 //    self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1)];
 //    _underlineView.backgroundColor = [UIColor redColor];
 //    [self addSubview:self.underlineView];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshGoodsNumber:) name:@"GOODSNUMBER" object:nil];
 }
 
 
+#pragma mark -刷新购物车显示数量
+- (void)refreshGoodsNumber:(NSNotification *)objc
+{
+    CustomButton *button = (CustomButton *)[self viewWithTag:103];
+    button.instructionsNumber = [objc.object integerValue];
+    
+}
+
 #pragma mark -二维码扫描码
 - (void)QrCodeButtonClickAction
 {

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -58,6 +58,9 @@
 		29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */; };
 		29834EC51CDF76C1001A484F /* UserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EC31CDF76C1001A484F /* UserViewController.m */; };
 		29834EC61CDF76C1001A484F /* UserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EC41CDF76C1001A484F /* UserViewController.xib */; };
+		2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9B1CE72F1500704C91 /* NSArray+ ZXPUnicode.m */; };
+		2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */; };
+		2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */; };
 		299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; };
 		2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; };
 		2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; };
@@ -199,6 +202,12 @@
 		29834EC21CDF76C1001A484F /* UserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserViewController.h; sourceTree = "<group>"; };
 		29834EC31CDF76C1001A484F /* UserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserViewController.m; sourceTree = "<group>"; };
 		29834EC41CDF76C1001A484F /* UserViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UserViewController.xib; sourceTree = "<group>"; };
+		2985AE9B1CE72F1500704C91 /* NSArray+ ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+ ZXPUnicode.m"; sourceTree = "<group>"; };
+		2985AE9C1CE72F1500704C91 /* NSArray+ZXPUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+ZXPUnicode.h"; sourceTree = "<group>"; };
+		2985AE9D1CE72F1500704C91 /* NSDictionary+ZXPUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+ZXPUnicode.h"; sourceTree = "<group>"; };
+		2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ZXPUnicode.m"; sourceTree = "<group>"; };
+		2985AE9F1CE72F1500704C91 /* NSObject+ZXPUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+ZXPUnicode.h"; sourceTree = "<group>"; };
+		2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+ZXPUnicode.m"; sourceTree = "<group>"; };
 		299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; };
 		299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; };
 		299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; };
@@ -440,6 +449,7 @@
 		2928F7DE1CD085430036D761 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				2985AE9A1CE72F1500704C91 /* ZXPUnicode */,
 				29BFBD841CE4288A00C238FB /* Customercenter */,
 				29F725F81CE17AE40072FE0E /* Shopperscenter */,
 				29E28CE51CE0B90600812A55 /* Regularexpressions */,
@@ -736,6 +746,19 @@
 			name = XXuserController;
 			sourceTree = "<group>";
 		};
+		2985AE9A1CE72F1500704C91 /* ZXPUnicode */ = {
+			isa = PBXGroup;
+			children = (
+				2985AE9B1CE72F1500704C91 /* NSArray+ ZXPUnicode.m */,
+				2985AE9C1CE72F1500704C91 /* NSArray+ZXPUnicode.h */,
+				2985AE9D1CE72F1500704C91 /* NSDictionary+ZXPUnicode.h */,
+				2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */,
+				2985AE9F1CE72F1500704C91 /* NSObject+ZXPUnicode.h */,
+				2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */,
+			);
+			path = ZXPUnicode;
+			sourceTree = "<group>";
+		};
 		299249411CDB517A00786B1E /* ModifytheShippingAddressView */ = {
 			isa = PBXGroup;
 			children = (
@@ -1177,6 +1200,7 @@
 			files = (
 				29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */,
 				29F726041CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m in Sources */,
+				2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */,
 				04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */,
 				29EC331F1CE02AFA005F0C13 /* PopoverViewController.m in Sources */,
 				29BFBD871CE428B200C238FB /* Customermanager.m in Sources */,
@@ -1186,6 +1210,7 @@
 				0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */,
 				2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */,
 				293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
+				2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */,
 				29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
 				060D397C1CE45CFE0082AECD /* ImageCropperView.m in Sources */,
 				2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */,
@@ -1210,6 +1235,7 @@
 				29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */,
 				29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
 				29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
+				2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */,
 				29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
 				04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */,
 				2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
@@ -1389,7 +1415,6 @@
 					"-l\"MMDrawerController\"",
 					"-l\"Masonry\"",
 					"-l\"SDWebImage\"",
-					"-l\"SVProgressHUD\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
@@ -1406,6 +1431,7 @@
 					"\"SystemConfiguration\"",
 					"-framework",
 					"\"UIKit\"",
+					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1441,7 +1467,6 @@
 					"-l\"MMDrawerController\"",
 					"-l\"Masonry\"",
 					"-l\"SDWebImage\"",
-					"-l\"SVProgressHUD\"",
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
@@ -1458,6 +1483,7 @@
 					"\"SystemConfiguration\"",
 					"-framework",
 					"\"UIKit\"",
+					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Lighting/Lighting/Images.xcassets/lineNew.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "lineNew.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "lineNew@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/StoryboardwithCYX.storyboard

@@ -734,7 +734,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="113.5" width="768" height="84"/>
+                                        <rect key="frame" x="0.0" y="49.5" width="768" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="83.5"/>
@@ -811,7 +811,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="160" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="197.5" width="768" height="160"/>
+                                        <rect key="frame" x="0.0" y="133.5" width="768" height="160"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="159.5"/>
@@ -940,7 +940,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="110" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="357.5" width="768" height="110"/>
+                                        <rect key="frame" x="0.0" y="293.5" width="768" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="109.5"/>
@@ -1032,7 +1032,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="467.5" width="768" height="80"/>
+                                        <rect key="frame" x="0.0" y="403.5" width="768" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
@@ -1093,7 +1093,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fifthcell" rowHeight="75" id="9Yp-o4-Cqr" customClass="AttachmentInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="547.5" width="768" height="75"/>
+                                        <rect key="frame" x="0.0" y="483.5" width="768" height="75"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9Yp-o4-Cqr" id="ySo-v9-ySh">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="74.5"/>
@@ -1153,7 +1153,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="622.5" width="768" height="50"/>
+                                        <rect key="frame" x="0.0" y="558.5" width="768" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
@@ -1313,7 +1313,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
-                                        <rect key="frame" x="0.0" y="64" width="300" height="300"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
@@ -1386,7 +1386,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
-                                        <rect key="frame" x="0.0" y="92" width="768" height="170"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" height="170"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
@@ -1784,7 +1784,7 @@
                                                     <rect key="frame" x="0.0" y="0.0" width="717" height="79.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
                                                             <rect key="frame" x="20" y="29" width="20" height="20"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <state key="normal" backgroundImage="box-副本"/>
@@ -1811,7 +1811,7 @@
                                                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="￥5500" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" id="Q7k-hi-4Ks">
+                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="￥5500" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" id="Q7k-hi-4Ks">
                                                             <rect key="frame" x="384" y="25" width="66" height="30"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1822,6 +1822,9 @@
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <color key="backgroundColor" red="0.97647058823529409" green="0.95686274509803915" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
                                                             <state key="normal" title="+"/>
+                                                            <connections>
+                                                                <action selector="reduceAndaddButtonClick:" destination="ZT1-XJ-ObI" eventType="touchUpInside" id="e4z-VP-QRY"/>
+                                                            </connections>
                                                         </button>
                                                         <button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="XcC-oP-Msd">
                                                             <rect key="frame" x="500" y="24" width="30" height="30"/>
@@ -1869,11 +1872,11 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="QOZ-rd-1Ea">
-                                        <rect key="frame" x="489" y="11" width="165" height="42"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
+                                        <rect key="frame" x="539" y="11" width="165" height="42"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <state key="normal" title="去结算">
+                                        <state key="normal" title="去结算(0)">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
@@ -1887,28 +1890,16 @@
                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="合计数量：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZMc-MD-SAt">
-                                        <rect key="frame" x="123" y="21" width="71" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BgH-qs-rZr">
-                                        <rect key="frame" x="202" y="21" width="45" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
                                     <label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥25600" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SzO-sh-Q17">
-                                        <rect key="frame" x="326" y="18" width="144" height="25"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <rect key="frame" x="387" y="18" width="144" height="25"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="24"/>
-                                        <color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="合计金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lfY-O6-zCQ">
-                                        <rect key="frame" x="262" y="21" width="85" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <rect key="frame" x="323" y="21" width="85" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <nil key="highlightedColor"/>
                                     </label>
@@ -1927,6 +1918,23 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                         <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.8666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                                     </view>
+                                    <label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="删除" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VF3-g8-ckJ">
+                                        <rect key="frame" x="142" y="21" width="32" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="451-RF-HOE">
+                                        <rect key="frame" x="113" y="22" width="20" height="20"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <state key="normal" backgroundImage="Trash"/>
+                                        <state key="selected" backgroundImage="bg"/>
+                                        <connections>
+                                            <action selector="allSelectedButtonClick:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="MEh-UA-hfY"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
@@ -1938,7 +1946,6 @@
                         <outlet property="allSelectedButton" destination="va8-YD-eVD" id="QFT-8I-gC3"/>
                         <outlet property="settlementButton" destination="QOZ-rd-1Ea" id="eFY-bt-n2S"/>
                         <outlet property="shoppingTableview" destination="RJW-eG-Q3P" id="M5W-yO-xaT"/>
-                        <outlet property="totalNumbersLabe" destination="BgH-qs-rZr" id="bP7-eQ-YNa"/>
                         <outlet property="totalpriceLabe" destination="SzO-sh-Q17" id="L5U-re-i18"/>
                     </connections>
                 </viewController>
@@ -1959,18 +1966,18 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="160" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="92" width="768" height="160"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="140" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="159.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="qWT-p0-Gta">
                                                     <rect key="frame" x="10" y="22" width="100" height="100"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客服姓名：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gwd-nt-UMm">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客服姓名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gwd-nt-UMm">
                                                     <rect key="frame" x="128" y="20" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1978,97 +1985,67 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0dQ-vr-ZbY">
-                                                    <rect key="frame" x="202" y="20" width="220" height="21"/>
+                                                    <rect key="frame" x="202" y="20" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司名称：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gBB-kM-n6B">
-                                                    <rect key="frame" x="128" y="54" width="72" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Wn-aO-BSh">
-                                                    <rect key="frame" x="202" y="54" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电子邮箱：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mGC-bK-UPx">
-                                                    <rect key="frame" x="128" y="87" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电子邮箱" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mGC-bK-UPx">
+                                                    <rect key="frame" x="128" y="57" width="72" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fTr-AQ-xb9">
-                                                    <rect key="frame" x="202" y="87" width="220" height="21"/>
+                                                    <rect key="frame" x="202" y="57" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司地址：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d8N-eA-bVZ">
-                                                    <rect key="frame" x="128" y="119" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司地址" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d8N-eA-bVZ">
+                                                    <rect key="frame" x="128" y="94" width="72" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SqM-0n-EYm">
-                                                    <rect key="frame" x="202" y="119" width="220" height="21"/>
+                                                    <rect key="frame" x="202" y="94" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Grb-MY-9Cg">
-                                                    <rect key="frame" x="458" y="20" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Grb-MY-9Cg">
+                                                    <rect key="frame" x="406" y="20" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hP2-rt-HWE">
-                                                    <rect key="frame" x="521" y="20" width="220" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电话号码：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HyM-nE-A5Y">
-                                                    <rect key="frame" x="458" y="54" width="72" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uaW-k6-3eI">
-                                                    <rect key="frame" x="521" y="54" width="220" height="21"/>
+                                                    <rect key="frame" x="474" y="20" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QQ：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v5U-1Z-OzX">
-                                                    <rect key="frame" x="458" y="87" width="72" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司名称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gBB-kM-n6B">
+                                                    <rect key="frame" x="406" y="57" width="72" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" 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="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="foq-Ac-Ojv">
-                                                    <rect key="frame" x="521" y="87" width="220" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Wn-aO-BSh">
+                                                    <rect key="frame" x="474" y="57" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2082,14 +2059,12 @@
                                             <outlet property="companyName" destination="9Wn-aO-BSh" id="W6O-qM-qzG"/>
                                             <outlet property="customerHeader" destination="qWT-p0-Gta" id="tPf-6w-iyr"/>
                                             <outlet property="customerName" destination="0dQ-vr-ZbY" id="LUo-Yl-61t"/>
-                                            <outlet property="customerNumbers" destination="uaW-k6-3eI" id="DwR-Cy-7F0"/>
                                             <outlet property="customerPhoneNumber" destination="hP2-rt-HWE" id="AjL-uh-E3H"/>
-                                            <outlet property="customerQQNumber" destination="foq-Ac-Ojv" id="IfH-KH-MXN"/>
                                             <outlet property="emailName" destination="fTr-AQ-xb9" id="1b2-Ya-L8M"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
-                                        <rect key="frame" x="0.0" y="252" width="768" height="56"/>
+                                        <rect key="frame" x="0.0" y="168" width="768" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
@@ -2132,10 +2107,14 @@
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="fs3-Vh-g5G">
-                                                    <rect key="frame" x="1" y="13" width="46" height="30"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="fs3-Vh-g5G">
+                                                    <rect key="frame" x="25" y="18" width="20" height="20"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" title="Button"/>
+                                                    <state key="normal" backgroundImage="box-副本"/>
+                                                    <state key="selected" backgroundImage="bg"/>
+                                                    <connections>
+                                                        <action selector="SelectedButtonClick:" destination="gfQ-UE-mXV" eventType="touchUpInside" id="V2o-kk-sMc"/>
+                                                    </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="15121161964" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1dD-es-x4K">
                                                     <rect key="frame" x="301" y="18" width="103" height="21"/>
@@ -2147,10 +2126,16 @@
                                                 </label>
                                             </subviews>
                                         </tableViewCellContentView>
-                                        <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+                                        <connections>
+                                            <outlet property="consigneeAddress" destination="XKV-b4-HNM" id="6G0-dD-PaV"/>
+                                            <outlet property="consigneeName" destination="uq3-fp-QuI" id="QAQ-Os-JTS"/>
+                                            <outlet property="consigneemobile" destination="1dD-es-x4K" id="qig-NB-Y06"/>
+                                            <outlet property="isSelectedButton" destination="fs3-Vh-g5G" id="avL-eW-lce"/>
+                                        </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
-                                        <rect key="frame" x="0.0" y="308" width="768" height="56"/>
+                                        <rect key="frame" x="0.0" y="224" width="768" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
@@ -2159,20 +2144,25 @@
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5">
                                                     <rect key="frame" x="77" y="11" width="100" height="35"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <state key="normal" title="修改"/>
+                                                    <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <state key="normal" title="修改">
+                                                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="QfL-M1-b48">
                                                     <rect key="frame" x="220" y="11" width="150" height="35"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <state key="normal" title="新增收货地址"/>
+                                                    <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <state key="normal" title="新增收货地址">
+                                                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
                                                 </button>
                                             </subviews>
                                         </tableViewCellContentView>
+                                        <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="364" width="768" height="80"/>
+                                        <rect key="frame" x="0.0" y="280" width="768" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
@@ -2233,7 +2223,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="444" width="768" height="50"/>
+                                        <rect key="frame" x="0.0" y="360" width="768" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
@@ -2299,7 +2289,7 @@
                                         </connections>
                                     </button>
                                 </subviews>
-                                <color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.95686274509803915" green="0.95686274509803915" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -3180,6 +3170,7 @@
     </scenes>
     <resources>
         <image name="05产品库-详情_03" width="500" height="375"/>
+        <image name="Trash" width="23" height="24"/>
         <image name="bg" width="27" height="26"/>
         <image name="box-副本" width="26" height="26"/>
         <image name="line" width="301" height="30"/>

Lighting/Tools/BaseViewController.h

@@ -58,8 +58,10 @@
 - (void)ErrorMBProgressView:(NSString *)errorString;
 
 
-
-
+/**
+ *  纯文本提示框
+ */
+- (void)SHOWPrompttext:(NSString *)Text;
 
 
 

Lighting/Tools/BaseViewController.m

@@ -113,6 +113,21 @@
 }
 
 
+
+#pragma mark -渐隐提示框
+- (void)SHOWPrompttext:(NSString *)Text
+{
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    hud.labelText = Text;
+    hud.margin = 10.f;
+    hud.animationType = MBProgressHUDAnimationZoom;
+    hud.mode = MBProgressHUDModeText;
+    hud.removeFromSuperViewOnHide = YES;
+    [hud hide:YES afterDelay:1.0f];
+    
+}
+
+
 #pragma mark -结束MJRfresh刷新
 - (void)endRefreshingForTableView:(UIScrollView *)TableView
 {

Lighting/Tools/Customermanager.h

@@ -24,6 +24,25 @@
  */
 @property (nonatomic,copy) NSString *customerID;
 
+/**
+ *  客户姓名
+ */
+@property (nonatomic,copy) NSString *customerName;
+
+/**
+ *  客户手机号码
+ */
+@property (nonatomic,copy) NSString *customerPhoneNumber;
+
+/**
+ *  客户公司地址
+ */
+@property (nonatomic,copy) NSString *companyAddress;
+
+/**
+ *  客户地址
+ */
+@property (nonatomic,copy) NSString *cutomerAddress;
 
 
 @end

Lighting/Tools/ZXPUnicode/NSArray+ ZXPUnicode.m

+//
+//  NSArray+ZXPUnicode.m
+//  House
+//
+//  Created by coffee on 15/9/28.
+//  Copyright © 2015年 cylkj. All rights reserved.
+//
+
+#import "NSArray+ZXPUnicode.h"
+#import "NSObject+ZXPUnicode.h"
+
+#import <objc/runtime.h>
+@implementation NSArray (ZXPUnicode)
+
++ (void)load {
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(description)), class_getInstanceMethod([self class], @selector(replaceDescription)));
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(descriptionWithLocale:)), class_getInstanceMethod([self class], @selector(replaceDescriptionWithLocale:)));
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(descriptionWithLocale:indent:)), class_getInstanceMethod([self class], @selector(replaceDescriptionWithLocale:indent:)));
+}
+
+- (NSString *)replaceDescription {
+    return [NSObject stringByReplaceUnicode:[self replaceDescription]];
+}
+
+- (NSString *)replaceDescriptionWithLocale:(nullable id)locale {
+    return [NSObject stringByReplaceUnicode:[self replaceDescriptionWithLocale:locale]];
+}
+
+- (NSString *)replaceDescriptionWithLocale:(nullable id)locale indent:(NSUInteger)level {
+    return [NSObject stringByReplaceUnicode:[self replaceDescriptionWithLocale:locale indent:level]];
+}
+
+
+
+@end

Lighting/Tools/ZXPUnicode/NSArray+ZXPUnicode.h

+//
+//  NSArray+ZXPUnicode.h
+//  House
+//
+//  Created by coffee on 15/9/28.
+//  Copyright © 2015年 cylkj. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSArray (ZXPUnicode)
+
+@end

Lighting/Tools/ZXPUnicode/NSDictionary+ZXPUnicode.h

+//
+//  NSDictionary+ZXPUnicode.h
+//  House
+//
+//  Created by coffee on 15/9/14.
+//  Copyright (c) 2015年 cylkj. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDictionary (ZXPUnicode)
+
+@end

Lighting/Tools/ZXPUnicode/NSDictionary+ZXPUnicode.m

+//
+//  NSDictionary+ZXPUnicode.m
+//  House
+//
+//  Created by coffee on 15/9/14.
+//  Copyright (c) 2015年 cylkj. All rights reserved.
+//
+
+#import "NSDictionary+ZXPUnicode.h"
+#import "NSObject+ZXPUnicode.h"
+#import <objc/runtime.h>
+
+@implementation NSDictionary (ZXPUnicode)
+
++ (void)load {
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(description)), class_getInstanceMethod([self class], @selector(replaceDescription)));
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(descriptionWithLocale:)), class_getInstanceMethod([self class], @selector(replaceDescriptionWithLocale:)));
+    method_exchangeImplementations(class_getInstanceMethod([self class], @selector(descriptionWithLocale:indent:)), class_getInstanceMethod([self class], @selector(replaceDescriptionWithLocale:indent:)));
+}
+
+- (NSString *)replaceDescription {
+    return [NSObject stringByReplaceUnicode:[self replaceDescription]];
+}
+
+- (NSString *)replaceDescriptionWithLocale:(nullable id)locale {
+    return [NSObject stringByReplaceUnicode:[self replaceDescriptionWithLocale:locale]];
+}
+
+- (NSString *)replaceDescriptionWithLocale:(nullable id)locale indent:(NSUInteger)level {
+    return [NSObject stringByReplaceUnicode:[self replaceDescriptionWithLocale:locale indent:level]];
+}
+
+@end

Lighting/Tools/ZXPUnicode/NSObject+ZXPUnicode.h

+//
+//  NSObject+ZXPUnicode.h
+//  House
+//  blog : http://blog.csdn.net/biggercoffee
+//  github : https://github.com/biggercoffee/ZXPUnicode
+//  Created by coffee on 15/9/28.
+//  Copyright © 2015年 cylkj. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSObject (ZXPUnicode)
+
++ (NSString *)stringByReplaceUnicode:(NSString *)string;
+
+@end

Lighting/Tools/ZXPUnicode/NSObject+ZXPUnicode.m

+//
+//  NSObject+ZXPUnicode.m
+//  House
+//
+//  blog : http://blog.csdn.net/biggercoffee
+//  github : https://github.com/biggercoffee/ZXPUnicode
+
+//  Created by coffee on 15/9/28.
+//  Copyright © 2015年 cylkj. All rights reserved.
+//
+
+#import "NSObject+ZXPUnicode.h"
+
+@implementation NSObject (ZXPUnicode)
+
++ (NSString *)stringByReplaceUnicode:(NSString *)string
+{
+    NSMutableString *convertedString = [string mutableCopy];
+    [convertedString replaceOccurrencesOfString:@"\\U" withString:@"\\u" options:0 range:NSMakeRange(0, convertedString.length)];
+    CFStringRef transform = CFSTR("Any-Hex/Java");
+    CFStringTransform((__bridge CFMutableStringRef)convertedString, NULL, transform, YES);
+    return convertedString;
+}
+
+@end

Lighting/Tools/opple_objc_json_client.h

@@ -33,23 +33,24 @@ extern NSString * const SORTDIRECTION_DESC;
 @class OrderBill;
 @class SceneCondition;
 @class SceneFilter;
-@class SaveShoppingCartRequest;
+@class DeleteCartRequest;
 @class ShopCartFilter;
-@class TOGoodsEntity;
-@class TOGoodsCategoryEntity;
-@class TOGoodsLabelCategoryEntity;
-@class TOOrderEntity;
-@class TOPositionEntity;
-@class TOShippingAddrEntity;
+@class TOConsumerEntity;
+@class TOGoodsBrandEntity;
+@class TOGoodsLabelEntity;
+@class TOHottagEntity;
+@class TOOrderdetailEntity;
+@class TOSceneEntity;
 @class TOShopcartEntity;
 @class IdEntity;
-@class TOSceneEntity;
-@class TOOrderdetailEntity;
-@class TOHottagEntity;
-@class TOGoodsLabelEntity;
-@class TOGoodsBrandEntity;
-@class TOConsumerEntity;
-@class DeleteCartRequest;
+@class TOShippingAddrEntity;
+@class TOPositionEntity;
+@class TOOrderEntity;
+@class TOGoodsLabelCategoryEntity;
+@class TOGoodsCategoryEntity;
+@class TOGoodsEntity;
+@class SaveShoppingCartRequest;
+@class RsShippingAddrEntity;
 @class HotTagResponse;
 @class GoodsCategory;
 @class ResetPasswordRequest;
@@ -78,23 +79,24 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol OrderBill @end
 @protocol SceneCondition @end
 @protocol SceneFilter @end
-@protocol SaveShoppingCartRequest @end
+@protocol DeleteCartRequest @end
 @protocol ShopCartFilter @end
-@protocol TOGoodsEntity @end
-@protocol TOGoodsCategoryEntity @end
-@protocol TOGoodsLabelCategoryEntity @end
-@protocol TOOrderEntity @end
-@protocol TOPositionEntity @end
-@protocol TOShippingAddrEntity @end
+@protocol TOConsumerEntity @end
+@protocol TOGoodsBrandEntity @end
+@protocol TOGoodsLabelEntity @end
+@protocol TOHottagEntity @end
+@protocol TOOrderdetailEntity @end
+@protocol TOSceneEntity @end
 @protocol TOShopcartEntity @end
 @protocol IdEntity @end
-@protocol TOSceneEntity @end
-@protocol TOOrderdetailEntity @end
-@protocol TOHottagEntity @end
-@protocol TOGoodsLabelEntity @end
-@protocol TOGoodsBrandEntity @end
-@protocol TOConsumerEntity @end
-@protocol DeleteCartRequest @end
+@protocol TOShippingAddrEntity @end
+@protocol TOPositionEntity @end
+@protocol TOOrderEntity @end
+@protocol TOGoodsLabelCategoryEntity @end
+@protocol TOGoodsCategoryEntity @end
+@protocol TOGoodsEntity @end
+@protocol SaveShoppingCartRequest @end
+@protocol RsShippingAddrEntity @end
 @protocol HotTagResponse @end
 @protocol GoodsCategory @end
 @protocol ResetPasswordRequest @end
@@ -280,12 +282,6 @@ extern NSString * const SORTDIRECTION_DESC;
  
  */
 @interface GoodsCondition : JSONModel
-/**
- * 经销者标识
- *
- *
- */
-@property (nonatomic, copy) NSString *reseller_id;
 /**
  * 查询条件是 商品名称
  *
@@ -329,7 +325,7 @@ extern NSString * const SORTDIRECTION_DESC;
  */
 @property (nonatomic, strong) NSNumber *endprice;
 /**
- * 分页
+ * (no documentation provided)
  *
  *
  */
@@ -485,34 +481,22 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_SaveShoppingCartRequest_H
-#define DEF_SaveShoppingCartRequest_H
+#ifndef DEF_DeleteCartRequest_H
+#define DEF_DeleteCartRequest_H
 
 /**
  *  @author Debenson
  @since 0.1
  
  */
-@interface SaveShoppingCartRequest : JSONModel
-/**
- * 消费者标识
- *
- *
- */
-@property (nonatomic, copy) NSString *consumerId;
-/**
- * 商品标识
- *
- *
- */
-@property (nonatomic, copy) NSString *goodsId;
+@interface DeleteCartRequest : JSONModel
 /**
- * 商品数量，>0表示添加, <0表示减少
- *
+ * 购物车标识列表
+ * @see NSString
  *
  */
-@property (nonatomic, assign) int count;
-@end /* interface SaveShoppingCartRequest */
+@property (nonatomic, strong) NSArray *cartIds;
+@end /* interface DeleteCartRequest */
 
 #endif
 
@@ -545,20 +529,19 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_TOGoodsEntity_H
-#define DEF_TOGoodsEntity_H
+#ifndef DEF_TOConsumerEntity_H
+#define DEF_TOConsumerEntity_H
 
 /**
- *
- @Title: Entity
- @Description: t_o_goods
+ *  @Title: Entity
+ @Description: 客户
  @author onlineGenerator
- @date 2016-05-12 15:44:01
+ @date 2016-05-08 18:08:58
  @version V1.0
  
  
  */
-@interface TOGoodsEntity : JSONModel
+@interface TOConsumerEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -566,29 +549,29 @@ extern NSString * const SORTDIRECTION_DESC;
  */
 @property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createName;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *onlineTime;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *company;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
@@ -600,187 +583,223 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *number;
+@property (nonatomic, copy) NSString *mobile;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *categoryId;
+@property (nonatomic, copy) NSString *province;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *brandId;
+@property (nonatomic, copy) NSString *city;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *keyword;
+@property (nonatomic, copy) NSString *country;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *guidePrice;
+@property (nonatomic, copy) NSString *address;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *tagPrice;
+@property (nonatomic, copy) NSString *picture;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, strong) NSNumber *costPrice;
+@property (nonatomic, strong) NSDate *lastVisitedTime;
+@end /* interface TOConsumerEntity */
+
+#endif
+
+
+#ifndef DEF_TOGoodsBrandEntity_H
+#define DEF_TOGoodsBrandEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 商品品牌
+ @author onlineGenerator
+ @date 2016-05-05 16:14:51
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *state;
+@interface TOGoodsBrandEntity : JSONModel
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) int inv;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *detailedIntro;
+@property (nonatomic, copy) NSString *createName;
 /**
- * 方法: 取得java.lang.Double
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) double weight;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *unit;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *productProfile;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *power;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *colorTemperature;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *spec;
+@property (nonatomic, copy) NSString *name;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, copy) NSString *function;
+@property (nonatomic, assign) int state;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *material;
+@property (nonatomic, copy) NSString *logo;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *lightSource;
+@property (nonatomic, copy) NSString *fdescription;
+@end /* interface TOGoodsBrandEntity */
+
+#endif
+
+
+#ifndef DEF_TOGoodsLabelEntity_H
+#define DEF_TOGoodsLabelEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 商品标签
+ @author onlineGenerator
+ @date 2016-05-05 17:18:15
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *goodsStyle;
+@interface TOGoodsLabelEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *series;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *area;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *size;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *space;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *installMethod;
+@property (nonatomic, copy) NSString *categoryId;
+@end /* interface TOGoodsLabelEntity */
+
+#endif
+
+
+#ifndef DEF_TOHottagEntity_H
+#define DEF_TOHottagEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: 热门推荐
+ @author onlineGenerator
+ @date 2016-05-06 16:36:36
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *lightNumber;
+@interface TOHottagEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *pictures;
+@property (nonatomic, copy) NSString *fid;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *barcode;
-@end /* interface TOGoodsEntity */
+@property (nonatomic, copy) NSString *name;
+@end /* interface TOHottagEntity */
 
 #endif
 
 
-#ifndef DEF_TOGoodsCategoryEntity_H
-#define DEF_TOGoodsCategoryEntity_H
+#ifndef DEF_TOOrderdetailEntity_H
+#define DEF_TOOrderdetailEntity_H
 
 /**
  *  @Title: Entity
- @Description: 商品分类
+ @Description: 订单详情
  @author onlineGenerator
- @date 2016-05-10 10:17:53
+ @date 2016-05-06 12:53:09
  @version V1.0
  
  
  */
-@interface TOGoodsCategoryEntity : JSONModel
+@interface TOOrderdetailEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -792,43 +811,85 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *goodsId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *goodsCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *upperId;
+@property (nonatomic, copy) NSString *goodsName;
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) int level;
-@end /* interface TOGoodsCategoryEntity */
+@property (nonatomic, copy) NSString *goodsCover;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *goodsSpec;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *goodsBrand;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *goodsNum;
+/**
+ * 方法: 取得java.math.BigDecimal
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *goodsPrice;
+/**
+ * 方法: 取得java.math.BigDecimal
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *goodsTotalPrice;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *orderId;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *remark;
+@end /* interface TOOrderdetailEntity */
 
 #endif
 
 
-#ifndef DEF_TOGoodsLabelCategoryEntity_H
-#define DEF_TOGoodsLabelCategoryEntity_H
+#ifndef DEF_TOSceneEntity_H
+#define DEF_TOSceneEntity_H
 
 /**
  *  @Title: Entity
- @Description: 商品标签分类
+ @Description: 场景
  @author onlineGenerator
- @date 2016-05-05 16:57:27
+ @date 2016-05-05 18:39:39
  @version V1.0
  
  
  */
-@interface TOGoodsLabelCategoryEntity : JSONModel
+@interface TOSceneEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -840,45 +901,63 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *sceneCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *pricure;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
-@end /* interface TOGoodsLabelCategoryEntity */
+@property (nonatomic, copy) NSString *category;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *style;
+/**
+ * 方法: 取得java.lang.String
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *space;
+@end /* interface TOSceneEntity */
 
 #endif
 
 
-#ifndef DEF_TOOrderEntity_H
-#define DEF_TOOrderEntity_H
+#ifndef DEF_TOShopcartEntity_H
+#define DEF_TOShopcartEntity_H
 
 /**
  *  @Title: Entity
- @Description: 订单
+ @Description: t_o_shopcart
  @author onlineGenerator
- @date 2016-05-06 12:53:09
+ @date 2016-05-13 14:26:57
  @version V1.0
  
  
  */
-@interface TOOrderEntity : JSONModel
+@interface TOShopcartEntity : JSONModel
 /**
- * 方法: 取得java.lang.String
+ * 商品详情
+ *
+ *
+ */
+@property (nonatomic, strong) TOGoodsEntity *goods;
+/**
+ * ��法: 取得java.lang.String
  *
  *
  */
@@ -924,92 +1003,122 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *goodsId;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, copy) NSString *orderNumber;
+@property (nonatomic, assign) int goodsNum;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *orderTime;
+@property (nonatomic, copy) NSString *consumerId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *guideId;
+@property (nonatomic, copy) NSString *resellerId;
+@end /* interface TOShopcartEntity */
+
+#endif
+
+
+#ifndef DEF_IdEntity_H
+#define DEF_IdEntity_H
+
 /**
- * 方法: 取得java.lang.String
+ * (no documentation provided)
+ */
+@interface IdEntity : JSONModel
+/**
+ * (no documentation provided)
  *
  *
  */
-@property (nonatomic, copy) NSString *orderState;
+@property (nonatomic, copy) NSString *fid;
+@end /* interface IdEntity */
+
+#endif
+
+
+#ifndef DEF_TOShippingAddrEntity_H
+#define DEF_TOShippingAddrEntity_H
+
+/**
+ *  @Title: Entity
+ @Description: t_o_shipping_addr
+ @author onlineGenerator
+ @date 2016-05-14 16:14:15
+ @version V1.0
+ 
+ 
+ */
+@interface TOShippingAddrEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *consumerId;
+@property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsNum;
+@property (nonatomic, strong) NSDate *createDate;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *orderPrice;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverName;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverMobile;
+@property (nonatomic, copy) NSString *miblephone;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *receiverAddress;
+@property (nonatomic, copy) NSString *province;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *isBill;
+@property (nonatomic, copy) NSString *city;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *billType;
+@property (nonatomic, copy) NSString *country;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *billTitle;
+@property (nonatomic, copy) NSString *address;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *payType;
-@end /* interface TOOrderEntity */
+@property (nonatomic, copy) NSString *consumerId;
+@end /* interface TOShippingAddrEntity */
 
 #endif
 
@@ -1062,20 +1171,19 @@ extern NSString * const SORTDIRECTION_DESC;
 #endif
 
 
-#ifndef DEF_TOShippingAddrEntity_H
-#define DEF_TOShippingAddrEntity_H
+#ifndef DEF_TOOrderEntity_H
+#define DEF_TOOrderEntity_H
 
 /**
- *
- @Title: Entity
- @Description: 收货地址
+ *  @Title: Entity
+ @Description: 订单
  @author onlineGenerator
- @date 2016-05-05 14:42:23
+ @date 2016-05-06 12:53:09
  @version V1.0
  
  
  */
-@interface TOShippingAddrEntity : JSONModel
+@interface TOOrderEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -1083,191 +1191,149 @@ extern NSString * const SORTDIRECTION_DESC;
  */
 @property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *createName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *createBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, strong) NSDate *createDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *miblephone;
+@property (nonatomic, copy) NSString *updateName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *province;
+@property (nonatomic, copy) NSString *updateBy;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *city;
+@property (nonatomic, strong) NSDate *updateDate;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *country;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *address;
+@property (nonatomic, copy) NSString *orderNumber;
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, assign) int state;
+@property (nonatomic, strong) NSDate *orderTime;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *consumerId;
-@end /* interface TOShippingAddrEntity */
-
-#endif
-
-
-#ifndef DEF_TOShopcartEntity_H
-#define DEF_TOShopcartEntity_H
-
-/**
- *  @Title: Entity
- @Description: t_o_shopcart
- @author onlineGenerator
- @date 2016-05-12 23:44:55
- @version V1.0
- 
- 
- */
-@interface TOShopcartEntity : JSONModel
-/**
- * 商品详情。
- *
- *
- */
-@property (nonatomic, strong) TOGoodsEntity *goods;
+@property (nonatomic, copy) NSString *guideId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *orderState;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, copy) NSString *consumerId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *goodsNum;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, strong) NSNumber *orderPrice;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateName;
+@property (nonatomic, copy) NSString *receiverName;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *updateBy;
+@property (nonatomic, copy) NSString *receiverMobile;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *updateDate;
+@property (nonatomic, copy) NSString *receiverAddress;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsId;
+@property (nonatomic, copy) NSString *isBill;
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) int goodsNum;
+@property (nonatomic, copy) NSString *billType;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *consumerId;
+@property (nonatomic, copy) NSString *billTitle;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
-@end /* interface TOShopcartEntity */
+@property (nonatomic, copy) NSString *payType;
+@end /* interface TOOrderEntity */
 
 #endif
 
 
-#ifndef DEF_IdEntity_H
-#define DEF_IdEntity_H
-
-/**
- * (no documentation provided)
- */
-@interface IdEntity : JSONModel
-/**
- * (no documentation provided)
- *
- *
- */
-@property (nonatomic, copy) NSString *fid;
-@end /* interface IdEntity */
-
-#endif
-
-
-#ifndef DEF_TOSceneEntity_H
-#define DEF_TOSceneEntity_H
+#ifndef DEF_TOGoodsLabelCategoryEntity_H
+#define DEF_TOGoodsLabelCategoryEntity_H
 
 /**
  *  @Title: Entity
- @Description: 场景
+ @Description: 商品标签分类
  @author onlineGenerator
- @date 2016-05-05 18:39:39
+ @date 2016-05-05 16:57:27
  @version V1.0
  
  
  */
-@interface TOSceneEntity : JSONModel
+@interface TOGoodsLabelCategoryEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -1279,55 +1345,43 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *sceneCode;
-/**
- * 方法: 取得java.lang.String
- *
- *
- */
-@property (nonatomic, copy) NSString *name;
-/**
- * 方法: 取得java.lang.String
- *
- *
- */
-@property (nonatomic, copy) NSString *pricure;
+@property (nonatomic, copy) NSString *sysOrgCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *category;
+@property (nonatomic, copy) NSString *sysCompanyCode;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *space;
-@end /* interface TOSceneEntity */
+@property (nonatomic, copy) NSString *name;
+@end /* interface TOGoodsLabelCategoryEntity */
 
 #endif
 
 
-#ifndef DEF_TOOrderdetailEntity_H
-#define DEF_TOOrderdetailEntity_H
+#ifndef DEF_TOGoodsCategoryEntity_H
+#define DEF_TOGoodsCategoryEntity_H
 
 /**
  *  @Title: Entity
- @Description: 订单详情
+ @Description: 商品分类
  @author onlineGenerator
- @date 2016-05-06 12:53:09
+ @date 2016-05-10 10:17:53
  @version V1.0
  
  
  */
-@interface TOOrderdetailEntity : JSONModel
+@interface TOGoodsCategoryEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
@@ -1339,346 +1393,300 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsId;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsCode;
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsName;
+@property (nonatomic, copy) NSString *upperId;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsCover;
+@property (nonatomic, assign) int level;
+@end /* interface TOGoodsCategoryEntity */
+
+#endif
+
+
+#ifndef DEF_TOGoodsEntity_H
+#define DEF_TOGoodsEntity_H
+
 /**
- * 方法: 取得java.lang.String
- *
- *
+ *  @Title: Entity
+ @Description: t_o_goods
+ @author onlineGenerator
+ @date 2016-05-12 15:44:01
+ @version V1.0
+ 
+ 
  */
-@property (nonatomic, copy) NSString *goodsSpec;
+@interface TOGoodsEntity : JSONModel
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsBrand;
+@property (nonatomic, copy) NSString *fid;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, copy) NSString *goodsNum;
+@property (nonatomic, strong) NSDate *createDate;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.util.Date
  *
  *
  */
-@property (nonatomic, strong) NSNumber *goodsPrice;
+@property (nonatomic, strong) NSDate *onlineTime;
 /**
- * 方法: 取得java.math.BigDecimal
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSNumber *goodsTotalPrice;
+@property (nonatomic, copy) NSString *company;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *orderId;
+@property (nonatomic, copy) NSString *code;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *remark;
-@end /* interface TOOrderdetailEntity */
-
-#endif
-
-
-#ifndef DEF_TOHottagEntity_H
-#define DEF_TOHottagEntity_H
-
-/**
- *  @Title: Entity
- @Description: 热门推荐
- @author onlineGenerator
- @date 2016-05-06 16:36:36
- @version V1.0
- 
- 
- */
-@interface TOHottagEntity : JSONModel
+@property (nonatomic, copy) NSString *name;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *number;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
-@end /* interface TOHottagEntity */
-
-#endif
-
-
-#ifndef DEF_TOGoodsLabelEntity_H
-#define DEF_TOGoodsLabelEntity_H
-
-/**
- *  @Title: Entity
- @Description: 商品标签
- @author onlineGenerator
- @date 2016-05-05 17:18:15
- @version V1.0
- 
- 
- */
-@interface TOGoodsLabelEntity : JSONModel
+@property (nonatomic, copy) NSString *categoryId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *brandId;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *keyword;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, strong) NSNumber *guidePrice;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, strong) NSNumber *tagPrice;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.math.BigDecimal
  *
  *
  */
-@property (nonatomic, copy) NSString *categoryId;
-@end /* interface TOGoodsLabelEntity */
-
-#endif
-
-
-#ifndef DEF_TOGoodsBrandEntity_H
-#define DEF_TOGoodsBrandEntity_H
-
-/**
- *  @Title: Entity
- @Description: 商品品牌
- @author onlineGenerator
- @date 2016-05-05 16:14:51
- @version V1.0
- 
- 
- */
-@interface TOGoodsBrandEntity : JSONModel
+@property (nonatomic, strong) NSNumber *costPrice;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *state;
 /**
- * 方法: 取得java.lang.String
+ * 方法: 取得java.lang.Integer
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, assign) int inv;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *detailedIntro;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.Double
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, assign) double weight;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *unit;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysCompanyCode;
+@property (nonatomic, copy) NSString *productProfile;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *power;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *colorTemperature;
 /**
- * 方法: 取得java.lang.Integer
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, assign) int state;
+@property (nonatomic, copy) NSString *spec;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *logo;
+@property (nonatomic, copy) NSString *function;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fdescription;
-@end /* interface TOGoodsBrandEntity */
-
-#endif
-
-
-#ifndef DEF_TOConsumerEntity_H
-#define DEF_TOConsumerEntity_H
-
-/**
- *  @Title: Entity
- @Description: 客户
- @author onlineGenerator
- @date 2016-05-08 18:08:58
- @version V1.0
- 
- 
- */
-@interface TOConsumerEntity : JSONModel
+@property (nonatomic, copy) NSString *material;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *fid;
+@property (nonatomic, copy) NSString *lightSource;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createName;
+@property (nonatomic, copy) NSString *goodsStyle;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *createBy;
+@property (nonatomic, copy) NSString *series;
 /**
- * 方法: 取得java.util.Date
+ * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, strong) NSDate *createDate;
+@property (nonatomic, copy) NSString *area;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *sysOrgCode;
+@property (nonatomic, copy) NSString *size;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *space;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, copy) NSString *installMethod;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *province;
+@property (nonatomic, copy) NSString *lightNumber;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *city;
+@property (nonatomic, copy) NSString *pictures;
 /**
  * 方法: 取得java.lang.String
  *
  *
  */
-@property (nonatomic, copy) NSString *country;
+@property (nonatomic, copy) NSString *barcode;
+@end /* interface TOGoodsEntity */
+
+#endif
+
+
+#ifndef DEF_SaveShoppingCartRequest_H
+#define DEF_SaveShoppingCartRequest_H
+
 /**
- * 方法: 取得java.lang.String
+ *  @author Debenson
+ @since 0.1
+ 
+ */
+@interface SaveShoppingCartRequest : JSONModel
+/**
+ * 消费者标识
  *
  *
  */
-@property (nonatomic, copy) NSString *address;
+@property (nonatomic, copy) NSString *consumerId;
 /**
- * 方法: 取得java.lang.String
+ * 商品标识
  *
  *
  */
-@property (nonatomic, copy) NSString *picture;
+@property (nonatomic, copy) NSString *goodsId;
 /**
- * 方法: 取得java.util.Date
+ * 商品数量，>0表示添加, <0表示减少
  *
  *
  */
-@property (nonatomic, strong) NSDate *lastVisitedTime;
-@end /* interface TOConsumerEntity */
+@property (nonatomic, assign) int count;
+@end /* interface SaveShoppingCartRequest */
 
 #endif
 
 
-#ifndef DEF_DeleteCartRequest_H
-#define DEF_DeleteCartRequest_H
+#ifndef DEF_RsShippingAddrEntity_H
+#define DEF_RsShippingAddrEntity_H
 
 /**
- *  @author Debenson
+ *  @author Administrator
  @since 0.1
  
  */
-@interface DeleteCartRequest : JSONModel
+@interface RsShippingAddrEntity : JSONModel
 /**
- * 购物车标识列表
- * @see NSString
+ * (no documentation provided)
+ * @see TOShippingAddrEntity
  *
  */
-@property (nonatomic, strong) NSArray *cartIds;
-@end /* interface DeleteCartRequest */
+@property (nonatomic, strong) NSArray<TOShippingAddrEntity> *list;
+@end /* interface RsShippingAddrEntity */
 
 #endif
 

Lighting/Tools/opple_objc_json_client.m

@@ -73,7 +73,6 @@
 @end
 
 @implementation GoodsCondition
-@synthesize reseller_id;
 @synthesize nameLike;
 @synthesize categoryEquals;
 @synthesize styleEquals;
@@ -146,10 +145,8 @@
 
 @end
 
-@implementation SaveShoppingCartRequest
-@synthesize consumerId;
-@synthesize goodsId;
-@synthesize count;
+@implementation DeleteCartRequest
+@synthesize cartIds;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -171,41 +168,20 @@
 
 @end
 
-@implementation TOGoodsEntity
+@implementation TOConsumerEntity
 @synthesize fid;
+@synthesize createName;
+@synthesize createBy;
 @synthesize createDate;
-@synthesize onlineTime;
-@synthesize company;
-@synthesize code;
+@synthesize sysOrgCode;
 @synthesize name;
-@synthesize number;
-@synthesize categoryId;
-@synthesize brandId;
-@synthesize keyword;
-@synthesize guidePrice;
-@synthesize tagPrice;
-@synthesize costPrice;
-@synthesize state;
-@synthesize inv;
-@synthesize detailedIntro;
-@synthesize weight;
-@synthesize unit;
-@synthesize productProfile;
-@synthesize power;
-@synthesize colorTemperature;
-@synthesize spec;
-@synthesize function;
-@synthesize material;
-@synthesize lightSource;
-@synthesize goodsStyle;
-@synthesize series;
-@synthesize area;
-@synthesize size;
-@synthesize space;
-@synthesize installMethod;
-@synthesize lightNumber;
-@synthesize pictures;
-@synthesize barcode;
+@synthesize mobile;
+@synthesize province;
+@synthesize city;
+@synthesize country;
+@synthesize address;
+@synthesize picture;
+@synthesize lastVisitedTime;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -223,12 +199,18 @@
 
 @end
 
-@implementation TOGoodsCategoryEntity
+@implementation TOGoodsBrandEntity
 @synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
 @synthesize code;
 @synthesize name;
-@synthesize upperId;
-@synthesize level;
+@synthesize state;
+@synthesize logo;
+@synthesize fdescription;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -239,6 +221,7 @@
 +(JSONKeyMapper*)keyMapper
 {
     return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"description": @"fdescription",
                                                        @"id": @"fid",
                                                        }];
 }
@@ -246,12 +229,12 @@
 
 @end
 
-@implementation TOGoodsLabelCategoryEntity
+@implementation TOGoodsLabelEntity
 @synthesize fid;
 @synthesize sysOrgCode;
 @synthesize sysCompanyCode;
-@synthesize code;
 @synthesize name;
+@synthesize categoryId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -269,29 +252,9 @@
 
 @end
 
-@implementation TOOrderEntity
+@implementation TOHottagEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
-@synthesize createDate;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize updateDate;
-@synthesize sysOrgCode;
-@synthesize orderNumber;
-@synthesize orderTime;
-@synthesize guideId;
-@synthesize orderState;
-@synthesize consumerId;
-@synthesize goodsNum;
-@synthesize orderPrice;
-@synthesize receiverName;
-@synthesize receiverMobile;
-@synthesize receiverAddress;
-@synthesize isBill;
-@synthesize billType;
-@synthesize billTitle;
-@synthesize payType;
+@synthesize name;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -309,12 +272,19 @@
 
 @end
 
-@implementation TOPositionEntity
+@implementation TOOrderdetailEntity
 @synthesize fid;
-@synthesize code;
-@synthesize name;
-@synthesize commission;
-@synthesize resellerCode;
+@synthesize goodsId;
+@synthesize goodsCode;
+@synthesize goodsName;
+@synthesize goodsCover;
+@synthesize goodsSpec;
+@synthesize goodsBrand;
+@synthesize goodsNum;
+@synthesize goodsPrice;
+@synthesize goodsTotalPrice;
+@synthesize orderId;
+@synthesize remark;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -332,18 +302,14 @@
 
 @end
 
-@implementation TOShippingAddrEntity
+@implementation TOSceneEntity
 @synthesize fid;
-@synthesize createDate;
-@synthesize sysOrgCode;
+@synthesize sceneCode;
 @synthesize name;
-@synthesize miblephone;
-@synthesize province;
-@synthesize city;
-@synthesize country;
-@synthesize address;
-@synthesize state;
-@synthesize consumerId;
+@synthesize pricure;
+@synthesize category;
+@synthesize style;
+@synthesize space;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -373,7 +339,7 @@
 @synthesize goodsId;
 @synthesize goodsNum;
 @synthesize consumerId;
-@synthesize sysOrgCode;
+@synthesize resellerId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -391,12 +357,6 @@
 
 @end
 
-#ifndef DEF_SortDirection_M
-#define DEF_SortDirection_M
-NSString * const SORTDIRECTION_ASC = @"asc";
-NSString * const SORTDIRECTION_DESC = @"desc";
-#endif /* DEF_SortDirection_M */
-
 @implementation IdEntity
 @synthesize fid;
 
@@ -416,14 +376,23 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOSceneEntity
+#ifndef DEF_SortDirection_M
+#define DEF_SortDirection_M
+NSString * const SORTDIRECTION_ASC = @"asc";
+NSString * const SORTDIRECTION_DESC = @"desc";
+#endif /* DEF_SortDirection_M */
+
+@implementation TOShippingAddrEntity
 @synthesize fid;
-@synthesize sceneCode;
+@synthesize createDate;
+@synthesize sysOrgCode;
 @synthesize name;
-@synthesize pricure;
-@synthesize category;
-@synthesize style;
-@synthesize space;
+@synthesize miblephone;
+@synthesize province;
+@synthesize city;
+@synthesize country;
+@synthesize address;
+@synthesize consumerId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -441,19 +410,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOOrderdetailEntity
+@implementation TOPositionEntity
 @synthesize fid;
-@synthesize goodsId;
-@synthesize goodsCode;
-@synthesize goodsName;
-@synthesize goodsCover;
-@synthesize goodsSpec;
-@synthesize goodsBrand;
-@synthesize goodsNum;
-@synthesize goodsPrice;
-@synthesize goodsTotalPrice;
-@synthesize orderId;
-@synthesize remark;
+@synthesize code;
+@synthesize name;
+@synthesize commission;
+@synthesize resellerCode;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -471,9 +433,29 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOHottagEntity
+@implementation TOOrderEntity
 @synthesize fid;
-@synthesize name;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize orderNumber;
+@synthesize orderTime;
+@synthesize guideId;
+@synthesize orderState;
+@synthesize consumerId;
+@synthesize goodsNum;
+@synthesize orderPrice;
+@synthesize receiverName;
+@synthesize receiverMobile;
+@synthesize receiverAddress;
+@synthesize isBill;
+@synthesize billType;
+@synthesize billTitle;
+@synthesize payType;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -491,12 +473,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOGoodsLabelEntity
+@implementation TOGoodsLabelCategoryEntity
 @synthesize fid;
 @synthesize sysOrgCode;
 @synthesize sysCompanyCode;
+@synthesize code;
 @synthesize name;
-@synthesize categoryId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -514,18 +496,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOGoodsBrandEntity
+@implementation TOGoodsCategoryEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
-@synthesize createDate;
-@synthesize sysOrgCode;
-@synthesize sysCompanyCode;
 @synthesize code;
 @synthesize name;
-@synthesize state;
-@synthesize logo;
-@synthesize fdescription;
+@synthesize upperId;
+@synthesize level;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -536,7 +512,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 +(JSONKeyMapper*)keyMapper
 {
     return [[JSONKeyMapper alloc] initWithDictionary:@{
-                                                       @"description": @"fdescription",
                                                        @"id": @"fid",
                                                        }];
 }
@@ -544,20 +519,41 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOConsumerEntity
+@implementation TOGoodsEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
 @synthesize createDate;
-@synthesize sysOrgCode;
+@synthesize onlineTime;
+@synthesize company;
+@synthesize code;
 @synthesize name;
-@synthesize mobile;
-@synthesize province;
-@synthesize city;
-@synthesize country;
-@synthesize address;
-@synthesize picture;
-@synthesize lastVisitedTime;
+@synthesize number;
+@synthesize categoryId;
+@synthesize brandId;
+@synthesize keyword;
+@synthesize guidePrice;
+@synthesize tagPrice;
+@synthesize costPrice;
+@synthesize state;
+@synthesize inv;
+@synthesize detailedIntro;
+@synthesize weight;
+@synthesize unit;
+@synthesize productProfile;
+@synthesize power;
+@synthesize colorTemperature;
+@synthesize spec;
+@synthesize function;
+@synthesize material;
+@synthesize lightSource;
+@synthesize goodsStyle;
+@synthesize series;
+@synthesize area;
+@synthesize size;
+@synthesize space;
+@synthesize installMethod;
+@synthesize lightNumber;
+@synthesize pictures;
+@synthesize barcode;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -575,8 +571,21 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation DeleteCartRequest
-@synthesize cartIds;
+@implementation SaveShoppingCartRequest
+@synthesize consumerId;
+@synthesize goodsId;
+@synthesize count;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
+@end
+
+@implementation RsShippingAddrEntity
+@synthesize list;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {