admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
jinyuer
2021-01-20 16:40:20 +08:00
parent 6973347c61
commit 6496125e29
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/sl/house_property/order/PayActivity.java
View File

@@ -49,6 +49,7 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
}
};
private int type;
private String cart_id;
@Override
protected int getLayoutResId() {
@@ -135,6 +136,8 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction("PaySuccess");
registerReceiver(receiver, intentFilter);
cart_id = getIntent().getStringExtra("cart_id");
}
@Override
@@ -152,6 +155,9 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
} else {
map.put("userid", 0 + "");
}
if (cart_id != null) {
map.put("cart_ids", cart_id);
}
map.put("app", "System");
map.put("class", "OrderPrePayId");
map.put("amount", payment_amount);
@@ -193,6 +199,7 @@ public class PayActivity extends BaseActivity<ActivityPayBinding> {
}
map.put("app", "Order");
map.put("class", "PayBalance");
map.put("order_number", payment_amount);
map.put("sign", Md5.md5("Order" + "PayBalance" + Md5.secret));
loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {

3
app/src/main/java/com/sl/house_property/order/SettleActivity.java
View File

@@ -301,6 +301,9 @@ public class SettleActivity extends BaseActivity<ActivitySettleBinding> {
JSONObject jsonObject = new JSONObject(s);
String order_number = jsonObject.getString("order_number");
intent.putExtra("order_number", order_number);
if (goodsType==2){
intent.putExtra("cart_id",cart_id);
}
} catch (JSONException e) {
e.printStackTrace();
}