完善卡券核销插件，添加对券和商品不匹配情况的判断，并给出提示。

debug/bins/FreemudPOS.ini

@@ -15,8 +15,8 @@ Level=4
 
 [Home]
 Server=http://115.159.226.87:20001/api/user/login
-PartnerId=1521
-StoreId=9999
+PartnerId=1371
+StoreId=fm99999
 PosId=01
 Position=1479, 521
 CashierId=001

fmp_redeem/consumokdialog.ui

@@ -52,7 +52,9 @@
 }
 /**/
 #labActName{
-	font: 75 45pt "微软雅黑";
+	font-size:30px;
+	font-family:"微软雅黑";
+	font-weight:bold;
     color: rgb(255, 255, 0);
 }
 #labCodeName{	

fmp_redeem/consumptiondialog.ui

@@ -52,7 +52,10 @@
 }
 /**/
 #labActName{
-	font: 75 45pt "微软雅黑";
+	/*font: 30 bold "微软雅黑";*/
+	font-size:30px;
+	font-family:"微软雅黑";
+	font-weight:bold;
     color: rgb(255, 255, 0);
 	border:none;
 }

fmp_redeem/errcodedialog.cpp

@@ -71,4 +71,23 @@ void ErrCodeDialog::showForErr(const QString& coupon, const QString& mess, QWidg
     v.ui->labActName->setText( mess);
 
     v.exec();
-}
+}
\ No newline at end of file
+
+void ErrCodeDialog::showForMismatch(const QString &coupon, const QString &mess, QWidget *parent)
+{
+    ErrCodeDialog v(parent);
+//    v.setGeometry( 0,0,350,470);
+    v.ui->topInvalidWidget->setObjectName("topExpirdWidget");
+    v.ui->topInvalidWidget->setStyleSheet( v.ui->topInvalidWidget->styleSheet());
+
+    v.ui->labTime->setVisible( false);
+
+    v.ui->labCodeName->setVisible( false);
+    v.ui->labFolat->setVisible( false);
+
+    v.ui->labActName->setVisible( true);
+    v.ui->labCode->setText(coupon );
+    v.ui->labActName->setText( mess);
+
+    v.exec();
+}

fmp_redeem/errcodedialog.h

@@ -17,7 +17,8 @@ public:
 
     static void showForInvalid(const QString& coupon, QWidget *parent = 0);
     static void showForExpird(const QString& act_name, const QString& code_name, const QString& time_name, const QString& coupon, QWidget *parent = 0);
-    static void showForErr( const QString& coupon, const QString& mess, QWidget *parent = 0);
+    static void showForErr(const QString& coupon, const QString& mess, QWidget *parent = 0);
+    static void showForMismatch(const QString& coupon, const QString& mess, QWidget *parent = 0);
 
 private:
     Ui::ErrCodeDialog *ui;

fmp_redeem/errcodedialog.ui

@@ -65,7 +65,7 @@
 }
 /*label*/
 #labActName{
-	font: 75 45pt "微软雅黑";
+	font: 75 30pt "微软雅黑";
     color: rgb(81, 81, 81);
 }
 

fmp_redeem/fmp_redeem.h

-#ifndef FMP_REDEEM_H
+#ifndef FMP_REDEEM_H
 #define FMP_REDEEM_H
 
 #include "fmp_redeem_i.h"
 #include "fmp_settings_i.h"
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QPointer>
 class FMPStartEventHandler;
 class FMPRedeem : public FMPRedeemInterface
@@ -28,7 +29,7 @@ public:
     explicit            FMPRedeem(const FMPContext context);
     virtual             ~FMPRedeem();
     
-    QJsonObject         Redeem(const QJsonObject& storeInfo); //券码核销
+    QJsonObject         Redeem(const double needPay, const QJsonObject& requestInfo); //券码核销
     
 protected:
     const FMPContext    GetContext() const { return _context; }
@@ -39,20 +40,28 @@ protected slots:
     
 private:
     QJsonObject         SendRequest(const QByteArray &reqData);
-    QJsonObject         ShowForUnConsum(const QJsonObject &json);
-    QJsonObject         ShowForHasConsum(const QJsonObject &json);
-    QJsonObject         ShowForInvalid(const QJsonObject &json);
-    QJsonObject         ShowForExpird(const QJsonObject &json);
-    QJsonObject         ShowForErr(const QJsonObject &json);
+    QJsonObject         ShowForUnConsum(QJsonObject json);
+    QJsonObject         ShowForHasConsum(QJsonObject json);
+    QJsonObject         ShowForInvalid(QJsonObject json);
+    QJsonObject         ShowForExpird(QJsonObject json);
+    QJsonObject         ShowForErr(QJsonObject json);
+    QJsonObject         ShowForMismatch(QJsonObject json);
     int                 ZH_caclChkValue(char * pJsonData, int startPos, int endPos);
     QByteArray          CheckSendArray( QByteArray & jsonArray);
-    
+    QJsonValue          SearchJsonObject(const QJsonObject& searchJson, const QString& searchKey);
+    QJsonValue          SearchJsonArray(const QJsonArray& searchJson, const QString& searchKey);
+    bool                IsContinue(int couponAmount);
 private:
     bool                _inited;
+    double              _needPay;
     QString             _store_id;
-    int                 _station_id;
+    QString             _station_id;
     QString             _operator_id;
-    int _clientReqCount;
+    QString             _coupon;
+    int                 _partner_id;
+    QString             _url;
+    QJsonArray          _products_info;
+    int                 _clientReqCount;
     const FMPContext    _context;
     QPointer<FMPStartEventHandler> _ste_handler;
 };

fmp_redeem/fmp_redeem_i.h

-#ifndef FMP_REDEEM_I_H
+#ifndef FMP_REDEEM_I_H
 #define FMP_REDEEM_I_H
 
 #include <fmp_plugin_i.h>
@@ -20,7 +20,7 @@ public:
         connect(this, &FMPRedeemInterface::TriggerUninit, this, &FMPRedeemInterface::OnTriggerUninit);
     }
     
-    virtual QJsonObject Redeem(const QJsonObject& storeInfo) = 0; //券码核销
+    virtual QJsonObject Redeem(const double needPay, const QJsonObject& requestInfo) = 0; //券码核销
 signals:
     void                TriggerInit();
     void                TriggerUninit();

fmp_redeem/res/img.qrc

@@ -10,11 +10,11 @@
         <file>img/btn_canel.png</file>
         <file>img/btn_consumption.png</file>
         <file>img/btn_consumption_invalid.png</file>
+		<file>img/btn_manual.png</file>
         <file>img/close.png</file>
         <file>img/consumption_ok.png</file>
         <file>img/folat_be_invalid.png</file>
         <file>img/ma_bg.png</file>
         <file>img/scanning_bar.png</file>
-        <file>img/tray.png</file>
     </qresource>
 </RCC>

fmp_redeem/scanningdialog.ui

@@ -40,7 +40,8 @@
 
 #btnManual{
 	border: 0 solid red;
-	background: rgb(231,68,59);
+	/*background: rgb(231,68,59);*/
+	background-image: url(:/img/btn_manual.png);
 	color: rgb(253,197,24);
 	font: normal 18px "微软雅黑";
 }</string>
@@ -83,14 +84,14 @@
    <widget class="QPushButton" name="btnManual">
     <property name="geometry">
      <rect>
-      <x>100</x>
+      <x>30</x>
       <y>220</y>
-      <width>141</width>
-      <height>41</height>
+      <width>273</width>
+      <height>77</height>
      </rect>
     </property>
     <property name="text">
-     <string>手动输入券码</string>
+     <string/>
     </property>
    </widget>
   </widget>