修改部分bug

Lighting/Class/PaymentsDetailsTableViewController.m

@@ -59,6 +59,21 @@
     self.amountLabel.text = string;
     self.createTimeLabel.text = self.model.createDate;
     self.serialNumberLabel.text = self.model.orderNumber;
+    self.amountTypeLabel.text = [self separatePaymentsAndWithfrawal:self.model.state];
+    self.currentAmountLabel.text = [self.model.afteramount stringValue];
+}
+
+
+#pragma mark - 区分提现还是返佣
+- (NSString *)separatePaymentsAndWithfrawal:(NSString *)state
+{
+    if ([state isEqualToString:@"0"]) {
+        return @"返佣";
+    }
+    if ([state isEqualToString:@"1"]) {
+        return @"提现";
+    }
+    return nil;
 }
 
 

Lighting/Class/RebateDetailsViewController.m

@@ -93,7 +93,7 @@
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
     NSString *urlString = [NSString stringWithFormat:@"%@/%@",WITHDRAWALPROGRESSDETAILS,self.applyUUID];
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(urlString) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             TOApplyBillEntity *result = [[TOApplyBillEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];

Lighting/Class/RebateViewController.m

@@ -68,7 +68,7 @@
 /**
  *  账户数据
  */
-@property (nonatomic,strong) EarningsRequest *model;
+@property (nonatomic,strong) EarningsResponse *model;
 
 
 @end
@@ -145,13 +145,13 @@
     WS(weakSelf);
     [self CreateMBProgressHUDLoding];
     NSString *URL = [NSString stringWithFormat:@"%@/%@",REBATE,[Shoppersmanager manager].Shoppers.employee.fid];
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(URL) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            weakSelf.model = [[EarningsRequest alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            weakSelf.model = [[EarningsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
              weakSelf.currentAmountLabel.text = [returnValue[@"data"][@"accountTotal"] stringValue];
-//             weakSelf.yesterdayAmountLabel.text = [returnValue[@"data"][@"yesterdayEarnings"] stringValue];
+             weakSelf.yesterdayAmountLabel.text = [returnValue[@"data"][@"yesterdayEarnings"] stringValue];
              weakSelf.historyAmountLabel.text = [returnValue[@"data"][@"historyEarning"] stringValue];
         }else
         {
@@ -176,6 +176,7 @@
     rebateDetails.rebateAmount = [self.model.accountTotal stringValue];
     [rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
         WithdrawalTableViewController *detailVC = [weakSelf.getStoryboardWithName instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
+        detailVC.model = entity;
         [weakSelf.navigationController pushViewController:detailVC animated:YES];
     }];
     [self.navigationController pushViewController:rebateDetails animated:YES];

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -1484,6 +1484,7 @@
 				TargetAttributes = {
 					29706DA01CD082980003C412 = {
 						CreatedOnToolsVersion = 7.3;
+						DevelopmentTeam = 39XYE6VSP8;
 					};
 				};
 			};
@@ -1864,7 +1865,7 @@
 					"\"UIKit\"",
 					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple.c48;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
 				STRIP_PNG_TEXT = NO;
@@ -1925,7 +1926,7 @@
 					"\"UIKit\"",
 					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple.c48;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
 				STRIP_PNG_TEXT = NO;

Lighting/Tools/opple_objc_json_client.h

@@ -65,7 +65,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @class LoginResult;
 @class ConsumerQueryCondition;
 @class ExceptionCode;
-@class EarningsRequest;
+@class EarningsResponse;
 @class ApplyRequest;
 @class OrderResponse;
 @class TSDepart;
@@ -124,7 +124,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol LoginResult @end
 @protocol ConsumerQueryCondition @end
 @protocol ExceptionCode @end
-@protocol EarningsRequest @end
+@protocol EarningsResponse @end
 @protocol ApplyRequest @end
 @protocol OrderResponse @end
 @protocol TSDepart @end
@@ -161,7 +161,9 @@ extern NSString * const SORTDIRECTION_DESC;
 
 
 /**
- *  @author Administrator
+ *  流水请求
+ 
+ @author nevermore
  @since 0.1
  
  */
@@ -2171,6 +2173,12 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *amount;
+/**
+ * 方法: 取得java.math.BigDecimal
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *afteramount;
 /**
  * 方法: 取得java.lang.String
  *
@@ -2530,7 +2538,7 @@ extern NSString * const SORTDIRECTION_DESC;
 /**
  * (no documentation provided)
  */
-@interface EarningsRequest : JSONModel
+@interface EarningsResponse : JSONModel
 /**
  * (no documentation provided)
  *
@@ -2549,7 +2557,7 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *historyEarning;
-@end /* interface EarningsRequest */
+@end /* interface EarningsResponse */
 
 
 
@@ -2823,7 +2831,9 @@ extern NSString * const SORTDIRECTION_DESC;
 
 
 /**
- *  @author nevermore
+ *  流水明细分页查询结果
+ 
+ @author nevermore
  @since 0.1
  
  */
@@ -2839,7 +2849,11 @@ extern NSString * const SORTDIRECTION_DESC;
 
 
 /**
- * (no documentation provided)
+ *  查询提现进度分页
+ 
+ @author nevermore
+ @since 0.1
+ 
  */
 @interface RsApplyBillResponse : PageRows
 /**

Lighting/Tools/opple_objc_json_client.m

@@ -760,6 +760,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize employeeId;
 @synthesize orderId;
 @synthesize amount;
+@synthesize afteramount;
 @synthesize remark;
 @synthesize orderNumber;
 @synthesize employeeName;
@@ -925,7 +926,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation EarningsRequest
+@implementation EarningsResponse
 @synthesize accountTotal;
 @synthesize yesterdayEarnings;
 @synthesize historyEarning;