New Feature:

1、Starbucks AB 账户折扣入机;
2、同时解耦POS 将折扣优惠另存储到一张新表;

fmTakeout/Control/flowControl.h

@@ -165,6 +165,7 @@ private:
     bool m_initGetAuthPosDBRet;
     bool m_initPrintCupStickPosDBRet;
     bool m_initPrintMsgQueueDBRet;
+    bool m_initPrintOrderPromotionDBRet;
 
 signals:
     // 发送信号给自己 做登陆

fmTakeout/DTools/PrintOrderPromotionDB.h

+#ifndef PRINTORDERPROMOTIONDB_H
+#define PRINTORDERPROMOTIONDB_H
+
+#include <QtSql/QSqlDatabase>
+#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlError>
+#include <QObject>
+#include <QMutex>
+#include <Model/orderObject.h>
+#include "preDefine.h"
+#include "windows.h"
+
+class PrintOrderPromotionDB : public QObject
+{
+     Q_OBJECT
+
+public:
+    // explicit PrintOrderPromotionDB(QObject *parent = 0);
+
+    static PrintOrderPromotionDB& getInstance();
+
+    /**
+    *功能:初始化pos本地数据库;方便后期判断 打开pos本地数据库是否成功;
+    *参数:[无]
+    *返回:true:能够成功打开POS本地数据库，false:不能够成功打开POS本地数据库
+    **/
+    bool initPrintOrderPromotionDB();
+
+
+    /**
+    *功能:检查pos本地数据库表中字段;
+    *参数:[无]
+    *返回:true:检查字段完整性成功，false:检查字段完整性失败
+    **/
+    bool alterTablePrintOrderPromotionAndCheck();
+
+    /**
+    *功能:插入 订单优惠列表 到pos本地数据库中;
+    *参数:[1]订单对象指针
+    *返回:true操作成功，false失败
+    **/
+    bool insertOrderPromotion(OrderObject* orderObj);
+
+    /**
+    *功能:插入订单 券 优惠列表到pos本地数据库中;
+    *参数:[1]订单对象指针
+    *返回:true操作成功，false失败
+    **/
+    bool insertCouponPromotion(OrderObject* orderObj);
+
+
+    /**
+    *功能:插入订单 正常商品 优惠列表到pos本地数据库中;
+    *参数:[1]订单对象指针
+    *返回:true操作成功，false失败
+    **/
+    bool insertNormalPromotion(OrderObject* orderObj);
+
+    /**
+    *功能:查询  订单的优惠数据是否存在本地的POS系统中;
+    *参数:[1]订单号
+    *返回:true是，false否
+    **/
+    bool isOrderPromotionExist(const QString& orderId);
+
+    /**
+    *功能:删除本地数据库中的 订单优惠数据;
+    *参数:[1] 删除日期;
+    *返回:true 删除成功，false 删除失败;
+    **/
+    bool deletePromotionRecord(QString creatTime);
+
+    bool queryValue(const QString& orderId, const QString& key, QString& error, QVariant &value);
+    bool queryIsNull(const QString &orderId, const QString& key,QString &error, bool &result);
+
+private:
+    QMutex m_mutex;
+    PrintOrderPromotionDB();
+    PrintOrderPromotionDB(PrintOrderPromotionDB const&);
+    PrintOrderPromotionDB& operator=(PrintOrderPromotionDB const&);
+    QSqlDatabase m_sqlDb;
+
+signals:
+
+public slots:
+};
+
+#endif // PRINTORDERPROMOTIONDB_H

fmTakeout/DTools/printCupStickPosDB.cpp

@@ -126,6 +126,14 @@ bool PrintCupStickPosDB::insertOrderProduct(OrderObject* orderObj,const QString&
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
         return false;
     }
+
+    // 开启数据库事务实现原子操作: 保证  tb_main_prod_refinfo:父商品与子商品   同时插入成功;
+    // m_sqlDb.transaction(); 驱动不支持;
+    QSqlQuery query(m_sqlDb);
+    if ( !query.exec("START TRANSACTION") ) {
+       QLOG_ERROR()<<"[<<<<---PrintCupStickPosDB::insertOrderProduct: Begin transaction Failed--->>>>]"<<m_sqlDb.lastError().text();
+    }
+
     bool retInsCoupProd = false;
     bool retInsNorProd = false;
     // WSG-杯贴祝福-商品券号关联数据;
@@ -135,6 +143,18 @@ bool PrintCupStickPosDB::insertOrderProduct(OrderObject* orderObj,const QString&
         retInsNorProd = insertNormalProd(orderObj, posCheckNo);
     }
 
+    // 结束数据库事务操作 保证  tb_main_prod_refinfo:父商品与子商品  同时插入成功;
+    // Sleep(10*1000);   // test  sqldb transaction
+    // m_sqlDb.commit()  and m_sqlDb.rollback() 都是不支持的;
+    if ( retInsCoupProd || retInsNorProd ) {
+        if ( !query.exec( "COMMIT" ) ) {
+            QLOG_ERROR()<<"[<<<<---insertOrderProduct::insertOrderProduct: Begin Commit Failed--->>>>]"<<m_sqlDb.lastError().text();
+            if ( !query.exec( "ROLLBACK" ) ) {
+                QLOG_ERROR()<<"[<<<<---insertOrderProduct::insertOrderProduct: Begin Rollback Failed--->>>>]"<<m_sqlDb.lastError().text();
+            }
+        }
+    }
+
     m_sqlDb.close();
     return retInsCoupProd || retInsNorProd;
 }

fmTakeout/DTools/printMsgQueueDB.cpp

@@ -203,7 +203,7 @@ bool PrintMsgQueueDB::isOrderPrtMsgExist(const QString& orderId){
     return result;
 }
 
-bool PrintMsgQueueDB::deleteProductRecord(QString creatTime)
+bool PrintMsgQueueDB::deletePrintMsgRecord(QString creatTime)
 {
     //QMutexLocker mutex(&m_mutex);
     bool retTryLock = m_mutex.tryLock(VALUE_TRYLOCKNETTIMEOUT);

fmTakeout/DTools/printMsgQueueDB.h

@@ -60,7 +60,7 @@ public:
     *参数:[1] 删除日期;
     *返回:true 删除成功，false 删除失败;
     **/
-    bool deleteProductRecord(QString creatTime);
+    bool deletePrintMsgRecord(QString creatTime);
 
 private:
     QMutex m_mutex;

fmTakeout/Model/PromotionItemObject.cpp

+#include "PromotionItemObject.h"
+
+PromotionItemObject::PromotionItemObject(const PromotionItemObject &promotionItem, QObject *parent):QObject(parent)
+{
+    const QMetaObject *m = promotionItem.metaObject();
+    for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
+    {
+        QMetaProperty qmp = m->property(i);
+        QString key = QString::fromLatin1(qmp.name());
+        QVariant value = promotionItem.property(key.toUtf8());
+        this->setProperty(key.toUtf8(), value);
+    }
+}
+
+PromotionItemObject& PromotionItemObject::operator =(const PromotionItemObject& promotionItem)
+{
+    const QMetaObject *m = promotionItem.metaObject();
+    for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
+    {
+        QMetaProperty qmp = m->property(i);
+        QString key = QString::fromLatin1(qmp.name());
+        QVariant value = promotionItem.property(key.toUtf8());
+        this->setProperty(key.toUtf8(), value);
+    }
+    return *this;
+}
+
+void PromotionItemObject::FetchDataFromJson(const QJsonObject &json)
+{
+    foreach(QString key,  json.keys())
+    {
+        setProperty(key.toUtf8(), json[key].toVariant());
+    }
+    return;
+}

fmTakeout/Model/PromotionItemObject.h

+#ifndef PROMOTIONITEMOBJECT_H
+#define PROMOTIONITEMOBJECT_H
+
+#include <QObject>
+#include <QJsonObject>
+#include <QVariant>
+#include <QMetaProperty>
+
+class PromotionItemObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY (QString promotionSku READ getPromotionSku WRITE setPromotionSku)
+    Q_PROPERTY (QString promotionName READ getPromotionName WRITE setPromotionName)
+    Q_PROPERTY (int promotionQty READ getPromotionQty WRITE setPromotionQty)
+    Q_PROPERTY (int discountFee READ getDiscountFee WRITE setDiscountFee)
+    Q_PROPERTY (int type READ getType WRITE setType)
+
+public:
+    explicit PromotionItemObject(QObject *parent = 0):QObject(parent){}
+    PromotionItemObject(const PromotionItemObject& promotionItem,QObject* parent=0);
+    PromotionItemObject& operator =(const PromotionItemObject& promotionItem);
+    void FetchDataFromJson(const QJsonObject &json);
+
+    QString promotionSku;
+    QString promotionName;
+    int promotionQty;
+    int discountFee;
+    int type;    // 1:万能优惠   2:星星优惠   3:B账号优惠;
+
+protected:
+    inline QString getPromotionSku(){ return promotionSku; }
+    inline void setPromotionSku(const QString& v){ promotionSku = v; }
+
+    inline QString getPromotionName(){ return promotionName; }
+    inline void setPromotionName(const QString& v){ promotionName = v; }
+
+    inline int getPromotionQty(){ return promotionQty; }
+    inline void setPromotionQty(const int& v){ promotionQty = v; }
+
+    inline int getDiscountFee(){ return discountFee; }
+    inline void setDiscountFee(const int& v){ discountFee = v; }
+
+    inline int getType(){ return type; }
+    inline void setType(const int& v){ type = v; }
+};
+
+#endif // PROMOTIONITEMOBJECT_H

fmTakeout/Model/couponsObject.cpp

@@ -7,6 +7,10 @@ CouponsObject::CouponsObject(const CouponsObject &coupons, QObject *parent):QObj
 {
     qDeleteAll(skus);
     skus.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     const QMetaObject *m = coupons.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -15,16 +19,27 @@ CouponsObject::CouponsObject(const CouponsObject &coupons, QObject *parent):QObj
         QVariant value = coupons.property(key.toUtf8());
         this->setProperty(key.toUtf8(), value);
     }
+
     foreach (auto ptr, coupons.skus) {
         SingleProductObject *singleProduct=new SingleProductObject(*ptr,this);
         this->skus.append(singleProduct);
     }
+
+    foreach (auto ptr, coupons.itemsDiscount) {
+        PromotionItemObject *promotionItem=new PromotionItemObject(*ptr,this);
+        this->itemsDiscount.append(promotionItem);
+    }
+
 }
 
 CouponsObject& CouponsObject::operator =(const CouponsObject& coupons)
 {
     qDeleteAll(skus);
     skus.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     const QMetaObject *m = coupons.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -33,10 +48,17 @@ CouponsObject& CouponsObject::operator =(const CouponsObject& coupons)
         QVariant value = coupons.property(key.toUtf8());
         this->setProperty(key.toUtf8(), value);
     }
+
     foreach (auto ptr, coupons.skus) {
         SingleProductObject *singleProduct=new SingleProductObject(*ptr,this);
         this->skus.append(singleProduct);
     }
+
+    foreach (auto ptr, coupons.itemsDiscount) {
+        PromotionItemObject *promotionItem=new PromotionItemObject(*ptr,this);
+        this->itemsDiscount.append(promotionItem);
+    }
+
     return *this;
 }
 
@@ -49,6 +71,10 @@ void CouponsObject::FetchDataFromJson(const QJsonObject &json)
 
     qDeleteAll(skus);
     skus.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     QJsonArray singleProductsArray = json[JSON_COUPONPRODUCTS].toArray();
     foreach(QJsonValue singleProduct, singleProductsArray)
     {
@@ -61,5 +87,20 @@ void CouponsObject::FetchDataFromJson(const QJsonObject &json)
         item->FetchDataFromJson(singleProduct.toObject());
         this->skus.append(item);
     }
+
+    QJsonArray itemsDiscountArray = json[JSON_ITEMSDISCOUNT].toArray();
+    foreach(QJsonValue itemDiscount, itemsDiscountArray)
+    {
+        PromotionItemObject *item = new PromotionItemObject(this);
+        //初始商品配料数据信息;
+        item->promotionSku="";
+        item->promotionName="";
+        item->promotionQty=0;
+        item->discountFee=0;
+        item->type=0;
+        item->FetchDataFromJson(itemDiscount.toObject());
+        itemsDiscount.append(item);
+    }
+
     return;
 }

fmTakeout/Model/couponsObject.h

@@ -6,6 +6,8 @@
 #include <QVariant>
 #include <QMetaProperty>
 #include <Model/singleProductObject.h>
+#include <Model/PromotionItemObject.h>
+
 class CouponsObject : public QObject
 {
     Q_OBJECT
@@ -49,6 +51,7 @@ public:
     QString blessingWords ;          //券赠送祝福
 
     QList<SingleProductObject*> skus;
+    QList<PromotionItemObject*> itemsDiscount;
 
 protected:
     inline QString getCouponSeq(){ return couponSeq; }

fmTakeout/Model/dishesObject.cpp

@@ -7,6 +7,10 @@ dishesObject::dishesObject(const dishesObject &dish, QObject *parent):QObject(pa
 {
     qDeleteAll(sub_products);
     sub_products.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     const QMetaObject *m = dish.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -15,16 +19,27 @@ dishesObject::dishesObject(const dishesObject &dish, QObject *parent):QObject(pa
         QVariant value = dish.property(key.toUtf8());
         this->setProperty(key.toUtf8(), value);
     }
+
     foreach (auto ptr, dish.sub_products) {
         dishesObject *product=new dishesObject(*ptr,this);
         this->sub_products.append(product);
     }
+
+    foreach (auto ptr, dish.itemsDiscount) {
+        PromotionItemObject *promotionItem=new PromotionItemObject(*ptr,this);
+        this->itemsDiscount.append(promotionItem);
+    }
+
 }
 
 dishesObject& dishesObject::operator =(const dishesObject& dish)
 {
     qDeleteAll(sub_products);
     sub_products.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     const QMetaObject *m = dish.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -33,10 +48,17 @@ dishesObject& dishesObject::operator =(const dishesObject& dish)
         QVariant value = dish.property(key.toUtf8());
         this->setProperty(key.toUtf8(), value);
     }
+
     foreach (auto ptr, dish.sub_products) {
         dishesObject *product=new dishesObject(*ptr,this);
         this->sub_products.append(product);
     }
+
+    foreach (auto ptr, dish.itemsDiscount) {
+        PromotionItemObject *promotionItem=new PromotionItemObject(*ptr,this);
+        this->itemsDiscount.append(promotionItem);
+    }
+
     return *this;
 }
 
@@ -49,6 +71,10 @@ void dishesObject::FetchDataFromJson(const QJsonObject &json)
 
     qDeleteAll(sub_products);
     sub_products.clear();
+
+    qDeleteAll(itemsDiscount);
+    itemsDiscount.clear();
+
     QJsonArray subDishesArray = json[JSON_SUBPRODUCTS].toArray();
     foreach(QJsonValue subDish, subDishesArray)
     {
@@ -63,5 +89,20 @@ void dishesObject::FetchDataFromJson(const QJsonObject &json)
         item->FetchDataFromJson(subDish.toObject());
         sub_products.append(item);
     }
+
+    QJsonArray itemsDiscountArray = json[JSON_ITEMSDISCOUNT].toArray();
+    foreach(QJsonValue itemDiscount, itemsDiscountArray)
+    {
+        PromotionItemObject *item = new PromotionItemObject(this);
+        //初始商品配料数据信息;
+        item->promotionSku="";
+        item->promotionName="";
+        item->promotionQty=0;
+        item->discountFee=0;
+        item->type=0;
+        item->FetchDataFromJson(itemDiscount.toObject());
+        itemsDiscount.append(item);
+    }
+
     return;
 }

fmTakeout/Model/dishesObject.h

@@ -4,6 +4,8 @@
 #include <QJsonObject>
 #include <QVariant>
 #include <QMetaProperty>
+#include <Model/PromotionItemObject.h>
+
 class dishesObject : public QObject
 {
     Q_OBJECT
@@ -72,6 +74,7 @@ public:
 
     QString chgPrcFlgCode;
     QList<dishesObject*> sub_products;
+    QList<PromotionItemObject*> itemsDiscount;
 
 protected:
     inline QString getCouponSeq(){ return couponSeq; }

fmTakeout/Model/orderObject.h

@@ -91,6 +91,9 @@ class OrderObject : public QObject
     Q_PROPERTY (int inAdvanceTakemeal READ getInAdvanceTakemeal WRITE setInAdvanceTakemeal)
     Q_PROPERTY (QString subStoreId READ getSubStoreId WRITE setSubStoreId)
 
+    Q_PROPERTY (int tenderDeliveryDiscountB READ getTenderDeliveryDiscountB WRITE setTenderDeliveryDiscountB)
+    Q_PROPERTY (QString tenderDeliveryDiscountBSku READ getTenderDeliveryDiscountBSku WRITE setTenderDeliveryDiscountBSku)
+
     Q_PROPERTY (int globalServiceType READ getGlobalServiceType WRITE setGlobalServiceType)
     Q_PROPERTY (int globalOrderType READ getGlobalOrderType WRITE setGlobalOrderType)
 
@@ -199,6 +202,9 @@ public:
     int inAdvanceTakemeal;           // 预约单提前到店标志【新增字段：int】
     QString subStoreId;                 // 子门店号      【新增字段：string】
 
+    int tenderDeliveryDiscountB;                  // 配送费 B账户优惠金额
+    QString tenderDeliveryDiscountBSku;    // 配送费 B账户优惠SKU;
+
     int globalServiceType;            // 全链路服务类型: globalServiceType【新增字段：int】
     int globalOrderType;               // 全链路订单类型: globalOrderType   【新增字段：int】
 
@@ -460,6 +466,12 @@ public:
     inline QString getSubStoreId()const{return subStoreId;}
     inline void setSubStoreId(const QString& v){subStoreId = v;}
 
+    inline int getTenderDeliveryDiscountB()const{return tenderDeliveryDiscountB;}
+    inline void setTenderDeliveryDiscountB(const int& v){tenderDeliveryDiscountB = v;}
+
+    inline QString getTenderDeliveryDiscountBSku()const{return tenderDeliveryDiscountBSku;}
+    inline void setTenderDeliveryDiscountBSku(const QString& v){tenderDeliveryDiscountBSku = v;}
+
     inline int getGlobalServiceType()const{return globalServiceType;}
     inline void setGlobalServiceType(const int& v){globalServiceType = v;}
 

fmTakeout/fmTakeout.pro

@@ -61,7 +61,9 @@ SOURCES += main.cpp\
     Model/singleProductObject.cpp \
     Model/paymentObject.cpp \
     DTools/printCupStickPosDB.cpp \
-    DTools/printMsgQueueDB.cpp
+    DTools/printMsgQueueDB.cpp \
+    Model/PromotionItemObject.cpp \
+    DTools/PrintOrderPromotionDB.cpp
 
 HEADERS  += \
     mainForm.h \
@@ -101,7 +103,9 @@ HEADERS  += \
     Model/singleProductObject.h \
     Model/paymentObject.h \
     DTools/printCupStickPosDB.h \
-    DTools/printMsgQueueDB.h
+    DTools/printMsgQueueDB.h \
+    Model/PromotionItemObject.h \
+    DTools/PrintOrderPromotionDB.h
 
 FORMS    += mainForm.ui \
     alertForm.ui \

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2020,12,18
-    PRODUCTVERSION 2,2020,12,18
+    FILEVERSION 2,2021,1,11
+    PRODUCTVERSION 2,2021,1,11
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "Delivery Order Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "2.2020.12.18"
-                VALUE "FileVersion", "2.2020.12.18"
+                VALUE "ProductVersion", "2.2021.1.11"
+                VALUE "FileVersion", "2.2021.1.11"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -31,8 +31,8 @@
 //#define APP_VERSION               "2.2020.8.10"
 //#define APP_VERSION               "2.2020.9.29"
 //#define APP_VERSION               "2.2020.10.27"
-#define APP_VERSION               "2.2020.12.18"
-
+//#define APP_VERSION               "2.2020.12.18"
+#define APP_VERSION               "2.2021.1.11"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 
@@ -126,6 +126,7 @@
 #define JSON_EXCHANGECOUPONS           "exchangeCoupons"
 #define JSON_PAYMENTS           "PaymentObjs"
 #define JSON_SUBPRODUCTS        "addExtra"
+#define JSON_ITEMSDISCOUNT     "itemsDiscount"
 #define JSON_COUPONPRODUCTS     "skus"
 #define JSON_ID                 "id"
 #define JSON_ORDERID            "orderId"