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 e13f5df..6b7e368 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 @@ -49,6 +49,7 @@ public class PayActivity extends BaseActivity { } }; private int type; + private String cart_id; @Override protected int getLayoutResId() { @@ -135,6 +136,8 @@ public class PayActivity extends BaseActivity { 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 { } 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 { } 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() { diff --git a/app/src/main/java/com/sl/house_property/order/SettleActivity.java b/app/src/main/java/com/sl/house_property/order/SettleActivity.java index ddf0403..d4f7ca4 100644 --- a/app/src/main/java/com/sl/house_property/order/SettleActivity.java +++ b/app/src/main/java/com/sl/house_property/order/SettleActivity.java @@ -301,6 +301,9 @@ public class SettleActivity extends BaseActivity { 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(); }