快递柜改造bug

app/src/main/java/com/emato/ich/entity/vo/PreparedOrderResponseVo.java

@@ -13,6 +13,16 @@ public class PreparedOrderResponseVo {
 
     private String lockerName;
 
+    private String pickUp;
+
+    public String getPickUp() {
+        return pickUp;
+    }
+
+    public void setPickUp(String pickUp) {
+        this.pickUp = pickUp;
+    }
+
     public String getOrderSn() {
         return orderSn;
     }

app/src/main/java/com/emato/ich/entity/vo/PreparedOrderVo.java

@@ -36,6 +36,18 @@ public class PreparedOrderVo {
      * 用户投递码
      */
     private String deliveryCode;
+    /**
+     * 订单类型  0:门店寄件 1:寄送订单 2:快递员派件
+     */
+    private String orderType;
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
 
     public String getDeliveryCode() {
         return deliveryCode;

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

@@ -175,6 +175,7 @@ public class CollectMaterialsFragment extends Fragment {
                                            ToastUtils.make(getContext(), "取件成功！");
                                            Bundle bundle = new Bundle();
                                            bundle.putString("mailNo", mailNo);
+                                           bundle.putString("pickUp", responseData.getData().getPickUp());
                                            bundle.putString("takeCabinetNo", responseData.getData().getLockerName());
                                            ((MainActivity) getActivity()).getBundleMap().put(ExpressSendOrderPickUpDto.class.getName(), bundle);
                                            if (null != timer) {

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

@@ -91,8 +91,9 @@ public class InputInfoKeyBoardFragment extends Fragment {
 
         Bundle arguments = null;
         String sectionType = null;
+        MainActivity activity = (MainActivity) getActivity();
+        String loginType = activity.getBundleMap().get(CourierFragment.class.getName()).getString("loginType");
         try {
-            MainActivity activity = (MainActivity) getActivity();
             arguments = activity.getBundleMap().get(ChooseCabinetFragment.class.getName());
             sectionType = arguments.getString("section_type");
             binding.mailNo.setInputType(InputType.TYPE_NULL);   
@@ -100,7 +101,6 @@ public class InputInfoKeyBoardFragment extends Fragment {
             activity.scanGunKeyEventHelper = new ScanGunKeyEventHelper(s -> {
                 // 扫码成功回调
                 Log.d(TAG, "onScanSuccess: " + s);
-                String loginType = activity.getBundleMap().get(CourierFragment.class.getName()).getString("loginType");
                 Log.d(TAG, "onScanSuccess: " + loginType);
                 if (!StringUtils.isNullOrEmpty(s)) {
                     for (String pattern : ScanGunConstant.getPatterns()) {
@@ -202,7 +202,13 @@ public class InputInfoKeyBoardFragment extends Fragment {
                     preparedOrderVo.setCollectorPhone(phoneConfirm);
                     preparedOrderVo.setLockerType(finalSectionType);
                     preparedOrderVo.setDelivererPhone(LocalStorage.getInstance().getSession().getPhone());
-
+                    if("courier".equals(loginType)){
+                        preparedOrderVo.setOrderType("1");
+                    }else if("collect".equals(loginType)){
+                        preparedOrderVo.setOrderType("2");
+                    }else{
+                        preparedOrderVo.setOrderType("0");
+                    }
                     // 预下单
                     ICSPClient.preparedOrder(LocalStorage.getInstance().getSession().getToken(), preparedOrderVo, new Callback() {
                         @Override

app/src/main/res/values/strings.xml

@@ -67,7 +67,7 @@
     <string name="input_send_password">请输入投递人密码</string>
     <string name="input_recipients_phone">请输入收件人手机号</string>
     <string name="input_express_number">扫描快递单号</string>
-    <string name="input_payment_number">请扫描付款码支付</string>
+    <string name="input_payment_number">请出示支付宝或微信付款码，扫码支付</string>
     <string name="input_take_code">请输入取件码</string>
     <string name="android_take">取件码取件</string>
     <string name="wx_scan_take">微信扫码取件</string>
@@ -127,5 +127,5 @@
     <string name="delivery">我是派送员</string>
     <string name="courier_delivery">快递员派件</string>
     <string name="collect_materials">揽件</string>
-    <string name="store_delivery">门店派件</string>
+    <string name="store_delivery">投递</string>
 </resources>