1. 修复使用积分接口字段。 2. 修复代金券抵扣金额字段。 3. 消除两个警告。

global.h

@@ -87,7 +87,7 @@ struct PP{
 
             CodeAmount       = "codeAmount";
             ScoreAmount      = "scoreAmount";
-            IsUseScore       = "isusescore";
+            IsUseScore       = "is_use_score";
             Coupons          = "coupons";
             Transaction      = "transactions";
             OrderAmount      = "order_amount";
@@ -105,6 +105,7 @@ struct PP{
             CouponList       = "couponList";     // 代金券列表
             Coupon_code      = "code";           // 优惠券 / 代金券编码
             Coupon_disAmount = "disAmount";      // 代金券抵扣金额
+            Coupon_disPrice  = "dis_price";
             Coupon_desc      = "desc";           // 代金券描述
             CouponMap        = "payCouponMap";   // 代金券map
 
@@ -172,6 +173,7 @@ struct PP{
     QString CouponList        ;
     QString Coupon_code       ;
     QString Coupon_disAmount  ;
+    QString Coupon_disPrice  ;
     QString Coupon_desc       ;
     QString CouponMap         ;
     // 产品

task/taskpay.cpp

@@ -103,7 +103,7 @@ void TaskPay::packagePOSRsp()
         QJsonObject cp = coupon.toObject();
         pay_id[PosProps.Pay_id] = "20003";
         pay_id[PosProps.Pay_str] = QString::fromLocal8Bit("代金券支付");
-        int disAmount = cp[ServerProps(PosProps.Coupon_disAmount)].toInt();
+        int disAmount = cp[ServerProps(PosProps.Coupon_disPrice)].toInt();
         pay_id[PosProps.Pay_amount] = disAmount;
         pay_id[PosProps.Coupon_code] = cp[ServerProps(PosProps.Coupon_code)];
         pay_ids.append(pay_id);

task/taskpay.h

@@ -19,7 +19,7 @@ public:
 
 private slots:
     void onPay();
-    void TaskPay::onGetCoupons(Session* session);
+    void onGetCoupons(Session* session);
 
 private:
     TaskCouponThread *couponThread;

windows/fmviporder.cpp

@@ -10,18 +10,18 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
     FMVipWnd(parent),
     ui(new Ui::FMVipOrder)
 {
-    numpad = NULL;
+//    numpad = NULL;
     ui->setupUi(this);
 }
 
 FMVipOrder::~FMVipOrder()
 {
     del_p(orderInfo);
-    if(numpad != NULL)
-    {
-        delete numpad;
-        numpad = NULL;
-    }
+//    if(numpad != NULL)
+//    {
+//        delete numpad;
+//        numpad = NULL;
+//    }
     delete ui;
 }
 

windows/fmviporder.h

@@ -6,7 +6,7 @@
 #include "fmvipwnd.h"
 #include "global.h"
 
-class FMNumPad;
+//class FMNumPad;
 class CouponModel;
 class QItemSelectionModel;
 
@@ -162,7 +162,7 @@ private:
 
     QString oldPayText;
 
-    FMNumPad *numpad;
+//    FMNumPad *numpad;
 
     QItemSelectionModel *selectionModel;
     CouponModel *couponModel;