1. 修改代金券样式，代金券都不可叠加使用。 2. 修复支付界面账号、姓名显示问题。 3. 隐藏积分支付输入框。

task/coupon.cpp

@@ -6,12 +6,13 @@
 const int PaintingWidth = 220;
 const int PaintingHeight = 116;
 
-Coupon::Coupon(QString name, QString code, QString type, double disAmount, double limitAmount, bool isCompatible) :
+Coupon::Coupon(QString name, QString code, QString type, double disAmount, double limitAmount, QString limitTime, bool isCompatible) :
     _name(name),
     _code(code),
     _type(type),
     _disAmount(disAmount),
     _limitAmount(limitAmount),
+    _limitTime(limitTime),
     _isCompatible(isCompatible)
 {
 }
@@ -75,7 +76,7 @@ void Coupon::paint(QPainter *painter, const QRect &rect, const QPalette &palette
     painter->setPen(pen);
     fontHeight = painter->fontMetrics().height();
     QRect codeRect(rect.x(), rect.y()+rect.height()-fontHeight-5, rect.width(), fontHeight);
-    painter->drawText(codeRect, Qt::AlignCenter, this->_code);
+    painter->drawText(codeRect, Qt::AlignCenter, this->_limitTime);
 
     painter->restore();
 }

task/coupon.h

@@ -10,7 +10,7 @@ class QPainter;
 class Coupon
 {
 public:
-    explicit Coupon(QString name="", QString code="", QString type="", double disAmount=0, double limitAmount=0, bool isCompatible=true);
+    explicit Coupon(QString name="", QString code="", QString type="", double disAmount=0, double limitAmount=0, QString limitTime="", bool isCompatible=true);
 
     void paint(QPainter *painter, const QRect &rect,
                const QPalette &palette) const;
@@ -29,6 +29,7 @@ private:
     double _disAmount;
     double _limitAmount;
     bool _isCompatible;
+    QString _limitTime;
 };
 
 Q_DECLARE_METATYPE(Coupon)

task/tasklogin.cpp

@@ -75,7 +75,7 @@ void TaskLogin::onLogin()
         QString name = getServerJsonValue(PosProps.Name).toString();
 
         bool canPay = (getServerJsonValue(PosProps.CanPay).toInt() == 1);
-        canPay = 1;
+        canPay = true;
         if(!canPay) {
             if(getPosJsonValue(PosProps.Fm_cmd).toInt() != FM_Pay) {
                 FMMsgWnd::LoginSuccess(account, name, birthday, _window);

task/taskothers.cpp

@@ -37,8 +37,9 @@ void TaskCoupon::packagePOSRsp()
         double amount = couponOb[ServerProps(PosProps.Coupon_disAmount)].toInt() / 100.0;
         QString desc = couponOb["active_name"].toString();
         int type = couponOb[ServerProps(PosProps.Coupon_type)].toInt();
+        QString limitTime = couponOb["expiration_date"].toString();
 
-        Coupon c(desc, code, QString::number(type), amount, 0, true);
+        Coupon c(desc, code, QString::number(type), amount, 0, limitTime, false);
         QVariant v;
         v.setValue(c);
         couponMap[code] = v;

task/taskpay.cpp

@@ -88,13 +88,11 @@ void TaskPay::packageServerReq()
     //余额支付详情
     QJsonObject balance;
     int codeAmount = session()->data(PosProps.CodeAmount).toInt();
-    if(codeAmount > 0) {
-        balance["amount"] = codeAmount;
-        balance["transId"] = getPosJsonValue("trans_id");
-        balance["typeModeFlag"]  = 20001;
-        balance["thirdPayTransId"] = "";
-        payList.push_back(balance);
-    }
+    balance["amount"] = codeAmount;
+    balance["transId"] = getPosJsonValue("trans_id");
+    balance["typeModeFlag"]  = 20001;
+    balance["thirdPayTransId"] = "";
+    payList.push_back(balance);
 
     // 积分支付详情
     QJsonObject score;

windows/fmviporder.cpp

@@ -25,8 +25,11 @@ bool FMVipOrder::initWnd(Session *session)
 
     QString operator_id = session->data(PosProps.OperatorId).toString();
     QString business_date = session->data(PosProps.BussinessDate).toString();
-    QString fm_id = session->data(PosProps.Account).toString();
+    QString fm_id = session->data(PosProps.Fm_open_id).toString();
     QString name = session->data(PosProps.Name).toString();
+    if(name.isEmpty()) {
+        name = "--";
+    }
     QString birthday = session->data(PosProps.Birthday).toString();
 
     QString amount_str = QString::number(session->data(PosProps.Amount).toInt());
@@ -97,8 +100,9 @@ void FMVipOrder::on_coupon_page_clicked(const QModelIndex &index)
         if(selectionModel->selectedIndexes().length() == 1) {
             QModelIndex firstIndex = selectionModel->selectedIndexes().first();
             if(!couponModel->coupon(firstIndex).isCompatible()) {
-                FMMsgWnd::FailureWnd(QString::fromLocal8Bit("已经选中了一张不可叠加券，不能再选用其他代金券"));
-                return;
+//                FMMsgWnd::FailureWnd(QString::fromLocal8Bit("已经选中了一张不可叠加券，不能再选用其他代金券"));
+//                return;
+                selectionModel->clear();
             }
         }
         Coupon coupon = couponModel->coupon(index);

windows/forms/fmviporder.ui

@@ -179,7 +179,7 @@
   color: red;
 }
 
-#pay_edit,#score_edit {
+#pay_edit {
   min-height: 45px;
   border: 1 solid silver;
   text-align: center;
@@ -765,7 +765,7 @@
             </size>
            </property>
            <property name="text">
-            <string>满 0 元可享受储值金满额优惠</string>
+            <string/>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
@@ -774,6 +774,18 @@
          </item>
          <item>
           <widget class="QLineEdit" name="score_edit">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
             <string>0</string>
            </property>
@@ -784,6 +796,12 @@
          </item>
          <item>
           <widget class="QLabel" name="score_label">
+           <property name="maximumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
             <string>使用 0 积分抵扣 0 元</string>
            </property>