Merge branch 'cabinet_req_2023_05_04' of http://git.ds-bay.com/project/ich-android into cabinet_req_2023_05_04

app/src/main/java/com/emato/ich/fragment/ChooseCabinetFragment.java

@@ -287,71 +287,138 @@ public class ChooseCabinetFragment extends Fragment {
                         confirmOrderVo.setDecision(DecisionConstant.REOPEN_01);
                         confirmOrderVo.setClientId(BaseUtils.getClientId());
                         confirmOrderVo.setOrderSn(preparedOrderResponse.getOrderSn());
+                        String pageType = activity.getBundleMap().get(MainFragment.class.getName()).getString("pageType");
+                        if ("expressDelivery".equals(pageType)){
+                            ICSPClient.confirmOrder(confirmOrderVo, new Callback() {
+                                @Override
+                                public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                                    //
+                                    Looper.prepare();
+                                    ToastUtils.make(getContext(), "换柜子失败！网络异常！");
+                                    Looper.loop();
+                                    Log.e(TAG, "onFailure: 大小不合适, 换柜子更新预下单失败! ", e);
+                                    LoggingUtils.sendErrorLog("业务异常: 大小不合适, 换柜子更新预下单失败! ", e);
+                                }
 
-                        ICSPClient.confirmOrder(LocalStorage.getInstance().getSession().getToken(), confirmOrderVo, new Callback() {
-                            @Override
-                            public void onFailure(@NotNull Call call, @NotNull IOException e) {
-                                //
-                                Looper.prepare();
-                                ToastUtils.make(getContext(), "换柜子失败！网络异常！");
-                                Looper.loop();
-                                Log.e(TAG, "onFailure: 大小不合适, 换柜子更新预下单失败! ", e);
-                                LoggingUtils.sendErrorLog("业务异常: 大小不合适, 换柜子更新预下单失败! ", e);
-                            }
+                                @Override
+                                public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+                                    // 换柜子成功, 跳转到确认投递页面
+                                    ((MainActivity) getActivity()).runOnUiThread(() -> {
+                                        try {
+                                            String responseStr = ICSPClient.isSuccessfulAndParseResponse(response);
+                                            if (!StringUtils.isNullOrEmpty(responseStr)) {
+                                                ObjectMapper objectMapper = JacksonUtils.objectmapper;
+                                                ResponseData<PreparedOrderResponseVo> responseData = objectMapper.readValue(responseStr, new TypeReference<ResponseData<PreparedOrderResponseVo>>() {});
+                                                // 响应信息
+                                                if (responseData.getCode().equals(ICSPConstant.OK)) {
+                                                    PreparedOrderResponseVo data = responseData.getData();
+                                                    if (null != data) {
+                                                        data.setOrderSn(preparedOrderResponse.getOrderSn());
+                                                        data.setCollectorPhone(preparedOrderResponse.getCollectorPhone());
+                                                        String mailNo = expressDeliveryBundle.getString("takeNo");
+                                                        bundle.putString("preparedOrderResponse", objectMapper.writeValueAsString(data));
+                                                        bundle.putString("takeNo", mailNo);
+                                                        bundle.putString("section_type", data.getLockerName());
+
+                                                        // 跳转到确认投递
+                                                        try {
+                                                            MainActivity activity = (MainActivity) getActivity();
+                                                            activity.getBundleMap().put(InputInfoKeyBoardFragment.class.getName(), bundle);
+                                                            activity.getBundleMap().remove(ExceptionFragment.class.getName());
+                                                            if (null != timer) {
+                                                                timer.cancel();
+                                                            }
+                                                            NavUtils.navigate(ChooseCabinetFragment.this, R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment);
+                                                        } catch (RuntimeException e) {
+                                                            Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
+                                                            LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
+                                                        }
+                                                    }
+                                                } else {
+                                                    ToastUtils.make(getContext(), responseData.getMsg());
+                                                    RuntimeException exception = new RuntimeException("系统异常");
+                                                    Log.e(TAG, "onResponse: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
+                                                    LoggingUtils.sendErrorLog("业务异常: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
+                                                }
+                                            } else {
+                                                ToastUtils.make(getContext(), "服务器异常！请稍后重试！");
+                                            }
+                                        } catch (JsonProcessingException e) {
+                                            Log.e(TAG, "onResponse: 预下单转换成JSON出错! ", e);
+                                            LoggingUtils.sendErrorLog("业务异常: 预下单转换成JSON出错! ", e);
+                                        } catch (RuntimeException e) {
+                                            Log.e(TAG, "onResponse: 换柜子错误! ", e);
+                                            LoggingUtils.sendErrorLog("业务异常: 换柜子错误! ", e);
+                                        }
+                                    });
+                                }
+                            });
+                        }else {
+                            ICSPClient.confirmOrder(LocalStorage.getInstance().getSession().getToken(), confirmOrderVo, new Callback() {
+                                @Override
+                                public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                                    //
+                                    Looper.prepare();
+                                    ToastUtils.make(getContext(), "换柜子失败！网络异常！");
+                                    Looper.loop();
+                                    Log.e(TAG, "onFailure: 大小不合适, 换柜子更新预下单失败! ", e);
+                                    LoggingUtils.sendErrorLog("业务异常: 大小不合适, 换柜子更新预下单失败! ", e);
+                                }
 
-                            @Override
-                            public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
-                                // 换柜子成功, 跳转到确认投递页面
-                                ((MainActivity) getActivity()).runOnUiThread(() -> {
-                                    try {
-                                        String responseStr = ICSPClient.isSuccessfulAndParseResponse(response);
-                                        if (!StringUtils.isNullOrEmpty(responseStr)) {
-                                            ObjectMapper objectMapper = JacksonUtils.objectmapper;
-                                            ResponseData<PreparedOrderResponseVo> responseData = objectMapper.readValue(responseStr, new TypeReference<ResponseData<PreparedOrderResponseVo>>() {});
-                                            // 响应信息
-                                            if (responseData.getCode().equals(ICSPConstant.OK)) {
-                                                PreparedOrderResponseVo data = responseData.getData();
-                                                if (null != data) {
-                                                    data.setOrderSn(preparedOrderResponse.getOrderSn());
-                                                    data.setCollectorPhone(preparedOrderResponse.getCollectorPhone());
-                                                    String mailNo = inputInfoBundle.getString("takeNo");
-                                                    bundle.putString("preparedOrderResponse", objectMapper.writeValueAsString(data));
-                                                    bundle.putString("takeNo", mailNo);
-                                                    bundle.putString("section_type", data.getLockerName());
-
-                                                    // 跳转到确认投递
-                                                    try {
-                                                        MainActivity activity = (MainActivity) getActivity();
-                                                        activity.getBundleMap().put(InputInfoKeyBoardFragment.class.getName(), bundle);
-                                                        activity.getBundleMap().remove(ExceptionFragment.class.getName());
-                                                        if (null != timer) {
-                                                            timer.cancel();
+                                @Override
+                                public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+                                    // 换柜子成功, 跳转到确认投递页面
+                                    ((MainActivity) getActivity()).runOnUiThread(() -> {
+                                        try {
+                                            String responseStr = ICSPClient.isSuccessfulAndParseResponse(response);
+                                            if (!StringUtils.isNullOrEmpty(responseStr)) {
+                                                ObjectMapper objectMapper = JacksonUtils.objectmapper;
+                                                ResponseData<PreparedOrderResponseVo> responseData = objectMapper.readValue(responseStr, new TypeReference<ResponseData<PreparedOrderResponseVo>>() {});
+                                                // 响应信息
+                                                if (responseData.getCode().equals(ICSPConstant.OK)) {
+                                                    PreparedOrderResponseVo data = responseData.getData();
+                                                    if (null != data) {
+                                                        data.setOrderSn(preparedOrderResponse.getOrderSn());
+                                                        data.setCollectorPhone(preparedOrderResponse.getCollectorPhone());
+                                                        String mailNo = inputInfoBundle.getString("takeNo");
+                                                        bundle.putString("preparedOrderResponse", objectMapper.writeValueAsString(data));
+                                                        bundle.putString("takeNo", mailNo);
+                                                        bundle.putString("section_type", data.getLockerName());
+
+                                                        // 跳转到确认投递
+                                                        try {
+                                                            MainActivity activity = (MainActivity) getActivity();
+                                                            activity.getBundleMap().put(InputInfoKeyBoardFragment.class.getName(), bundle);
+                                                            activity.getBundleMap().remove(ExceptionFragment.class.getName());
+                                                            if (null != timer) {
+                                                                timer.cancel();
+                                                            }
+                                                            NavUtils.navigate(ChooseCabinetFragment.this, R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment);
+                                                        } catch (RuntimeException e) {
+                                                            Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
+                                                            LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
                                                         }
-                                                        NavUtils.navigate(ChooseCabinetFragment.this, R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment);
-                                                    } catch (RuntimeException e) {
-                                                        Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
-                                                        LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
                                                     }
+                                                } else {
+                                                    ToastUtils.make(getContext(), responseData.getMsg());
+                                                    RuntimeException exception = new RuntimeException("系统异常");
+                                                    Log.e(TAG, "onResponse: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
+                                                    LoggingUtils.sendErrorLog("业务异常: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
                                                 }
                                             } else {
-                                                ToastUtils.make(getContext(), responseData.getMsg());
-                                                RuntimeException exception = new RuntimeException("系统异常");
-                                                Log.e(TAG, "onResponse: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
-                                                LoggingUtils.sendErrorLog("业务异常: ICSP返回码: " + responseData.getCode() + ", 返回信息: " + responseData.getMsg(), exception);
+                                                ToastUtils.make(getContext(), "服务器异常！请稍后重试！");
                                             }
-                                        } else {
-                                            ToastUtils.make(getContext(), "服务器异常！请稍后重试！");
+                                        } catch (JsonProcessingException e) {
+                                            Log.e(TAG, "onResponse: 预下单转换成JSON出错! ", e);
+                                            LoggingUtils.sendErrorLog("业务异常: 预下单转换成JSON出错! ", e);
+                                        } catch (RuntimeException e) {
+                                            Log.e(TAG, "onResponse: 换柜子错误! ", e);
+                                            LoggingUtils.sendErrorLog("业务异常: 换柜子错误! ", e);
                                         }
-                                    } catch (JsonProcessingException e) {
-                                        Log.e(TAG, "onResponse: 预下单转换成JSON出错! ", e);
-                                        LoggingUtils.sendErrorLog("业务异常: 预下单转换成JSON出错! ", e);
-                                    } catch (RuntimeException e) {
-                                        Log.e(TAG, "onResponse: 换柜子错误! ", e);
-                                        LoggingUtils.sendErrorLog("业务异常: 换柜子错误! ", e);
-                                    }
-                                });
-                            }
-                        });
+                                    });
+                                }
+                            });
+                        }
                     }
                 }
             } else {

app/src/main/java/com/emato/ich/fragment/CollectMaterialsFragment.java

@@ -138,7 +138,7 @@ public class CollectMaterialsFragment extends Fragment {
                    ExpressSendOrderPickUpDto expressSendOrderPickUpDto = new ExpressSendOrderPickUpDto();
                    expressSendOrderPickUpDto.setExprSn(mailNo);
                    expressSendOrderPickUpDto.setCabSn(BaseUtils.getClientId());
-
+                   expressSendOrderPickUpDto.setReopen("0");
                    ICSPClient.takeParcelByExpressNo(LocalStorage.getInstance().getSession().getToken(), expressSendOrderPickUpDto, new Callback() {
                        @Override
                        public void onFailure(@NotNull Call call, @NotNull IOException e) {

app/src/main/java/com/emato/ich/fragment/TakeSuccessFragment.java

@@ -159,6 +159,7 @@ public class TakeSuccessFragment extends Fragment {
             String materTakeParcelCode = null;
             String navigatePage = null;
             MainActivity activity = null;
+            String pickUp = null;
             try {
                 activity = (MainActivity) getActivity();
                 // 取件码页面跳转
@@ -169,6 +170,7 @@ public class TakeSuccessFragment extends Fragment {
                 // 快递员揽件页面跳转页面
 //                Bundle materBundle = activity.getBundleMap().get(ExpressSendOrderPickUpDto.class.getName());
                 takeParcelCode = continueTakeBundle.getString("takeParcelCode");
+                pickUp = continueTakeBundle.getString("pickUp");
                 materTakeParcelCode = continueTakeBundle.getString("mailNo");
                 if (StringUtils.isNullOrEmpty(takeParcelCode)){
                     takeParcelCode = activity.getBundleMap().get(ExpressSendOrderPickUpDto.class.getName()).getString("pickUp");
@@ -180,7 +182,7 @@ public class TakeSuccessFragment extends Fragment {
             }
             TakeParcelVo takeParcelVo = new TakeParcelVo();
             takeParcelVo.setClientId(BaseUtils.getClientId());
-            takeParcelVo.setPickUp(takeParcelCode);
+            takeParcelVo.setPickUp(StringUtils.isNullOrEmpty(pickUp) ? takeParcelCode : pickUp);
             takeParcelVo.setReopen("1");
             MainActivity finalActivity = activity;
 
@@ -244,7 +246,7 @@ public class TakeSuccessFragment extends Fragment {
                 ExpressSendOrderPickUpDto expressSendOrderPickUpDto = new ExpressSendOrderPickUpDto();
                 expressSendOrderPickUpDto.setExprSn(materTakeParcelCode);
                 expressSendOrderPickUpDto.setCabSn(BaseUtils.getClientId());
-
+                expressSendOrderPickUpDto.setReopen("1");
                 ICSPClient.takeParcelByExpressNo(LocalStorage.getInstance().getSession().getToken(), expressSendOrderPickUpDto, new Callback() {
                     @Override
                     public void onFailure(@NotNull Call call, @NotNull IOException e) {