diff --git a/app/src/main/java/com/bonus/canteen/activity/InitializationActivity.java b/app/src/main/java/com/bonus/canteen/activity/InitializationActivity.java
index 1b82515..5c30b2f 100644
--- a/app/src/main/java/com/bonus/canteen/activity/InitializationActivity.java
+++ b/app/src/main/java/com/bonus/canteen/activity/InitializationActivity.java
@@ -190,7 +190,14 @@ public class InitializationActivity extends BaseActivity<InitializationMainBindi
 
     private void initRightDate() {
         String[] ethernetDns = getEthernetDns(this);
-        binding.intRight.iniSn.setText(getImei());
+        String imei = "";
+        try {
+            imei = getImei();
+        }catch (Exception e){
+            imei = "获取失败IMEI";
+            Log.e(TAG, "获取IMEI异常: " + e.getMessage());
+        }
+        binding.intRight.iniSn.setText(imei);
         binding.intRight.iniNetworkType.setText(getNetworkType(this));
         binding.intRight.iniNetworkIp.setText(getIP(this));
         binding.intRight.iniSubMask.setText(getSubnetMask());
diff --git a/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java b/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
index 3998ee1..abf96a5 100644
--- a/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
+++ b/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
@@ -140,6 +140,8 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
     private View decorView = null;
     private PopupWindow mPopupWindow = null;
 
+    boolean isPayShow = false;
+
     @Override
     protected ActivityCanteenOperationBinding viewBindingInflate(LayoutInflater inflater) {
         return ActivityCanteenOperationBinding.inflate(inflater);
@@ -369,15 +371,17 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
                             });
                         } else {
                             runOnUiThread(() -> {
+                                closePayWay();
+                                delOrder(orderId);
                                 XToastUtils.error(firstJson.getString("msg"));
                                 SoundManager.getInstance().play(Sound.createSimpleSound(R.raw.pay_fail));
-                                closePayWay();
                             });
                         }
                     } else {
+                        closePayWay();
+                        delOrder(orderId);
                         SoundManager.getInstance().play(Sound.createSimpleSound(R.raw.pay_fail));
                         runOnUiThread(() -> XToastUtils.error("支付出错"));
-                        closePayWay();
                     }
                 } else {
                     businessDataInfo.setOfflineMoney(new BigDecimal(binding.salesAmountDue.getText().toString()).add(new BigDecimal(businessDataInfo.getOfflineMoney())) + "");
@@ -405,6 +409,15 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
 
     }
 
+    private void delOrder(String orderId) {
+        ThreadPoolManager.getExecutor().execute(() -> {
+            OfflineOrderInfo o1 = new OfflineOrderInfo();
+            o1.setOrderId(orderId);
+            AppDatabase.getDatabase(this).offlineOrderDao().delete(o1);
+            AppDatabase.getDatabase(this).orderDetailsDao().deleteByOrderId(orderId);
+        });
+    }
+
     /**
      * 判断账户信息
      *
@@ -1233,6 +1246,7 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
         binding.keyboardMain.findViewById(R.id.tv_ok).setOnClickListener(view -> {
             if (premiumAmount.toString().isEmpty() && !salesMenuEntityList.isEmpty()) {
                 //弹出支付弹窗   可取消支付 或  记账
+                if(isPayShow) return;
                 openDialog();
                 SoundManager.getInstance().play(Sound.createSimpleSound(R.raw.please_pay));
                 openPayWay("pay");
@@ -1434,6 +1448,7 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
     }
 
     public void openDialog() {
+        isPayShow = true;
         AlertDialog.Builder builder = new AlertDialog.Builder(OperationActivity.this);
         View view = LayoutInflater.from(OperationActivity.this).inflate(R.layout.dialog_wait_for_payment, null);
         TextView tipTitle = view.findViewById(R.id.tip_title);
@@ -1469,6 +1484,7 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
         myPresentation.closeScan();
         alertDialog.dismiss();
         alertDialog = null;
+        isPayShow = false;
     }
 
     int code = 0;
diff --git a/app/src/main/java/com/bonus/canteen/activity/setting/ParamSettingsActivity.java b/app/src/main/java/com/bonus/canteen/activity/setting/ParamSettingsActivity.java
index f082720..4fda0a8 100644
--- a/app/src/main/java/com/bonus/canteen/activity/setting/ParamSettingsActivity.java
+++ b/app/src/main/java/com/bonus/canteen/activity/setting/ParamSettingsActivity.java
@@ -110,14 +110,16 @@ public class ParamSettingsActivity extends BaseActivity<ActivityCanteenParamSett
     protected void initData() {
         ThreadPoolManager.getExecutor().execute(() -> {
             paramSettingInfo = AppDatabase.getDatabase(this).parameterInfoDao().getOneInfo();
-            binding.ipAddress.setText(paramSettingInfo.getIpAddress());
-            binding.mqttAddress.setText(paramSettingInfo.getMqttAddress());
-            binding.mqttUserName.setText(paramSettingInfo.getMqttUserName());
-            binding.mqttPassWord.setText(paramSettingInfo.getMqttPassword());
-            binding.appId.setText(paramSettingInfo.getAppId());
-            binding.appKey.setText(paramSettingInfo.getAppKey());
-            binding.facePassRate.setText(paramSettingInfo.getFacePassRate());
-            binding.photoPrefix.setText(paramSettingInfo.getPhotoPrefixes());
+            if (paramSettingInfo != null){
+                binding.ipAddress.setText(paramSettingInfo.getIpAddress());
+                binding.mqttAddress.setText(paramSettingInfo.getMqttAddress());
+                binding.mqttUserName.setText(paramSettingInfo.getMqttUserName());
+                binding.mqttPassWord.setText(paramSettingInfo.getMqttPassword());
+                binding.appId.setText(paramSettingInfo.getAppId());
+                binding.appKey.setText(paramSettingInfo.getAppKey());
+                binding.facePassRate.setText(paramSettingInfo.getFacePassRate());
+                binding.photoPrefix.setText(paramSettingInfo.getPhotoPrefixes());
+            }
         });
     }
 
diff --git a/app/src/main/java/com/bonus/canteen/db/dao/base/OrderDetailsDao.java b/app/src/main/java/com/bonus/canteen/db/dao/base/OrderDetailsDao.java
index 12ac25b..76af7ae 100644
--- a/app/src/main/java/com/bonus/canteen/db/dao/base/OrderDetailsDao.java
+++ b/app/src/main/java/com/bonus/canteen/db/dao/base/OrderDetailsDao.java
@@ -29,6 +29,10 @@ public interface OrderDetailsDao {
     @Delete
     void delete(OrderDetailsInfo orderInfo); // 删除数据
 
+    @Query("delete from order_details_info where orderId =:orderId")
+    void deleteByOrderId(String orderId); // 删除数据
+
+
     @Query("delete  from order_details_info")
     void deleteAll(); // 删除数据
 
diff --git a/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java b/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java
index a41f785..5710d12 100644
--- a/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java
+++ b/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java
@@ -29,7 +29,7 @@ public class WorkConfig {
     protected static String baseUrl = "http://36.33.26.201:48380/smart-canteen";
     protected static String prefixesUrl = "http://36.33.26.201:48380";
 
-    protected static String fileUrl = "http://192.168.0.14:9090/lnyst/";
+    protected static String fileUrl = "http://36.33.26.201:48380/lnyst/";
 
     private static String updateUrl = "https://www.baidu.com";
     private static String serverUri = "tcp://36.33.26.201:51883";
@@ -42,15 +42,17 @@ public class WorkConfig {
     static {
         ThreadPoolManager.getExecutor().execute(()->{
             ParamSettingInfo paramSettingInfo = AppDatabase.getDatabase(getApplication()).parameterInfoDao().getOneInfo();
-            baseUrl = paramSettingInfo.getIpAddress() + "/smart-canteen";
-            prefixesUrl = paramSettingInfo.getIpAddress();
-            serverUri = paramSettingInfo.getMqttAddress();
-            fileUrl = paramSettingInfo.getPhotoPrefixes();
-            APP_ID = paramSettingInfo.getAppId();
-            APP_KEY = paramSettingInfo.getAppKey();
-            MqttUserName = paramSettingInfo.getMqttUserName();
-            MqttPassWord = paramSettingInfo.getMqttPassword();
-            FACE_PASS_RATE = paramSettingInfo.getFacePassRate();
+            if (paramSettingInfo != null){
+                baseUrl = paramSettingInfo.getIpAddress() + "/smart-canteen";
+                prefixesUrl = paramSettingInfo.getIpAddress();
+                serverUri = paramSettingInfo.getMqttAddress();
+                fileUrl = paramSettingInfo.getPhotoPrefixes();
+                APP_ID = paramSettingInfo.getAppId();
+                APP_KEY = paramSettingInfo.getAppKey();
+                MqttUserName = paramSettingInfo.getMqttUserName();
+                MqttPassWord = paramSettingInfo.getMqttPassword();
+                FACE_PASS_RATE = paramSettingInfo.getFacePassRate();
+            }
         });
     }