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

iCemarose/Class/Util/KWMPayUtil.m

@@ -41,9 +41,9 @@
     NSString *subject = @"test";
 #else
     NSString *checkout_token = checkout.token;
-    //需要保留小数点后两位，以保持与后台一致，从而验证通过
+    //需要保留小数点后两位(包括小数点后的.00)，以保持与后台一致，从而验证通过
     NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
-    NSString *subject = @"Cemarose订单";
+    NSString *subject = [NSString stringWithFormat:@"Cemarose订单-%@",checkout.token];
 #endif
     NSString *ip_address = @"127.0.0.1";
     NSString *before_sign = [NSString stringWithFormat:@"checkout_token=%@&ip_address=%@&subject=%@&total_price=%@&key=%@",
@@ -69,9 +69,9 @@
     NSString *subject = @"test";
 #else
     NSString *checkout_token = checkout.token;
-    //需要保留小数点后两位，以保持与后台一致，从而验证通过
+    //需要保留小数点后两位(包括小数点后的.00)，以保持与后台一致，从而验证通过
     NSString *total_price = [NSString stringWithFormat:@"%.2f",checkout.totalPrice.floatValue];
-    NSString *subject = @"Cemarose订单";
+    NSString *subject = [NSString stringWithFormat:@"Cemarose订单-%@",checkout.token];
 #endif
     NSString *before_sign = [NSString stringWithFormat:@"checkout_token=%@&subject=%@&total_price=%@&key=%@",
                              checkout_token,subject,total_price,User_Pay_KEY];