1. 固定面值卡提示不可充值。

FMVip_LXJ/task/fmtask.cpp

@@ -52,6 +52,7 @@ QByteArray FMTask::doTask()
         }
     }
 
+    setError(FM_API_SUCCESS);
     QJsonDocument json(posRspJsonObj);
     return json.toJson(QJsonDocument::Compact);
 }
@@ -89,9 +90,12 @@ void FMTask::showWindow()
      }
 
     if(_window != nullptr) {
-        _window->initWnd(this->session());
-        int ret = _window->exec();
-        if(ret == -1) {
+        if(_window->initWnd(this->session())) {
+            int ret = _window->exec();
+            if(ret == -1) {
+                setError(FM_API_WINDOWCLOSE);
+            }
+        } else {
             setError(FM_API_WINDOWCLOSE);
         }
     }

FMVip_LXJ/windows/fmvipfund.cpp

@@ -29,7 +29,7 @@ FMVipFund::~FMVipFund()
     delete ui;
 }
 
-void FMVipFund::initWnd(Session *session)
+bool FMVipFund::initWnd(Session *session)
 {
     _session = session;
 
@@ -43,13 +43,15 @@ void FMVipFund::initWnd(Session *session)
 
     double max_recharge = session->data(PosProps.Max_recharge_value).toInt() / 100.0;
     double min_recharge = session->data(PosProps.Min_recharge_value).toInt() / 100.0;
+    if(max_recharge == min_recharge && min_recharge != 0) {
+        FMMsgWnd::FailureWnd("此卡不可充值!");
+        return false;
+    }
     for (auto &btn : _digit_group->buttons()) {
         QString digit = btn->text();
         digit = digit.replace("￥", "");
-        if(digit.toDouble() > max_recharge) {
-            btn->setEnabled(false);
-        }
-        if(digit.toDouble() < min_recharge) {
+        double digit_amount = digit.toDouble();
+        if(digit_amount < min_recharge || digit_amount > max_recharge) {
             btn->setEnabled(false);
         }
     }
@@ -65,6 +67,7 @@ void FMVipFund::initWnd(Session *session)
     ui->point_label->setText(QString::number(session->data(PosProps.Score).toInt()));
 
     ui->fund_btn->setFocus();
+    return true;
 }
 
 void FMVipFund::on_fund_btn_clicked()

FMVip_LXJ/windows/fmvipfund.h

@@ -21,7 +21,7 @@ public:
     ~FMVipFund();
 
 
-    void    initWnd(Session *session);
+    bool initWnd(Session *session);
 signals:
     void    fund();
 public slots:

FMVip_LXJ/windows/fmviplogin.cpp

@@ -64,7 +64,7 @@ void FMVipLogin::onActivateFinished()
     delete activateInfoWnd;
 }
 
-void FMVipLogin::initWnd(Session *session)
+bool FMVipLogin::initWnd(Session *session)
 {
     this->_session = session;
     QString version_info = getVersionInfo();
@@ -91,6 +91,7 @@ void FMVipLogin::initWnd(Session *session)
     } else if(!member_sign.isEmpty()) {
         qDebug() << "fmv:会员账号格式错误: " << member_sign;
     }
+    return true;
 }
 
 QString FMVipLogin::getVersionInfo()

FMVip_LXJ/windows/fmviplogin.h

@@ -23,7 +23,7 @@ public:
 
     QString getVersionInfo();
 
-    void    initWnd(Session *session);
+    bool initWnd(Session *session);
 protected:
     void    resetWnd();
 signals:

FMVip_LXJ/windows/fmviporder.cpp

@@ -24,7 +24,7 @@ FMVipOrder::~FMVipOrder()
     delete ui;
 }
 
-void FMVipOrder::initWnd(Session *session)
+bool FMVipOrder::initWnd(Session *session)
 {
     this->_session = session;
 
@@ -68,6 +68,7 @@ void FMVipOrder::initWnd(Session *session)
     QRegExp regexp("^[0-9]+(.[0-9]{2})?$");
     ui->pay_edit->setValidator(new QRegExpValidator(regexp));
     setWillPayText();
+    return true;
 }
 
 void FMVipOrder::on_pay_btn_clicked()

FMVip_LXJ/windows/fmviporder.h

@@ -18,7 +18,7 @@ public:
     explicit FMVipOrder(QDialog *parent = 0);
     ~FMVipOrder();
 
-    void initWnd(Session *session);
+    bool initWnd(Session *session);
     void initCouponItems();
     void setWillPayText();
 

FMVip_LXJ/windows/fmvippanel.cpp

@@ -19,7 +19,7 @@ FMVipPanel::~FMVipPanel()
     delete ui;
 }
 
-void FMVipPanel::initWnd(Session *session)
+bool FMVipPanel::initWnd(Session *session)
 {
     this->_session = session;
     ui->operator_label->setText(session->data(PosProps.OperatorId).toString());
@@ -37,6 +37,7 @@ void FMVipPanel::initWnd(Session *session)
     }
 
     ui->fund_btn->setFocus();
+    return true;
 }
 
 void FMVipPanel::on_fund_btn_clicked()

FMVip_LXJ/windows/fmvippanel.h

@@ -15,7 +15,7 @@ public:
     explicit FMVipPanel(QDialog *parent = 0);
     ~FMVipPanel();
 
-    void initWnd(Session* session);
+    bool initWnd(Session* session);
 
 public slots:
     void    on_fund_btn_clicked();

FMVip_LXJ/windows/fmvipwnd.h

@@ -21,7 +21,7 @@ public:
     int     exec();
     bool    close();
 
-    virtual void        initWnd(Session* session) {this->_session = session;}
+    virtual bool        initWnd(Session* session) {this->_session = session; return true;}
     Session*    session() const {return _session;}
 
 public slots: