admin update

admin/control/merchant.php

@@ -399,21 +399,17 @@ class merchantControl extends SystemControl
                         $insert['card_types'] = $param['card_type'];
                         $insert['quality'] = $quality;
                         $insert['pcode'] = $param['pcode'];
-                    }
-                    //删除旧费率
-                    $res = $model_merchant->delPrices(['mchid' => $mchid, 'quality' => $quality, 'pcode' => $param['pcode']]);
-                    if(!$res) {
-                        $trans->rollback();
-                        showMessage('删除旧费率失败');
-                    }
-                    $ret = true;
-                    //更新新费率
-                    if (!empty($insert)) {
+                        //删除旧费率
+                        $res = $model_merchant->delPrices(['mchid' => $mchid, 'quality' => $quality, 'pcode' => $param['pcode']]);
+                        if(!$res) {
+                            $trans->rollback();
+                            showMessage('删除旧费率失败');
+                        }
                         $ret = $model_merchant->table('merchant_price')->insert($insert);
-                    }
-                    if(!$ret) {
-                        $trans->rollback();
-                        showMessage('更新费率失败');
+                        if(!$ret) {
+                            $trans->rollback();
+                            showMessage('更新费率失败');
+                        }
                     }
                 }
                 $trans->commit();