From ecf2e87079e6473524438e67863770b50fcc145e Mon Sep 17 00:00:00 2001
From: houweibin <houweibin@kollway.com>
Date: Wed, 21 Jun 2017 16:25:30 +0800
Subject: [PATCH] 1，small fix
---
iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m | 8 +-------
iCemarose/Class/Util/KWMPayUtil.m | 10 ++++++----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
index a2557fd..c2be681 100644
--- a/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
+++ b/iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
@@ -607,6 +607,7 @@
-(void)validateOrderPayResult{
//微信支付，用户支付后，当用户没有点击完成按钮，而是直接使用home键，或者点击状态栏左上角返回APP订单页面时，微信的回调不会调用，而很容易出现订单结果丢失的情况，所以需要再确认一次订单是否完成。
//支付宝暂时没有这种问题。
+ //checkout与order暂无法直接关联，现该api一直返回未支付。
if(self.beforePayData && self.beforePayData.wechatPayData){
self.beforePayData.wechatPayData = nil;
__weak KWMBeforePayVC *weakSelf = self;
@@ -690,11 +691,4 @@
}
-//判断订单是否支付
--(void)requestCheckPay:(BUYCheckout *)checkout{
- [self showLoading];
-
-}
-
-
@end
diff --git a/iCemarose/Class/Util/KWMPayUtil.m b/iCemarose/Class/Util/KWMPayUtil.m
index 4143e07..f5bfd1a 100644
--- a/iCemarose/Class/Util/KWMPayUtil.m
+++ b/iCemarose/Class/Util/KWMPayUtil.m
@@ -39,8 +39,9 @@
NSString *subject = @"test";
#else
NSString *checkout_token = checkout.token;
- NSString *total_price = checkout.totalPrice.stringValue;
- NSString *subject = @"";
+ //需要保留小数点后两位，以保持与后台一致，从而验证通过
+ NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
+ NSString *subject = @"Cemarose订单";
#endif
NSString *ip_address = @"127.0.0.1";
NSString *before_sign = [NSString stringWithFormat:@"checkout_token=%@&ip_address=%@&subject=%@&total_price=%@&key=%@",
@@ -66,8 +67,9 @@
NSString *subject = @"test";
#else
NSString *checkout_token = checkout.token;
- NSString *total_price = checkout.totalPrice.stringValue;
- NSString *subject = @"";
+ //需要保留小数点后两位，以保持与后台一致，从而验证通过
+ NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
+ NSString *subject = @"Cemarose订单";
#endif
NSString *before_sign = [NSString stringWithFormat:@"checkout_token=%@&subject=%@&total_price=%@&key=%@",
checkout_token,subject,total_price,User_Pay_KEY];
--
libgit2 0.26.0