huxiaoqiang 4 éve
szülő
commit
cbd55ab9e4

+ 5 - 15
lib/beans/pay_by_we_chat_bean_entity.dart

@@ -1,5 +1,4 @@
 import 'package:bbyyy/generated/json/base/json_convert_content.dart';
-import 'package:bbyyy/generated/json/base/json_field.dart';
 
 class PayByWeChatBeanEntity with JsonConvert<PayByWeChatBeanEntity> {
 	PayByWeChatBeanData data;
@@ -7,20 +6,11 @@ class PayByWeChatBeanEntity with JsonConvert<PayByWeChatBeanEntity> {
 }
 
 class PayByWeChatBeanData with JsonConvert<PayByWeChatBeanData> {
-	@JSONField(name: "return_code")
-	String returnCode;
-	@JSONField(name: "return_msg")
-	String returnMsg;
-	@JSONField(name: "nonce_str")
-	String nonceStr;
-	@JSONField(name: "result_code")
-	String resultCode;
-	@JSONField(name: "mch_id")
-	String mchId;
-	@JSONField(name: "prepay_id")
-	String prepayId;
+	String partnerid;
+	String prepayid;
+	String noncestr;
+	String timestamp;
 	String sign;
-	@JSONField(name: "trade_type")
-	String tradeType;
+	String package;
 	String appid;
 }

+ 15 - 23
lib/generated/json/pay_by_we_chat_bean_entity_helper.dart

@@ -18,29 +18,23 @@ Map<String, dynamic> payByWeChatBeanEntityToJson(PayByWeChatBeanEntity entity) {
 }
 
 payByWeChatBeanDataFromJson(PayByWeChatBeanData data, Map<String, dynamic> json) {
-	if (json['return_code'] != null) {
-		data.returnCode = json['return_code'].toString();
+	if (json['partnerid'] != null) {
+		data.partnerid = json['partnerid'].toString();
 	}
-	if (json['return_msg'] != null) {
-		data.returnMsg = json['return_msg'].toString();
+	if (json['prepayid'] != null) {
+		data.prepayid = json['prepayid'].toString();
 	}
-	if (json['nonce_str'] != null) {
-		data.nonceStr = json['nonce_str'].toString();
+	if (json['noncestr'] != null) {
+		data.noncestr = json['noncestr'].toString();
 	}
-	if (json['result_code'] != null) {
-		data.resultCode = json['result_code'].toString();
-	}
-	if (json['mch_id'] != null) {
-		data.mchId = json['mch_id'].toString();
-	}
-	if (json['prepay_id'] != null) {
-		data.prepayId = json['prepay_id'].toString();
+	if (json['timestamp'] != null) {
+		data.timestamp = json['timestamp'].toString();
 	}
 	if (json['sign'] != null) {
 		data.sign = json['sign'].toString();
 	}
-	if (json['trade_type'] != null) {
-		data.tradeType = json['trade_type'].toString();
+	if (json['package'] != null) {
+		data.package = json['package'].toString();
 	}
 	if (json['appid'] != null) {
 		data.appid = json['appid'].toString();
@@ -50,14 +44,12 @@ payByWeChatBeanDataFromJson(PayByWeChatBeanData data, Map<String, dynamic> json)
 
 Map<String, dynamic> payByWeChatBeanDataToJson(PayByWeChatBeanData entity) {
 	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['return_code'] = entity.returnCode;
-	data['return_msg'] = entity.returnMsg;
-	data['nonce_str'] = entity.nonceStr;
-	data['result_code'] = entity.resultCode;
-	data['mch_id'] = entity.mchId;
-	data['prepay_id'] = entity.prepayId;
+	data['partnerid'] = entity.partnerid;
+	data['prepayid'] = entity.prepayid;
+	data['noncestr'] = entity.noncestr;
+	data['timestamp'] = entity.timestamp;
 	data['sign'] = entity.sign;
-	data['trade_type'] = entity.tradeType;
+	data['package'] = entity.package;
 	data['appid'] = entity.appid;
 	return data;
 }

+ 5 - 5
lib/paegs/pay_page/pay_page.dart

@@ -547,11 +547,11 @@ class _PayPageState extends State<PayPage> with WidgetsBindingObserver {
         });
         payWithWeChat(
           appId: entity.data.appid,
-          partnerId: entity.data.mchId,
-          prepayId: entity.data.prepayId,
-          packageValue: 'Sign=WXPay',
-          nonceStr:entity.data.nonceStr,
-          timeStamp: DateTime.now().millisecondsSinceEpoch,
+          partnerId: entity.data.partnerid,
+          prepayId: entity.data.prepayid,
+          packageValue: entity.data.package,
+          nonceStr:entity.data.noncestr,
+          timeStamp: int.parse(entity.data.timestamp),
           sign: entity.data.sign,
         );
       }