Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose

iCemarose.xcodeproj/project.pbxproj

@@ -218,6 +218,8 @@
 		C084F4571D6D975400A0625D /* KWMSearchBar.m in Sources */ = {isa = PBXBuildFile; fileRef = C084F4561D6D975400A0625D /* KWMSearchBar.m */; };
 		C084F4591D6D976F00A0625D /* KWMSearchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = C084F4581D6D976F00A0625D /* KWMSearchBar.xib */; };
 		C08827A61E28B4AF006A8B91 /* KWMPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = C08827A51E28B4AF006A8B91 /* KWMPageControl.m */; };
+		C08870E81F0342B000C9C1C8 /* KWMCustomsClearanceVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C08870E71F0342B000C9C1C8 /* KWMCustomsClearanceVC.m */; };
+		C08870EB1F03481C00C9C1C8 /* KWMCustomsClearance.m in Sources */ = {isa = PBXBuildFile; fileRef = C08870EA1F03481C00C9C1C8 /* KWMCustomsClearance.m */; };
 		C08FDA271D9A5F3400EBDB0D /* KWMAddGiftCardVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C08FDA261D9A5F3400EBDB0D /* KWMAddGiftCardVC.m */; };
 		C08FDA2A1D9B583400EBDB0D /* KWMGiftCardVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C08FDA291D9B583400EBDB0D /* KWMGiftCardVC.m */; };
 		C091EE331DDB1FC500A382B9 /* KWMAppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = C091EE321DDB1FC500A382B9 /* KWMAppVersion.m */; };
@@ -314,6 +316,7 @@
 		C0F5869B1E25D05F001248E2 /* KWMProductDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F5869A1E25D05F001248E2 /* KWMProductDetailView.m */; };
 		C0F5869D1E25D3B6001248E2 /* KWMProductDetailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F5869C1E25D3B6001248E2 /* KWMProductDetailView.xib */; };
 		C0F586AE1E279574001248E2 /* KWMBottomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0F586AD1E279574001248E2 /* KWMBottomView.xib */; };
+		C0FBD88E1F049D510009E375 /* KWMOrderPaid.m in Sources */ = {isa = PBXBuildFile; fileRef = C0FBD88D1F049D510009E375 /* KWMOrderPaid.m */; };
 		C0FC278E1D9B73B000C5CFFE /* KWMGiftCardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0FC278D1D9B73B000C5CFFE /* KWMGiftCardCell.m */; };
 		DAB6431A1F04CFE5002CD7FE /* AppDelegate+Deeplink.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB643191F04CFE5002CD7FE /* AppDelegate+Deeplink.m */; };
 /* End PBXBuildFile section */
@@ -716,6 +719,10 @@
 		C084F4581D6D976F00A0625D /* KWMSearchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMSearchBar.xib; sourceTree = "<group>"; };
 		C08827A41E28B4AF006A8B91 /* KWMPageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMPageControl.h; sourceTree = "<group>"; };
 		C08827A51E28B4AF006A8B91 /* KWMPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMPageControl.m; sourceTree = "<group>"; };
+		C08870E61F0342B000C9C1C8 /* KWMCustomsClearanceVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMCustomsClearanceVC.h; sourceTree = "<group>"; };
+		C08870E71F0342B000C9C1C8 /* KWMCustomsClearanceVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMCustomsClearanceVC.m; sourceTree = "<group>"; };
+		C08870E91F03481C00C9C1C8 /* KWMCustomsClearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMCustomsClearance.h; sourceTree = "<group>"; };
+		C08870EA1F03481C00C9C1C8 /* KWMCustomsClearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMCustomsClearance.m; sourceTree = "<group>"; };
 		C08FDA251D9A5F3400EBDB0D /* KWMAddGiftCardVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMAddGiftCardVC.h; sourceTree = "<group>"; };
 		C08FDA261D9A5F3400EBDB0D /* KWMAddGiftCardVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMAddGiftCardVC.m; sourceTree = "<group>"; };
 		C08FDA281D9B583400EBDB0D /* KWMGiftCardVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMGiftCardVC.h; sourceTree = "<group>"; };
@@ -875,6 +882,8 @@
 		C0F5869A1E25D05F001248E2 /* KWMProductDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMProductDetailView.m; sourceTree = "<group>"; };
 		C0F5869C1E25D3B6001248E2 /* KWMProductDetailView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMProductDetailView.xib; sourceTree = "<group>"; };
 		C0F586AD1E279574001248E2 /* KWMBottomView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMBottomView.xib; sourceTree = "<group>"; };
+		C0FBD88C1F049D510009E375 /* KWMOrderPaid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMOrderPaid.h; sourceTree = "<group>"; };
+		C0FBD88D1F049D510009E375 /* KWMOrderPaid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMOrderPaid.m; sourceTree = "<group>"; };
 		C0FC278C1D9B73B000C5CFFE /* KWMGiftCardCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMGiftCardCell.h; sourceTree = "<group>"; };
 		C0FC278D1D9B73B000C5CFFE /* KWMGiftCardCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMGiftCardCell.m; sourceTree = "<group>"; };
 		DAB643181F04CFE5002CD7FE /* AppDelegate+Deeplink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+Deeplink.h"; sourceTree = "<group>"; };
@@ -1034,6 +1043,8 @@
 				C08FDA291D9B583400EBDB0D /* KWMGiftCardVC.m */,
 				C0392DBB1DCC786F0051AC8E /* KWMShippingVC.h */,
 				C0392DBC1DCC786F0051AC8E /* KWMShippingVC.m */,
+				C08870E61F0342B000C9C1C8 /* KWMCustomsClearanceVC.h */,
+				C08870E71F0342B000C9C1C8 /* KWMCustomsClearanceVC.m */,
 			);
 			path = ShopCart;
 			sourceTree = "<group>";
@@ -1239,11 +1250,13 @@
 		C034E6C21D6AECF9006EE129 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				C034E6CC1D6AEE20006EE129 /* DAO */,
+				C0FBD88C1F049D510009E375 /* KWMOrderPaid.h */,
+				C0FBD88D1F049D510009E375 /* KWMOrderPaid.m */,
 				C03120A81EF2AC5A00E49EFA /* KWMWechatPayData.h */,
 				C03120A91EF2AC5A00E49EFA /* KWMWechatPayData.m */,
 				C091EE311DDB1FC500A382B9 /* KWMAppVersion.h */,
 				C091EE321DDB1FC500A382B9 /* KWMAppVersion.m */,
-				C034E6CC1D6AEE20006EE129 /* DAO */,
 				C034E6C61D6AED1F006EE129 /* KWMUser.h */,
 				C034E6C71D6AED1F006EE129 /* KWMUser.m */,
 				807AF49E1DC984950000A326 /* KWMProducts.h */,
@@ -1282,6 +1295,8 @@
 				C048B8E11EF3C04B000DA7AF /* KWMBeforePayData.m */,
 				9B18C11D1EF1270A001DD59B /* BUYProductVariant+Currency.h */,
 				9B18C11E1EF1270A001DD59B /* BUYProductVariant+Currency.m */,
+				C08870E91F03481C00C9C1C8 /* KWMCustomsClearance.h */,
+				C08870EA1F03481C00C9C1C8 /* KWMCustomsClearance.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2400,6 +2415,7 @@
 				C0A6B3C41F01FC5300D85673 /* KWMSecondDetailView.m in Sources */,
 				9B8298E61EF237FC00743438 /* NSDecimalNumber+Currency.m in Sources */,
 				C034E6F51D6AF197006EE129 /* KWMPickView.m in Sources */,
+				C08870EB1F03481C00C9C1C8 /* KWMCustomsClearance.m in Sources */,
 				C034E8651D6B10A0006EE129 /* PhotoImageView.m in Sources */,
 				C034E6C81D6AED1F006EE129 /* KWMUser.m in Sources */,
 				C034E6F01D6AF13A006EE129 /* KWMBaseVC.m in Sources */,
@@ -2456,6 +2472,7 @@
 				DAB6431A1F04CFE5002CD7FE /* AppDelegate+Deeplink.m in Sources */,
 				C06665121D767A0A00F02EF4 /* KWMContactUsVC.m in Sources */,
 				C034E6CF1D6AEE39006EE129 /* KWMUserDao.m in Sources */,
+				C08870E81F0342B000C9C1C8 /* KWMCustomsClearanceVC.m in Sources */,
 				C0DD530F1EE54A9E002D1E0C /* KWMBarandSelectView.m in Sources */,
 				C034E8551D6B10A0006EE129 /* UIImageView+SD.m in Sources */,
 				C034E85E1D6B10A0006EE129 /* PhotoBroswerLayout.m in Sources */,
@@ -2530,6 +2547,7 @@
 				C0F4AF481DF110F000BDA719 /* KWMProductResult.m in Sources */,
 				C0E8AE0C1D7D503600C193DC /* KWMPaySuccessVC.m in Sources */,
 				C0392DBD1DCC786F0051AC8E /* KWMShippingVC.m in Sources */,
+				C0FBD88E1F049D510009E375 /* KWMOrderPaid.m in Sources */,
 				807AF4A61DC984950000A326 /* KWMDataProduct.m in Sources */,
 				80C8014F1D78134800002306 /* KWMTBVSectionHeardView.m in Sources */,
 				C034E7C21D6B0B62006EE129 /* KWMMineVC.m in Sources */,

iCemarose/Class/Api/KWMAPIManager.h

@@ -31,6 +31,7 @@
 #import "KWMCartResult.h"
 #import "KWMCheckoutPayResult.h"
 #import "KWMWechatPayData.h"
+#import "KWMOrderPaid.h"
 
 
 
@@ -264,4 +265,12 @@
                                     success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                     failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure;
 
+/**
+ * 通过checkout_token查询shopify订单API
+ * @return NSURLSessionDataTask
+ */
+- (NSURLSessionDataTask *) appOrderQuery:(NSDictionary *)parameters
+                                 success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
+                                 failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure;
+
 @end

iCemarose/Class/Api/KWMAPIManager.m

@@ -795,7 +795,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) wechatPayUnifiedOrder:(NSDictionary *)parameters
                                          success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                          failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = @"https://peter.tofnews.com/wechatpay/app/unified_order";
+    NSString *apiPath = @"https://liang.tofnews.com/wechatpay/app/unified_order";
     
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -821,7 +821,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) aliPayUnifiedOrder:(NSDictionary *)parameters
                                       success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                       failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = @"https://peter.tofnews.com/alipay/app/unified_order";
+    NSString *apiPath = @"https://liang.tofnews.com/alipay/app/unified_order";
     
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -835,7 +835,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) wechatPayOrderQuery:(NSDictionary *)parameters
                                        success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                        failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = @"https://peter.tofnews.com/wechatpay/order/query";
+    NSString *apiPath = @"https://liang.tofnews.com/wechatpay/order/query";
     
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -849,7 +849,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) aliPayOrderQuery:(NSDictionary *)parameters
                                     success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                     failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = @"https://peter.tofnews.com/alipay/order/query";
+    NSString *apiPath = @"https://liang.tofnews.com/alipay/order/query";
     
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -860,6 +860,35 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
                           failure:failure];
 }
 
+/**
+ * 通过checkout_token查询shopify订单API
+ * checkout_token shopify订单token
+ * sign 签名验证
+ * 签名规则
+ * str_sign = checkout_token=5173547165345&key=bd3f58f5cd3d7a217ac8c8e655ab52f8";
+ * sign = md5(base64_encode($str_sign));
+ *
+ * @return NSURLSessionDataTask
+ */
+- (NSURLSessionDataTask *) appOrderQuery:(NSDictionary *)parameters
+                                    success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
+                                    failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
+    NSString *apiPath = @"https://liang.tofnews.com/app/order/query";
+    
+    return [self startSessionTask:KWMHTTPMethodPOST
+                          apiPath:apiPath
+                       parameters:parameters
+                           result:[KWMCheckoutPayResult class]
+                            model:[KWMOrderPaid class]
+                          success:success
+                          failure:failure];
+}
+
+
+
+
+
+
 
 
 @end

iCemarose/Class/Model/DAO/KWMUserDao.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Buy/Buy.h>
+#import "KWMCustomsClearance.h"
 
 @class KWMUser;
 @class KWMRequestResult;
@@ -20,6 +21,8 @@
 
 @property (nonatomic, strong) NSString *currencyCode;
 
+@property (nonatomic, strong) KWMCustomsClearance *customsClearance;
+
 + (KWMUserDao *)shareDao;
 - (BOOL)checkSession;
 - (KWMUser *)loginUser;

iCemarose/Class/Model/DAO/KWMUserDao.m

@@ -42,6 +42,7 @@ static NSString *kwmKeySavedAccountPassword = @"savedAccountPassword";
     NSDecimalNumber *_exchangeRate;
 }
 
+@synthesize customsClearance = _customsClearance;
 @synthesize currencyCode = _currencyCode;
 
 + (KWMUserDao *)shareDao {
@@ -459,4 +460,17 @@ static NSString *kwmKeySavedAccountPassword = @"savedAccountPassword";
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
+-(KWMCustomsClearance *)customsClearance{
+    if(!_customsClearance){
+        _customsClearance = [[NSUserDefaults standardUserDefaults] objectForKey:@"_customs_clearance"];
+    }
+    return _customsClearance;
+}
+
+-(void)setCustomsClearance:(KWMCustomsClearance *)customsClearance{
+    _customsClearance = customsClearance;
+    [[NSUserDefaults standardUserDefaults]setObject:customsClearance forKey:@"_customs_clearance"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
 @end

iCemarose/Class/Model/KWMCustomsClearance.h

+//
+//  KWMCustomsClearance.h
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/28.
+//  Copyright © 2017年 kollway. All rights reserved.
+//
+
+#import "KWMBaseModel.h"
+
+@interface KWMCustomsClearance : KWMBaseModel
+
+//清关姓名
+@property (nonatomic) NSString *name;
+
+//清关身份证号
+@property (nonatomic) NSString *idCode;
+
+@end

iCemarose/Class/Model/KWMCustomsClearance.m

+//
+//  KWMCustomsClearance.m
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/28.
+//  Copyright © 2017年 kollway. All rights reserved.
+//
+
+#import "KWMCustomsClearance.h"
+
+@implementation KWMCustomsClearance
+
+-(NSString *)name{
+    if(!_name){
+        return @"";
+    }
+    return _name;
+}
+
+-(NSString *)idCode{
+    if(!_idCode){
+        return @"";
+    }
+    return _idCode;
+}
+
+
+@end

iCemarose/Class/Model/KWMOrderPaid.h

+//
+//  KWMOrderPaid.h
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/27.
+//  Copyright © 2017年 kollway. All rights reserved.
+//  查询支付结果API返回的model
+
+#import "KWMBaseModel.h"
+
+@interface KWMOrderPaid : KWMBaseModel
+
+/**生成的订单ID*/
+@property (nonatomic) NSNumber * _Nullable orderId;
+
+@end

iCemarose/Class/Model/KWMOrderPaid.m

+//
+//  KWMOrderPaid.m
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/27.
+//  Copyright © 2017年 kollway. All rights reserved.
+//
+
+#import "KWMOrderPaid.h"
+
+@implementation KWMOrderPaid
+
+@end

iCemarose/Class/UI/Product/KWMNewVC.m

@@ -172,8 +172,11 @@ static NSString * idStr = @"KWMNewGoodsCell";
 //点击婴儿
 - (IBAction)onClickBabyBtn:(id)sender {
     if([TestModel isEqualToString:@"YES"]){
-        KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"];
-        [self.navigationController pushViewController:selectedGoodsVC animated:YES];
+//        KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"];
+//        [self.navigationController pushViewController:selectedGoodsVC animated:YES];
+        KWMProductDetailVC *vc = (KWMProductDetailVC *)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
+        vc.productId = @(11406082255);
+        [self.navigationController pushViewController:vc animated:YES];
         return;
     }
     [self JumpToNewSelectedVCWith:self.btnBaby.titleLabel.text type:0];

iCemarose/Class/UI/ShopCart/KWMBeforePayVC.h

@@ -44,10 +44,15 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *lbShippingRate;
 
+//清关信息
+@property (weak, nonatomic) IBOutlet UILabel *lbCustomsClearance;
+
 @property (weak, nonatomic) IBOutlet UIView *vPayType;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *heightPayType;
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *heightCustomsClearance;
+
 @property (nonatomic) BUYAddress *address;
 
 //创建订单异步请求
@@ -80,6 +85,8 @@
 
 - (IBAction)onClickShipping:(id)sender;
 
+- (IBAction)onClickCustomsClearance:(id)sender;
+
 
 @end
 

iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m

@@ -9,6 +9,7 @@
 #import "KWMBeforePayVC.h"
 #import "KWMDiscountVC.h"
 #import "KWMSelectAddressVC.h"
+#import "KWMCustomsClearanceVC.h"
 #import "KWMPaySuccessVC.h"
 #import "KWMShopCartModel.h"
 #import "KWMStringUtil.h"
@@ -40,7 +41,6 @@
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    [self validateOrderPayResult];
     [self initDefaultData];
 }
 
@@ -50,16 +50,21 @@
     self.payType = [self.userDao.currencyCode isEqualToString:@"EUR"]?TypeWebpay:TypeNone;
     self.beforePayData = [KWMBeforePayData new];
     //支付成功回调广播接收者 ##通过广播接受appdelegate中的支付回调。
+    //app active回调广播接受者 ##判断订单支付状态.
     NSNotificationCenter *notifi = [NSNotificationCenter defaultCenter];
     [notifi addObserver:self selector:@selector(paySuccess) name:KWMPaySuccess object:nil];
+    [notifi addObserver:self selector:@selector(requestOrderPayResult) name:UIApplicationDidBecomeActiveNotification object:nil];
 }
 
 -(void)dealloc{
-    //注销支付成功广播接收者
+    //注销广播接收者
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
     [notificationCenter removeObserver:self
                                   name:KWMPaySuccess
                                 object:nil];
+    [notificationCenter removeObserver:self
+                                  name:UIApplicationDidBecomeActiveNotification
+                                object:nil];
 }
 
 -(void)setPayType:(KWMPayType)payType{
@@ -391,6 +396,11 @@
     giftCardVC.checkout = self.checkout;
     [self.navigationController pushViewController:giftCardVC animated:YES];
 }
+    
+//清关信息填写页面
+-(void)onClickCustomsClearance:(id)sender{
+    
+}
 
 //选择配送方式页面
 -(void)onClickShipping:(id)sender{
@@ -555,6 +565,8 @@
         if(this.checkout.shippingAddress && !this.checkout.shippingRate) {
             [this requestShippingData];
         }
+        //排除已被支付的checkout的可能性
+        [this requestOrderPayResult];
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         [this hideLoading];
         [this showError:error];
@@ -604,18 +616,31 @@
     }];
 }
 
--(void)validateOrderPayResult{
+-(void)requestOrderPayResult{
     //微信支付，用户支付后，当用户没有点击完成按钮，而是直接使用home键，或者点击状态栏左上角返回APP订单页面时，微信的回调不会调用，而很容易出现订单结果丢失的情况，所以需要再确认一次订单是否完成。
     //支付宝暂时没有这种问题。
-    //checkout与order暂无法直接关联，现该api一直返回未支付。
-    if(self.beforePayData && self.beforePayData.wechatPayData){
+    //另外用到的情况:上次被支付的订单，因某些突发原因没从缓存清除。
+    //if(self.beforePayData && self.beforePayData.wechatPayData && self.checkout){
+    if(self.checkout){
+        NSDictionary *parameters = [KWMPayUtil payResultParameters:self.checkout];
         self.beforePayData.wechatPayData = nil;
         __weak KWMBeforePayVC *weakSelf = self;
-        [self.client getCompletionStatusOfCheckoutWithToken:self.checkout.token completion:^(BUYStatus status, NSError * _Nullable error) {
-            if (!error && status) {
+        void(^failure)(NSURLSessionDataTask *,NSError *) = ^(NSURLSessionDataTask *task,NSError *error){
+            //[weakSelf showError:error];
+        };
+        void(^success)(NSURLSessionDataTask *,KWMCheckoutPayResult *) = ^(NSURLSessionDataTask *task,KWMCheckoutPayResult *result){
+            if(!result){
+                return;
+            }
+            if(!result.code || result.code.integerValue != 1000){
+                return;
+            }
+            if(result.data){
+                KWMOrderPaid *data = (KWMOrderPaid *)result.data;
                 [weakSelf paySuccess];
             }
-        }];
+        };
+//        [self.api appOrderQuery:parameters success:success failure:failure];
     }
 }
 
@@ -682,8 +707,6 @@
 -(void)goToWebPay{
     KWMCheckoutWebViewVC *checkoutVC = (KWMCheckoutWebViewVC *)[KWMBaseVC findControllerBy:[KWMCheckoutWebViewVC kwmTag] fromStoryboard:@"ShopCart"];
     checkoutVC.payURL = self.checkout.webCheckoutURL;
-//    checkoutVC.payURL = [NSURL URLWithString:@"http://wxpay.wxutil.com/mch/pay/h5.v2.php"];
-
     [self.navigationController pushViewController:checkoutVC animated:YES];
 }
 

iCemarose/Class/UI/ShopCart/KWMCustomsClearanceVC.h

+//
+//  KWMCustomsClearanceVC.h
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/28.
+//  Copyright © 2017年 kollway. All rights reserved.
+//
+
+#import "KWMBaseVC.h"
+#import "KWMCustomsClearance.h"
+
+@protocol KWMCustomsClearanceDelegate <NSObject>
+
+- (void)kwm_customsClearance:(KWMCustomsClearance *)customsClearance;
+
+
+@end
+@interface KWMCustomsClearanceVC : KWMBaseVC<UITextFieldDelegate>
+
+@property (weak, nonatomic) id<KWMCustomsClearanceDelegate>delegate;
+
+@property (nonatomic) KWMCustomsClearance *customsClearance;
+
+@end

iCemarose/Class/UI/ShopCart/KWMCustomsClearanceVC.m

+//
+//  KWMCustomsClearanceVC.m
+//  iCemarose
+//
+//  Created by HouWeiBin on 2017/6/28.
+//  Copyright © 2017年 kollway. All rights reserved.
+//
+
+#import "KWMCustomsClearanceVC.h"
+#import "KWMStringUtil.h"
+
+@interface KWMCustomsClearanceVC ()
+
+@property (weak, nonatomic) IBOutlet UITextField *tfName;
+
+@property (weak, nonatomic) IBOutlet UITextField *tfIdCode;
+
+@end
+
+@implementation KWMCustomsClearanceVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self initView];
+}
+
+-(void)initView{
+    [self initTitle];
+    [self initTf];
+}
+
+-(void)initTitle{
+    UIBarButtonItem *leftButton = [[UIBarButtonItem alloc] initWithTitle:@"取消" style:UIBarButtonItemStylePlain target:self action:@selector(onClickLeftButton)];
+    self.navigationItem.leftBarButtonItem = leftButton;
+    UIBarButtonItem *rightButton = [[UIBarButtonItem alloc] initWithTitle:@"存储" style:UIBarButtonItemStylePlain target:self action:@selector(onClickRightButton)];
+    self.navigationItem.rightBarButtonItem = rightButton;
+}
+
+-(void)initTf{
+    self.tfName.borderStyle = UITextBorderStyleNone;
+    self.tfIdCode.borderStyle = UITextBorderStyleNone;
+    self.tfIdCode.delegate = self;
+    
+    self.customsClearance = [KWMCustomsClearance new];
+    self.customsClearance.name = @"侯卫彬";
+    self.customsClearance.idCode = @"445222199211153557";
+    if(self.customsClearance){
+        self.tfName.text = self.customsClearance.name;
+        self.tfIdCode.text = self.customsClearance.idCode;
+        if(self.customsClearance.idCode.length >10){
+            self.tfIdCode.text = [self halfSecretCode:self.customsClearance.idCode];
+        }
+    }else{
+        self.customsClearance = [KWMCustomsClearance new];
+    }
+}
+
+-(void)onClickLeftButton{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+-(void)onClickRightButton{
+    NSString *name = self.tfName.text;
+    NSString *idCode = self.tfIdCode.text;
+    if([KWMStringUtil isEmpty:name]){
+        [self showToast:@"请填写姓名"];
+    }else if([KWMStringUtil isEmpty:idCode]){
+        [self showToast:@"请填写身份证号"];
+    }else{
+        //身份证是否为没有编辑过--如果是且仍为半密文状态.
+        BOOL noEdited = [self.tfIdCode.text rangeOfString:@"***"].location != NSNotFound;
+        self.customsClearance.name = self.tfName.text;
+        self.customsClearance.idCode = noEdited?self.customsClearance.idCode:self.tfIdCode.text;
+        
+        if(self.delegate){
+            [self.delegate kwm_customsClearance:self.customsClearance];
+        }
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
+#pragma mark -- idCode StringUtil
+//替换字符串 445555199011123333 => 44555************3
+-(NSString *)halfSecretCode:(NSString *)idCode{
+    NSString *mIdCode = self.customsClearance.idCode;
+    NSMutableString *secretCode = [[NSMutableString alloc] init];
+    for (NSInteger i = 0; i < idCode.length - 6; i++) {
+        [secretCode appendString:@"*"];
+    }
+    NSString *halfSecretCode = [mIdCode stringByReplacingCharactersInRange:NSMakeRange(5, mIdCode.length-6) withString:secretCode];
+    return halfSecretCode;
+}
+
+#pragma mark -- UITextFiledDelegate
+-(void)textFieldDidBeginEditing:(UITextField *)textField{
+    textField.clearsOnBeginEditing = NO;
+}
+
+//简单的输入限制 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string{
+    NSCharacterSet *cs = [[NSCharacterSet characterSetWithCharactersInString:ALPHANUM] invertedSet];
+    NSString *filtered = [[string componentsSeparatedByCharactersInSet:cs] componentsJoinedByString:@""];
+    return [string isEqualToString:filtered];
+}
+
+
+@end

iCemarose/Class/UI/ShopCart/KWMPaySuccessVC.m

@@ -24,7 +24,7 @@
     self.title = @"支付成功";
     
     [[KWMShopCartData alloc] removeAllItems];
-    
+    [self.userDao deleteCheckoutCache];
     [self initButton];
 }
 

iCemarose/Class/Util/KWMPayUtil.h

@@ -25,6 +25,9 @@
 //构建支付宝下单数据
 + (NSDictionary *) aliPayParameters:(BUYCheckout *)checkout;
 
+//构建支付结果查询数据
++(NSDictionary *)payResultParameters:(BUYCheckout *)checkout;
+
 //调用微信SDK
 + (void)weChatPay:(KWMWechatPayData *)wechatData;
 

iCemarose/Class/Util/KWMPayUtil.m

@@ -26,6 +26,8 @@
         case TypeAlipay:
             payTypeString = @"支付宝支付";
             break;
+        case TypeWebpay:
+            payTypeString = @"网页支付";
     }
     return payTypeString;
 }
@@ -33,8 +35,8 @@
 +(NSDictionary *)wechatPayParameters:(BUYCheckout *)checkout{
     //这是测试商店的单，先用来测试
 #if DEBUG
-    NSString *checkout_token = @"bfa0423b2b51657098d581a93e78bc00";
-    NSString *total_price = @"127.00";
+    NSString *checkout_token = checkout.token;
+    NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
     //先写test，后面改成正式的订单描述
     NSString *subject = @"test";
 #else
@@ -62,8 +64,8 @@
 +(NSDictionary *)aliPayParameters:(BUYCheckout *)checkout{
     //这是测试商店的单，先用来测试
 #if DEBUG
-    NSString *checkout_token = @"bfa0423b2b51657098d581a93e78bc00";
-    NSString *total_price = @"127.00";
+    NSString *checkout_token = checkout.token;
+    NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
     NSString *subject = @"test";
 #else
     NSString *checkout_token = checkout.token;
@@ -85,6 +87,27 @@
     return parameters;
 }
 
+//现在在两个地方会用到这条api
+//1,支付后切换回到APP
+//2,beforepay创建/复用旧checkout时，判断该checkout是否被支付了，但是之前没清空。
++(NSDictionary *)payResultParameters:(BUYCheckout *)checkout{
+#if DEBUG
+    NSString *checkout_token = checkout.token;
+#else
+    NSString *checkout_token = checkout.token;
+#endif
+    NSString *before_sign = [NSString stringWithFormat:@"checkout_token=%@&key=%@",
+                             checkout_token,User_Pay_KEY];
+    NSString *base64String = [KWMStringUtil BASE64:before_sign];
+    NSString *sign = [KWMStringUtil MD5:base64String];
+    
+    NSDictionary *parameters = @{
+                                 @"checkout_token":checkout_token,
+                                 @"sign":sign
+                                 };
+    return parameters;
+}
+
 +(void)weChatPay:(KWMWechatPayData *)wechatData{
     if(wechatData){
         PayReq *request = [[PayReq alloc] init];

iCemarose/Header-Prefix.h

@@ -60,23 +60,22 @@
 
 #define User_Pay_KEY @"bd3f58f5cd3d7a217ac8c8e655ab52f8"
 
-////
-////测试
-//#define TestModel @"YES"
-//
-////Shopify对应的key（测试用）
-//#define Shopify_SHOP_DOMAIN @"cemarose-dev.myshopify.com"
-//#define Shopify_API_KEY @"85287d2c9762a425bacd31424928a4e6"
-//#define Shopify_APP_ID @"8"
-
-//正式
-#define TestModel @"NO"
+//测试
+#define TestModel @"YES"
 
-//Shopify对应的key（正式）
-#define Shopify_SHOP_DOMAIN @"cemarose.myshopify.com"
-#define Shopify_API_KEY @"c2f6fae97741ea6db4cad7ae8f70fef3"
+//Shopify对应的key（测试用）
+#define Shopify_SHOP_DOMAIN @"cemarose-test.myshopify.com"
+#define Shopify_API_KEY @"4f34b3c32f4297386fc4fdaee7ef2bce"
 #define Shopify_APP_ID @"8"
 
+////正式
+//#define TestModel @"NO"
+//
+////Shopify对应的key（正式）
+//#define Shopify_SHOP_DOMAIN @"cemarose.myshopify.com"
+//#define Shopify_API_KEY @"c2f6fae97741ea6db4cad7ae8f70fef3"
+//#define Shopify_APP_ID @"8"
+
 //软键盘输入限制
 #define NUM @"0123456789"
 #define ALPHA @"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"