From 54dff35e6b0635449da780ac54b96fe7d7860f42 Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Wed, 27 Jan 2021 09:47:51 +0800
Subject: [PATCH] 1

---
 app/src/main/java/com/sl/house_property/MainFragment.java | 8 ++++++--
 .../java/com/sl/house_property/order/OrderActivity.java   | 1 +
 .../com/sl/house_property/order/OrderDetailActivity.java  | 1 +
 .../java/com/sl/house_property/order/PayActivity.java     | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java
index 158422b..bcc3f57 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -341,7 +341,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
 
         MainTabActivity activity = (MainTabActivity) getActivity();
         activity.registerMyOnTouchListener(this);
-        RegisterUser user =
+        final RegisterUser user =
                 Config.getInstance(getActivity()).getUser();
         Map<String, String> map = new HashMap<>();
         if (user != null) {
@@ -357,7 +357,11 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
         mDataBinding.service.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(getContext(), PropertyActivity.class);
+//                Intent intent = new Intent(getContext(), PropertyActivity.class);
+//                startActivity(intent);
+                Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
+                intent.putExtra("userId", user.getUserid());
+                intent.putExtra("userName", user.getNickname());
                 startActivity(intent);
             }
         });
diff --git a/app/src/main/java/com/sl/house_property/order/OrderActivity.java b/app/src/main/java/com/sl/house_property/order/OrderActivity.java
index e0f6200..8fae9ef 100644
--- a/app/src/main/java/com/sl/house_property/order/OrderActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/OrderActivity.java
@@ -207,6 +207,7 @@ public class OrderActivity extends BaseActivity<ActivityOrderBinding> {
                             //付款
                             Intent intent = new Intent(context, PayActivity.class);
                             intent.putExtra("payment_amount", orderListBean.getOrder_money());
+                            intent.putExtra("order_number",orderListBean.getOrder_number());
                             startActivityForResult(intent, 18);
                         } else if (b.btnFk.getText().equals("取消订单")) {
                             new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
diff --git a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
index 0abfe6d..ad2bb19 100644
--- a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
@@ -198,6 +198,7 @@ public class OrderDetailActivity extends BaseActivity<ActivityOrderDetailBinding
                     //付款
                     Intent intent = new Intent(context, PayActivity.class);
                     intent.putExtra("payment_amount", orderListBean.getOrder_money());
+                    intent.putExtra("order_number",orderListBean.getOrder_number());
                     startActivityForResult(intent, 18);
                 } else if (mDataBinding.btnFk.getText().equals("取消订单")) {
                     new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
diff --git a/app/src/main/java/com/sl/house_property/order/PayActivity.java b/app/src/main/java/com/sl/house_property/order/PayActivity.java
index 6b7e368..3a259f3 100644
--- a/app/src/main/java/com/sl/house_property/order/PayActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/PayActivity.java
@@ -33,6 +33,7 @@ import utils.Md5;
 public class PayActivity extends BaseActivity<ActivityPayBinding> {
     private Context context;
     private String payment_amount;
+    private String order_number;
     private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent1) {
@@ -77,7 +78,7 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
         mDataBinding.tvTitle.setText("支付");
         type = intent.getIntExtra("type", 0);
         payment_amount = intent.getStringExtra("payment_amount");
-
+        order_number=intent.getStringExtra("order_number");
         String wallet = intent.getStringExtra("wallet");
         mDataBinding.tv.setText("钱包支付(余额 ¥" + wallet + ")");
         mDataBinding.tvAmount.setText(payment_amount);
@@ -161,6 +162,7 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
         map.put("app", "System");
         map.put("class", "OrderPrePayId");
         map.put("amount", payment_amount);
+        map.put("order_number", order_number);
         map.put("sign", Md5.md5("System" + "OrderPrePayId" + Md5.secret));
         loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
             @Override