注销 - step 3 - patch - 储值卡时的参数传递

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogOffBackFeeInfoAddActivity.java

@@ -106,16 +106,9 @@ public class LogOffBackFeeInfoAddActivity extends AppActivity {
         // 根据新接口参数名称映射
         params.put("bankName", bankTypes);  // 开户行名称 - 直接使用枚举值
         params.put("bankProvince",EnumBean.backKey(province, EnumBean.PROVINCE_TYPE));  // 开户行省份 - 转换为枚举值
-        // params.put("sell",sell);
         params.put("userName",binding.etUsername.getText().toString().trim());  // 持卡人姓名
         params.put("bankIdCode",binding.etBankNum.getText().toString().trim());  // 银行卡号
         params.put("userMobile",getIntent().getStringExtra("cusTel"));  // 持卡人手机号
-        // params.put("operateType","1");
-        // if ("PERSONAL_USER".equals(getIntent().getStringExtra("userType"))||"1".equals(getIntent().getStringExtra("userType"))){
-        //     params.put("cusType","1");
-        // }else {
-        //     params.put("cusType","2");
-        // }
         params.put("bankBranchName",binding.etBlanchBank.getText().toString());  // 开户行支行名称
 
         LogUtils.i(this.getClass().getSimpleName(), "退费账号添加参数: " + JSONObject.toJSONString(params));

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogOffBackFeeInfoListActivity.java

@@ -204,19 +204,57 @@ public class LogOffBackFeeInfoListActivity extends AppActivity implements OnRefr
                 @Override
                 public void onClick(View view) {
                     Intent intent = new Intent(LogOffBackFeeInfoListActivity.this, LogoutEtcStep3Activity.class);
-                    intent.putExtra("username", item.getUserName());
-                    intent.putExtra("bank", item.getBankName());
-                    intent.putExtra("bankBranch", item.getBankBranchName());
-                    intent.putExtra("bankNum", item.getBankIdCode());
-                    intent.putExtra("imgUrl1", getIntent().getStringExtra("imgUrl1"));
-                    intent.putExtra("imgUrl2", getIntent().getStringExtra("imgUrl2"));
-                    intent.putExtra("signId", item.getId());
-                    intent.putExtra("reason", getIntent().getStringExtra("reason"));
-                    intent.putExtra("etReason", getIntent().getStringExtra("etReason"));
+                    
+                    // 基础信息
                     intent.putExtra("content", getIntent().getStringExtra("content"));
                     intent.putExtra("hasCard", getIntent().getIntExtra("hasCard", 0));
                     intent.putExtra("hasOBU", getIntent().getIntExtra("hasOBU", 0));
                     intent.putExtra("isDamage", getIntent().getIntExtra("isDamage", 0));
+                    intent.putExtra("imgUrl1", getIntent().getStringExtra("imgUrl1"));
+                    intent.putExtra("imgUrl2", getIntent().getStringExtra("imgUrl2"));
+                    intent.putExtra("reason", getIntent().getStringExtra("reason"));
+                    intent.putExtra("etReason", getIntent().getStringExtra("etReason"));
+                    
+                    // 银行信息（从选择的退费信息中获取）
+                    // bankBranchName	开户行支行名称
+                    // bankIdCode	银行卡号
+                    // bankName	开户行名称
+                    // bankProvince	开户行省份
+                    intent.putExtra("bankName", EnumBean.backValue(item.getBankName(), EnumBean.BANK_TYPE));
+                    intent.putExtra("bankBranchName", item.getBankBranchName());
+                    intent.putExtra("bankIdCode", item.getBankIdCode());
+                    intent.putExtra("bankProvince", EnumBean.backKey(item.getBankProvince(), EnumBean.PROVINCE_TYPE));
+                    intent.putExtra("username", item.getUserName());
+                    intent.putExtra("signId", item.getId());
+
+                    // params.put("bankBranchName",binding.etBlanchBank.getText().toString());  // 开户行支行名称
+                    // params.put("bankIdCode",binding.etBankNum.getText().toString().trim());  // 银行卡号
+                    // params.put("bankName", bankTypes);  // 开户行名称 - 直接使用枚举值
+                    // params.put("bankProvince",EnumBean.backKey(province, EnumBean.PROVINCE_TYPE));  // 开户行省份 - 转换为枚举值
+                    
+                    // 传递办理人信息（从Step2传递过来）
+                    intent.putExtra("agentName", getIntent().getStringExtra("agentName"));
+                    intent.putExtra("agentIdNum", getIntent().getStringExtra("agentIdNum"));
+                    intent.putExtra("agentIdVld", getIntent().getStringExtra("agentIdVld"));
+                    intent.putExtra("agentAddress", getIntent().getStringExtra("agentAddress"));
+                    intent.putExtra("agentTel", getIntent().getStringExtra("agentTel"));
+                    intent.putExtra("agentIdCardFrontUrl", getIntent().getStringExtra("agentIdCardFrontUrl"));
+                    intent.putExtra("agentIdCardBackUrl", getIntent().getStringExtra("agentIdCardBackUrl"));
+                    intent.putExtra("agentProxyDocUrl", getIntent().getStringExtra("agentProxyDocUrl"));
+                    
+                    // 传递其他必要参数（从Step2传递过来）
+                    intent.putExtra("customerId", getIntent().getStringExtra("customerId"));
+                    intent.putExtra("userName", getIntent().getStringExtra("userName"));
+                    intent.putExtra("vehicleId", getIntent().getStringExtra("vehicleId"));
+                    
+                    // 传递违约金信息（从Step2传递过来）
+                    intent.putExtra("cancelAmount", getIntent().getLongExtra("cancelAmount", 0));
+                    intent.putExtra("needPayment", getIntent().getBooleanExtra("needPayment", false));
+                    
+                    // 传递设备信息（从Step2传递过来）
+                    intent.putExtra("hasDevice", getIntent().getBooleanExtra("hasDevice", false));
+                    
+                    LogUtils.i(this.getClass().getSimpleName(), "传递参数到Step3: " + JSONObject.toJSONString(intent.getExtras()));
                     startActivity(intent);
                 }
             });

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcStep3Activity.java

@@ -71,6 +71,7 @@ public class LogoutEtcStep3Activity extends AppActivity {
     private String bank;
     private String bankBranch;
     private String bankNum;
+    private String bankProvince;
     private String imgUrl1;
     private String imgUrl2;
     private String reason;
@@ -120,9 +121,10 @@ public class LogoutEtcStep3Activity extends AppActivity {
             imgUrl2 = getIntent().getStringExtra("imgUrl2");
             reason = getIntent().getStringExtra("reason");
             etReason = getIntent().getStringExtra("etReason");
-            bank = getIntent().getStringExtra("bank");
-            bankBranch = getIntent().getStringExtra("bankBranch");
-            bankNum = getIntent().getStringExtra("bankNum");
+            bank = getIntent().getStringExtra("bankName");
+            bankBranch = getIntent().getStringExtra("bankBranchName");
+            bankNum = getIntent().getStringExtra("bankIdCode");
+            bankProvince = getIntent().getStringExtra("bankProvince");
             
             // 接收办理人信息
             agentName = getIntent().getStringExtra("agentName");
@@ -394,7 +396,7 @@ public class LogoutEtcStep3Activity extends AppActivity {
             params.put("bankName", bank);
             params.put("bankBranchName", bankBranch);
             params.put("bankIdCode", bankNum);
-            params.put("bankProvince", ""); // 需要从银行信息中获取省份
+            params.put("bankProvince", bankProvince); // 需要从银行信息中获取省份
         }
 
         Log.i(this.getClass().getSimpleName(), "设备注销申请 请求参数:" + JSONObject.toJSONString(params));