fix:bug修改

Asteria.xcodeproj/project.pbxproj

@@ -1936,10 +1936,10 @@
 		8810F52D2BF3676900346FD4 /* PayManager */ = {
 			isa = PBXGroup;
 			children = (
+				8810F5A92C045FD600346FD4 /* Asteria-Bridging-Header.h */,
 				8810F5AA2C045FD600346FD4 /* ToolStripePayment.swift */,
 				8810F52E2BF3678400346FD4 /* ASCheckoutPayManager.h */,
 				8810F52F2BF3678400346FD4 /* ASCheckoutPayManager.m */,
-				8810F5A92C045FD600346FD4 /* Asteria-Bridging-Header.h */,
 			);
 			path = PayManager;
 			sourceTree = "<group>";

Asteria/Fuction/Cart/Cart_CheckoutC.m

@@ -215,10 +215,10 @@
                 
                 
             }
-            [self reqNet_Cart_cartsMineTotals];
+//            [self reqNet_Cart_cartsMineTotals];
         }
-        
-    } else if ([mark isEqualToString:Chectout_getShipMethod] || [mark isEqualToString:Chectout_addBillingAddress]) {
+        /// || [mark isEqualToString:Chectout_addBillingAddress]
+    } else if ([mark isEqualToString:Chectout_getShipMethod]) {
         
         if(sucessOrFail){
             NSArray *shipMethodArr = (NSArray *)data;
@@ -262,22 +262,28 @@
         }
     } else if ([mark isEqualToString:Goods_productGetProductsById]) {
         //请求赠品详情
-        GoodsInformationM *model = (GoodsInformationM *)[arry firstObject];
+        if(sucessOrFail) {
+            GoodsInformationM *model = (GoodsInformationM *)[arry firstObject];
+                    
+            NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:@{@"product_id":model.Id, @"isPromoItems":@"yes"}];
+            if (model.options.count > 0) {
+                NSMutableDictionary *optionDic = [NSMutableDictionary dictionary];
+                for (OptionsModel *optionM in model.options) {
+                    OptionsValuesM *valuesM = optionM.values[0];
+                    NSString *tempStr =[NSString stringWithFormat:@"options[%@]",optionM.option_id];
+                    optionDic[tempStr] =valuesM.option_type_id;
+                }
+                [param addEntriesFromDictionary:optionDic];
+            }
+            [self.addGiftParamArr addObject:param];
+            if (self.giftShowCount < 1 && self.addGiftParamArr.count == 1 && self.addGiftView.hidden) {
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    self.addGiftView.hidden = NO;
+                    [self.addGiftView setGiftData:model.add_gooodsImgUrl];
+                });
                 
-        NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:@{@"product_id":model.Id, @"isPromoItems":@"yes"}];
-        if (model.options.count > 0) {
-            NSMutableDictionary *optionDic = [NSMutableDictionary dictionary];
-            for (OptionsModel *optionM in model.options) {
-                OptionsValuesM *valuesM = optionM.values[0];
-                NSString *tempStr =[NSString stringWithFormat:@"options[%@]",optionM.option_id];
-                optionDic[tempStr] =valuesM.option_type_id;
             }
-            [param addEntriesFromDictionary:optionDic];
-        }
-        [self.addGiftParamArr addObject:param];
-        if (self.giftShowCount < 2 && self.addGiftParamArr.count == 1 && self.addGiftView.hidden) {
-            self.addGiftView.hidden = NO;
-            [self.addGiftView setGiftData:model.add_gooodsImgUrl];
         }
     }
 }
@@ -331,7 +337,7 @@
     
     NSDictionary *freeData = (NSDictionary *)[[self.totalsM.extension_attributes objectForKey:@"free_data"] mj_JSONObject];
     BOOL is_show = [[freeData objectForKey:@"is_show"] boolValue];
-    if (is_show && self.giftShowCount< 2) {//显示存在赠品
+    if (is_show && self.giftShowCount< 1) {//显示存在赠品
         NSArray *productArr = [freeData objectForKey:@"products"];
         if (productArr.count > 0) { //存在赠品
             for (int i = 0; i < productArr.count; i++) {
@@ -388,7 +394,7 @@
             self.addressCellM.addressModel = addressM;
             
             [self requestAddShipAddress];
-//            [self requestAddBillingAddress];
+            [self requestAddBillingAddress];
         };
         [self.navigationController pushViewController:vc animated:true];
     }
@@ -406,7 +412,7 @@
 }
 //添加账单地址
 - (void)requestAddBillingAddress {
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+//    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     
     NSDictionary *addressDic1 = (NSDictionary *)[self.addressCellM.addressModel.region mj_JSONObject];
     NSDictionary *addressDic = (NSDictionary *)[self.addressCellM.addressModel mj_JSONObject];
@@ -508,7 +514,7 @@
         NSDictionary *payDic = (NSDictionary *)payData;
         if (isSucess == 1) {
             
-            [self.view makeToast:@"支付成功，正在为你下单" duration:0.5 position:CSToastPositionCenter];
+            [self.view makeToast:@"Payment success" duration:0.5 position:CSToastPositionCenter];
             K_WEAK_SELF;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 K_STRONG_SELF;
@@ -536,8 +542,8 @@
             
             NSString *msg = [NSString stringWithFormat:@"%@", [payDic objectForKey:@"msg"]];
             
-            if ([msg isEqualToString:@"支付异常"] && [payMethod isEqualToString:@"klarna_kco"]) {
-                [self.view makeToast:@"支付失败，请重试" duration:0.5 position:CSToastPositionCenter];
+            if ([msg isEqualToString:@"Payment anomaly"] && [payMethod isEqualToString:@"klarna_kco"]) {
+                [self.view makeToast:@"Payment Failed" duration:0.5 position:CSToastPositionCenter];
                 
                 K_WEAK_SELF;
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -547,7 +553,7 @@
                 return;
             }
             
-            [self.view makeToast:@"支付失败" duration:0.5 position:CSToastPositionCenter];
+            [self.view makeToast:@"Payment Failed" duration:0.5 position:CSToastPositionCenter];
             K_WEAK_SELF;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 K_STRONG_SELF;
@@ -573,11 +579,8 @@
 
 //请求赠品商品详情
 -(void)reqNet_GoodsDetails_productGetProduct:(NSString *)enterId{
-    NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-//    [params setObject:@"55475" forKey:@"productId"];
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
     [params setObject:enterId forKey:@"productId"];
-    [params setObject:ASCurrencyManager.shared.currentCur forKey:@"currencyCode"];
-//    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [self.goodsDetailsVM ry_requestGetApi:Goods_productGetProductsById param:params];
 }
 

Asteria/Fuction/Cart/Cart_MyCartC.m

@@ -203,7 +203,7 @@
 -(void)reqNet_GoodsDetails_productGetProduct:(NSString *)enterId{
     NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
     [params setObject:enterId forKey:@"productId"];
-    [params setObject:ASCurrencyManager.shared.currentCur forKey:@"currencyCode"];
+//    [params setObject:ASCurrencyManager.shared.currentCur forKey:@"currencyCode"];
 //    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [self.goodsDetailsVM ry_requestGetApi:Goods_productGetProductsById param:params];
 }
@@ -317,26 +317,26 @@
         }
     } else if ([mark isEqualToString:Goods_productGetProductsById]) {
         //请求赠品详情
-        GoodsInformationM *model = (GoodsInformationM *)[arry firstObject];
-        
-        NSLog(@"optionsoptions====%@=====%@", model.Id, model.options);
-        
-        NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:@{@"product_id":model.Id, @"isPromoItems":@"yes"}];
-        if (model.options.count > 0) {
-            NSMutableDictionary *optionDic = [NSMutableDictionary dictionary];
-            for (OptionsModel *optionM in model.options) {
-                OptionsValuesM *valuesM = optionM.values[0];
-                NSString *tempStr =[NSString stringWithFormat:@"options[%@]",optionM.option_id];
-                optionDic[tempStr] =valuesM.option_type_id;
+        if(sucessOrFail) {
+            GoodsInformationM *model = (GoodsInformationM *)[arry firstObject];            
+            NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:@{@"product_id":model.Id, @"isPromoItems":@"yes"}];
+            if (model.options.count > 0) {
+                NSMutableDictionary *optionDic = [NSMutableDictionary dictionary];
+                for (OptionsModel *optionM in model.options) {
+                    OptionsValuesM *valuesM = optionM.values[0];
+                    NSString *tempStr =[NSString stringWithFormat:@"options[%@]",optionM.option_id];
+                    optionDic[tempStr] =valuesM.option_type_id;
+                }
+                [param addEntriesFromDictionary:optionDic];
+            }
+    //        param = /*@{@"product_id":model.Id, @"isPromoItems":@"1"}*/;
+            [self.addGiftParamArr addObject:param];
+            if (self.giftShowCount < 1 && self.addGiftParamArr.count == 1 && self.addGiftView.hidden) {
+                self.addGiftView.hidden = NO;
+                [self.addGiftView setGiftData:model.add_gooodsImgUrl];
             }
-            [param addEntriesFromDictionary:optionDic];
-        }
-//        param = /*@{@"product_id":model.Id, @"isPromoItems":@"1"}*/;
-        [self.addGiftParamArr addObject:param];
-        if (self.giftShowCount < 1 && self.addGiftParamArr.count == 1 && self.addGiftView.hidden) {
-            self.addGiftView.hidden = NO;
-            [self.addGiftView setGiftData:model.add_gooodsImgUrl];
         }
+        
     }
 }
 - (void)tapcellTriggereventIndex:(NSIndexPath *)index model:(id)model{

Asteria/Fuction/Cart/Cell/MyCartItemCell.m

@@ -153,7 +153,7 @@
         self.bgDesLab.hidden = YES;
     }else{
         self.bgDesLab.hidden = NO;
-        self.bgDesLab.text = [NSString stringWithFormat:@"SAVE %@%.2f",itemM.currency_symbol,[itemM.initial_price floatValue]-[itemM.price floatValue]];
+        self.bgDesLab.text = [NSString stringWithFormat:@"SAVE %@%.2f",itemM.currency_symbol,[itemM.initial_price floatValue]-[itemM.row_total floatValue]];
         self.countV.numLab.text = MM_str(itemM.qty);
         [self.countV xxx_changeBtnIsEnable:YES num:[self.countV.numLab.text integerValue]];
     }
@@ -172,11 +172,11 @@
 }
 #pragma mark - **************** tool ****************
 +(NSMutableAttributedString *)tool_changePriceAtr:(CartTotalsItemsM *)model{
-    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.price]];
+    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.row_total]];
     [priceAtr addAttribute: NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"#0B0B0B"] range:NSMakeRange(0, priceAtr.length)];
     [priceAtr addAttribute:NSFontAttributeName value:[UIFont fontWithName:Rob_Bold size:20] range:NSMakeRange(0, priceAtr.length)];
     [priceAtr appendAttributedString:[[NSAttributedString alloc]initWithString:@"  "]];
-    NSMutableAttributedString *priceAtrSub1 = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.initial_price]];
+    NSMutableAttributedString *priceAtrSub1 = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%.2f",model.currency_symbol,[model.initial_price floatValue]]];
     [priceAtrSub1 addAttribute:NSForegroundColorAttributeName
                     value:[UIColor colorWithHexString:@"#8c8c8c"]
                     range:NSMakeRange(0, priceAtrSub1.length)];

Asteria/Fuction/Cart/Checkout/ASCheckoutGoodsItemCell.m

@@ -175,11 +175,11 @@
 }
 #pragma mark - **************** tool ****************
 +(NSMutableAttributedString *)tool_changePriceAtr:(CartTotalsItemsM *)model{
-    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.price]];
+    NSMutableAttributedString *priceAtr = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.row_total]];
     [priceAtr addAttribute: NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"#0B0B0B"] range:NSMakeRange(0, priceAtr.length)];
     [priceAtr addAttribute:NSFontAttributeName value:[UIFont fontWithName:Rob_Bold size:20] range:NSMakeRange(0, priceAtr.length)];
     [priceAtr appendAttributedString:[[NSAttributedString alloc]initWithString:@"  "]];
-    NSMutableAttributedString *priceAtrSub1 = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.initial_price]];
+    NSMutableAttributedString *priceAtrSub1 = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@%.2f",model.currency_symbol, [model.initial_price floatValue]]];
     [priceAtrSub1 addAttribute:NSForegroundColorAttributeName
                     value:[UIColor colorWithHexString:@"#8c8c8c"]
                     range:NSMakeRange(0, priceAtrSub1.length)];

Asteria/Fuction/Cart/M/CartTotalsM.h

@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *initial_price;
 @property (nonatomic, copy) NSString *image;
 @property (nonatomic, copy) NSString *product_id;
+@property (nonatomic, copy) NSString *row_total;
 
 
 @property (nonatomic, assign) BOOL isGift;

Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m

@@ -57,6 +57,7 @@ static ASCheckoutPayManager *_instance = nil;
         } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
 //            K_STRONG_SELF;
             [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            [topVC.view makeToast:msg duration:2 position:CSToastPositionCenter];
         }];
         
     } else if ([payType isEqualToString:@"stripe_payments"]) {//visa
@@ -83,7 +84,7 @@ static ASCheckoutPayManager *_instance = nil;
 //                [topVC.view makeToast:@"您 已取消支付"];
             } else {
                 if (self.payFinishBlock) {
-                    self.payFinishBlock(self.payType, 0, @{@"msg":@"支付失败"});
+                    self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment Failed"});
                 }
             }
         };
@@ -215,7 +216,7 @@ static ASCheckoutPayManager *_instance = nil;
         } else {
             //异常状态、需要返回购物车刷新
             if (self.payFinishBlock) {
-                self.payFinishBlock(self.payType, 0, @{@"msg":@"支付异常"});
+                self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment anomaly"});
             }
         }
         
@@ -224,7 +225,7 @@ static ASCheckoutPayManager *_instance = nil;
         [MBProgressHUD hideHUDForView:topVC.view animated:YES];
         
         if (self.payFinishBlock) {
-            self.payFinishBlock(self.payType, 0, @{@"msg":@"支付异常"});
+            self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment anomaly"});
         }
     }];
 }
@@ -286,7 +287,7 @@ static ASCheckoutPayManager *_instance = nil;
         
     } else {
         if (self.payFinishBlock) {
-            self.payFinishBlock(self.payType, 0, @{@"msg":@"支付失败"});
+            self.payFinishBlock(self.payType, 0, @{@"msg":@"Payment Failed"});
         }
         NSLog(@"klarna 授权支付失败");
     }
@@ -299,10 +300,10 @@ static ASCheckoutPayManager *_instance = nil;
 }
 #pragma mark - **************** KlarnaEventHandler ****************
 - (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent dispatchedEvent:(KlarnaProductEvent * _Nonnull)event{
-    NSLog(@"klarna---111---%@",event.qmui_allBindingKeys);
+//    NSLog(@"klarna---111---%@",event.qmui_allBindingKeys);
 }
 - (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent encounteredError:(KlarnaError * _Nonnull)error{
-    NSLog(@"klarna---222---error:%@",error);
+//    NSLog(@"klarna---222---error:%@",error);
 }
 - (void)klarnaResizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView to:(CGFloat)newHeight {
 //    [self.klarna_payV mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -310,20 +311,20 @@ static ASCheckoutPayManager *_instance = nil;
 //    }];
 }
 - (void)klarnaFailedInPaymentView:(KlarnaPaymentView * _Nonnull)paymentView withError:(KlarnaPaymentError * _Nonnull)error {
-    NSLog(@"klarna---777---%@",paymentView);
+//    NSLog(@"klarna---777---%@",paymentView);
 }
 
 - (void)klarnaFinalizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken { 
     
 }
 - (void)klarnaLoadedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
-    NSLog(@"klarna---333---%@",paymentView);
+//    NSLog(@"klarna---333---%@",paymentView);
 //    self.bottomPaybtn.backgroundColor = [UIColor colorWithHexString:@"#B2000F"];
 //    self.bottomPaybtn.userInteractionEnabled = YES;
 
 }
 - (void)klarnaLoadedPaymentReviewWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
-    NSLog(@"klarna---444---%@",paymentView);
+//    NSLog(@"klarna---444---%@",paymentView);
 
 
 }

Asteria/Fuction/Goods/VC/AS_GoodsSizeC.m

@@ -184,8 +184,8 @@
     [self refresh_PayViewchangeValueCell:add_final_price_f];
 }
 -(void)refresh_PayViewchangeValueCell:(CGFloat )change_final_prices_f{
-//    GoodsSizePayMentCellData *payModel = (GoodsSizePayMentCellData *)[self.TableV.infodata lastObject];
-//    payModel.final_prices_f = change_final_prices_f;
+    GoodsSizePayMentCellData *payModel = (GoodsSizePayMentCellData *)[self.TableV.infodata lastObject];
+    payModel.final_prices_f = change_final_prices_f;
     NSIndexPath *indexPath = [NSIndexPath indexPathForRow:self.TableV.infodata.count-1 inSection:0];
     [self.TableV reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
 }