Merge branch 'cabinet_req_2023_05_04' of zyh/ich-android into cabinet_req_2023_05_04

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

@@ -38,6 +38,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -292,7 +293,7 @@ public class SendKeyBoardFragment extends Fragment {
                                         if ("store".equals(finalLoginType) || "courier".equals(finalLoginType)){
                                             Bundle isPayBundle = new Bundle();
                                             isPayBundle.putString("isPay",data.getIsPay());
-                                            isPayBundle.putString("payAmount",data.getPayAmount().toString());
+                                            isPayBundle.putString("payAmount", Objects.isNull(data.getPayAmount()) ? null : data.getPayAmount().toString());
                                             activity.getBundleMap().put(SendKeyBoardFragment.class.getName(), isPayBundle);
                                             // "30"为供应链账号，定为管理员账号
                                             if("store".equals(finalLoginType) ){
@@ -418,7 +419,7 @@ public class SendKeyBoardFragment extends Fragment {
                                         if ("store".equals(finalLoginType) || "courier".equals(finalLoginType)){
                                             Bundle isPayBundle = new Bundle();
                                             isPayBundle.putString("isPay",data.getIsPay());
-                                            isPayBundle.putString("payAmount",data.getPayAmount().toString());
+                                            isPayBundle.putString("payAmount",Objects.isNull(data.getPayAmount()) ? null : data.getPayAmount().toString());
                                             activity.getBundleMap().put(SendKeyBoardFragment.class.getName(), isPayBundle);
                                             // "30"为供应链账号，定为管理员账号
                                             if("store".equals(finalLoginType) ){