1、完成 wsg 组合定义;

2、完善 拼团 数据组装 与插入；

fmTakeout/DTools/pmsOrdersData.h

@@ -7,6 +7,8 @@
 #include <QObject>
 #include <QMutex>
 #include "Model/orderObject.h"
+#include <Model/couponsObject.h>
+#include <Model/singleProductObject.h>
 #include "preDefine.h"
 
 class PmsOrdersData : public QObject
@@ -51,12 +53,20 @@ public:
 
     /**
     *功能:插入订单主商品列表信息到PMS数据库中;
-    *参数:[1]订单对象指针 [2]返回插入成功后的自增序号;
+    *参数:[1]订单商品列表指针, [2]订单ID, [3] 返回插入成功后的自增序号;
     *返回:true操作成功，false失败
     **/
     bool insertProductData(const QList<dishesObject*> proList, const QString& OrderId, QString& ProInIdRef);
 
     /**
+    *功能:插入订单 券列表信息到PMS数据库中;
+    *参数:[1]订单券列表指针,  [2]订单ID,  [3] 返回插入成功后的自增序号;
+    *返回:true操作成功，false失败
+    **/
+    bool insertConponData(const QList<CouponsObject*> coupList, const QString& OrderId, QString& ProInIdRef);
+
+
+    /**
     *功能:删除PMS数据库中的指定订单状态的商品数据;
     *参数:[1]订单对象指针;
     *返回:true操作成功，false失败

fmTakeout/Model/couponsObject.cpp

@@ -56,6 +56,8 @@ void CouponsObject::FetchDataFromJson(const QJsonObject &json)
         //初始商品配料数据信息;
         item->isCoupon=false;
         item->code="";
+        item->qty=0;
+        item->price=0;
         item->FetchDataFromJson(singleProduct.toObject());
         this->skus.append(item);
     }

fmTakeout/Model/couponsObject.h

@@ -11,14 +11,18 @@ class CouponsObject : public QObject
     Q_OBJECT
     Q_PROPERTY (QString couponSeq READ getCouponSeq WRITE setCouponSeq)
     Q_PROPERTY (QString code READ getCode WRITE setCode)
-    Q_PROPERTY (QString couponName READ getCouponName WRITE setCouponName)
+    Q_PROPERTY (QString name READ getName WRITE setName)
     Q_PROPERTY (QString menuItem READ getMenuItem WRITE setMenuItem)
     Q_PROPERTY (QString couponType READ getCouponType WRITE setCouponType)
     Q_PROPERTY (bool storeChannel READ getStoreChannel WRITE setStoreChannel)
     Q_PROPERTY (QString payMethodId READ getPayMethodId WRITE setPayMethodId)
+    Q_PROPERTY (QString payMethodName READ getPayMethodName WRITE setPayMethodName)
     Q_PROPERTY (int consumeFactAmount READ getConsumeFactAmount WRITE setConsumeFactAmount)
     Q_PROPERTY (int consumeDiscountAmount READ getConsumeDiscountAmount WRITE setConsumeDiscountAmount)
     Q_PROPERTY (QString discount READ getDiscount WRITE setDiscount) 
+    Q_PROPERTY (QString discountName READ getDiscountName WRITE setDiscountName)
+
+    Q_PROPERTY (int isShowGiver READ getIsShowGiver WRITE setIsShowGiver)
     Q_PROPERTY (QString giverName READ getGiverName WRITE setGiverName)
     Q_PROPERTY (QString blessingWords READ getBlessingWords WRITE setBlessingWords)
 
@@ -28,19 +32,22 @@ public:
     CouponsObject(const CouponsObject& coupons,QObject* parent=0);
     CouponsObject& operator =(const CouponsObject& coupons);
     void FetchDataFromJson(const QJsonObject &json);
-    QString couponSeq;    //券序号
-    QString code;     //券ID号
-    QString couponName;  //券名
-    QString menuItem;   // 菜单分类
-    QString couponType;   //券类型
-    bool  storeChannel;      //是否门店券;
-    QString payMethodId;       //券支付方式ID
-    int consumeFactAmount;    //券实际售卖金额
-    int consumeDiscountAmount;    //券折扣金额
-    QString discount;
-
-    QString giverName ;                //券赠送者
-    QString blessingWords ;         //券赠送祝福
+    QString couponSeq = "";    //券序号
+    QString code = "";     //券ID号
+    QString name = "";  //券名
+    QString menuItem = "";   // 菜单分类
+    QString couponType = "";   //券类型
+    bool  storeChannel = false;      //是否门店券;
+    QString payMethodId  = "";       //券支付方式ID
+    QString payMethodName  = "";    //券支付方式名
+    int consumeFactAmount  = 0;    //券实际售卖金额
+    int consumeDiscountAmount = 0;    //券折扣金额
+    QString discount = "";                         //券折扣码
+    QString discountName = "";               //券折扣名
+\
+    int isShowGiver = 0;                 //是否显示 券赠送者
+    QString giverName  = "";                 //券赠送者
+    QString blessingWords  = "";          //券赠送祝福
 
 
     QList<SingleProductObject*> skus;
@@ -52,8 +59,8 @@ protected:
     inline QString getCode(){ return code; }
     inline void setCode(const QString& v){ code = v; }
 
-    inline QString getCouponName(){ return couponName; }
-    inline void setCouponName(const QString& v){ couponName = v; }
+    inline QString getName(){ return name; }
+    inline void setName(const QString& v){ name = v; }
 
     inline QString getMenuItem(){ return menuItem; }
     inline void setMenuItem(const QString& v){ menuItem = v; }
@@ -67,6 +74,9 @@ protected:
     inline QString getPayMethodId(){ return payMethodId; }
     inline void setPayMethodId(const QString& v){ payMethodId = v; }
 
+    inline QString getPayMethodName(){ return payMethodName; }
+    inline void setPayMethodName(const QString& v){ payMethodName = v; }
+
     inline int getConsumeFactAmount(){ return consumeFactAmount; }
     inline void setConsumeFactAmount(const int& v){ consumeFactAmount = v; }
 
@@ -76,6 +86,12 @@ protected:
     inline QString getDiscount(){ return discount; }
     inline void setDiscount(const QString& v){ discount = v; }
 
+    inline QString getDiscountName(){ return discountName; }
+    inline void setDiscountName(const QString& v){ discountName = v; }
+
+    inline int getIsShowGiver(){ return isShowGiver; }
+    inline void setIsShowGiver(const int& v){ isShowGiver = v; }
+
     inline QString getGiverName(){ return giverName; }
     inline void setGiverName(const QString& v){ giverName = v; }
 

fmTakeout/Model/orderObject.cpp

@@ -95,8 +95,9 @@ void OrderObject::FromJson(const QJsonObject &json)
         coupObject->consumeDiscountAmount = 0;
         coupObject->consumeFactAmount = 0;
         coupObject->storeChannel = false;
-        coupObject->couponName="";
+        coupObject->name="";
         coupObject->couponSeq=QString('0');
+        coupObject->isShowGiver=0;
         coupObject->FetchDataFromJson(coupJson);
         coupList.append(coupObject);
     }
@@ -131,6 +132,11 @@ QString OrderObject::getChannelName()
     QLOG_INFO() << QString("[<<<<---OrderObject:getChannelName [%1]--->>>>]").arg(channel);
     if ("MOD" == channel && 3 != orderType){
         if ( "4" ==  platformSource ) {
+            if ( "20" == businessType ) {
+                return QString::fromLocal8Bit("微信用星说");
+            } else if ( "30" == businessType ) {
+                return QString::fromLocal8Bit("拼单-MOD");
+            }
             return QString::fromLocal8Bit("微信-MOD");
         } else {
             return QString::fromLocal8Bit("星-MOD");
@@ -138,12 +144,12 @@ QString OrderObject::getChannelName()
     }else if("MOD" == channel && 3 == orderType){
         return QString::fromLocal8Bit("星-客诉");
 
+    }else if("WSG-MOD" == channel ){ // 兼容渠道名称不统一问题;
+        return QString::fromLocal8Bit("微信用星说");
+
     }else if("ELE" == channel){
         return QString::fromLocal8Bit("饿了么");
 
-    }else if("BAIDU" == channel){
-        return QString::fromLocal8Bit("百度外卖");
-
     }else if("MOP" == channel && 4 != orderType){
         if ( "5" ==  platformSource ) {
             return QString::fromLocal8Bit("口碑-MOP");
@@ -154,17 +160,7 @@ QString OrderObject::getChannelName()
     }else if("MOP" == channel && 4 == orderType){
         return QString::fromLocal8Bit("星-自测");
 
-    }else if("ORS" == channel){
-        return QString::fromLocal8Bit("星-预约");
-
-    }else if("STC" == channel){
-        return QString::fromLocal8Bit("SmartCase");
-
     }else{
-        if("HM" == channel) {
-            return QString::fromLocal8Bit("盒马");
-        }
-
         return QString::fromLocal8Bit("未知");
     }
 }

fmTakeout/Model/orderObject.h

@@ -81,6 +81,8 @@ class OrderObject : public QObject
     Q_PROPERTY (QString makeSource READ getMakeSource WRITE setMakeSource)
     Q_PROPERTY (QString makeDeviceId READ getMakeDeviceId WRITE setMakeDeviceId)
     Q_PROPERTY (QString businessType READ getBusinessType WRITE setBusinessType)
+    Q_PROPERTY (int forwardPosStatus READ getForwardPosStatus WRITE setForwardPosStatus)
+    Q_PROPERTY (int negativePosStatus READ getNegativePosStatus WRITE setNegativePosStatus)
     Q_PROPERTY (int deliveryStatus READ getDeliveryStatus WRITE setDeliveryStatus)
     Q_PROPERTY (int payStatus READ getPayStatus WRITE setPayStatus)
     Q_PROPERTY (int refundStatus READ getRefundStatus WRITE setRefundStatus)
@@ -88,6 +90,10 @@ class OrderObject : public QObject
     Q_PROPERTY (QString customerSex READ getCustomerSex WRITE setCustomerSex)
     Q_PROPERTY (QString platformSource READ getPlatformSource WRITE setPlatformSource)
     Q_PROPERTY (int orderIndex READ getOrderIndex WRITE setOrderIndex)
+
+    Q_PROPERTY (QString appointedTime READ getAppointedTime WRITE setAppointedTime)
+    Q_PROPERTY (QString appointedRemindTemplate READ getAppointedRemindTemplate WRITE setAppointedRemindTemplate)
+    Q_PROPERTY (QString subStoreId READ getSubStoreId WRITE setSubStoreId)
 public:
     OrderObject(QObject *parent=0)
         :QObject(parent){}
@@ -162,7 +168,7 @@ public:
     int orderIndex = 0;
     int updateTime = 0;
     QString customerSex = "";    //用户性别 1-男; 2-女
-    QString platformSource;       //订单平台来源：1 app; 2 ele; 3 ors; 4 WeChat; 5 口碑;
+    QString platformSource = "";       //订单平台来源：1 app; 2 ele; 3 ors; 4 WeChat; 5 口碑;
     int needInvoice = 0;
     int deliveryPrice = 0;     // 配送费
     int deliveryDiscount = 0;  // 配送费折扣
@@ -183,7 +189,14 @@ public:
     QString makeStatus = "";        // PMS 制作状态
     QString makeSource = "";       //PMS 制作来源: 普通扫描枪、扫描枪Now、顾客、PMS-kds、
     QString makeDeviceId = "";    //PMS 更新制作状态的设备Id
-    QString businessType;   //订单业务类型:  10:预约单   20:杯贴祝福   30:拼团
+    QString businessType = "0";   //订单业务类型:  10:预约单   20:杯贴祝福   30:拼团
+
+    QString appointedTime = "0000-00-00 00:00:00";    // 预约日期 [预约单-预约日期]  必须设置默认值否则插库失败;
+    QString appointedRemindTemplate = "";  // 预约提醒模板【新增字段：string】
+    QString subStoreId = "";                              // 子门店号      【新增字段：string】
+
+    int forwardPosStatus = 0;  // 正向单入机状态： 0:未知  1: 成功  2:失败;
+    int negativePosStatus = 0;  // 负向单同上;
 
     int deliveryStatus = 0;
     int payStatus = 0;
@@ -401,6 +414,12 @@ public:
     inline QString getBusinessType()const{return businessType;}
     inline void setBusinessType(const QString& v){businessType = v;}
 
+    inline int getForwardPosStatus()const{return forwardPosStatus;}
+    inline void setForwardPosStatus(const int& v){forwardPosStatus = v;}
+
+    inline int getNegativePosStatus()const{return negativePosStatus;}
+    inline void setNegativePosStatus(const int& v){negativePosStatus = v;}
+
     inline int getDeliveryStatus()const{return deliveryStatus;}
     inline void setDeliveryStatus(const int& v){deliveryStatus = v;}
 
@@ -427,6 +446,15 @@ public:
 
     inline QString getSecretSignal()const{return secretSignal;}
     inline void setSecretSignal(const QString& v){secretSignal = v;}
+
+    inline QString getAppointedTime()const{return appointedTime;}
+    inline void setAppointedTime(const QString& v){appointedTime = v;}
+
+    inline QString getAppointedRemindTemplate()const{return appointedRemindTemplate;}
+    inline void setAppointedRemindTemplate(const QString& v){appointedRemindTemplate = v;}
+
+    inline QString getSubStoreId()const{return subStoreId;}
+    inline void setSubStoreId(const QString& v){subStoreId = v;}
 };
 
 #endif // ORDEROBJECT_H

fmTakeout/Model/singleProductObject.h

@@ -10,6 +10,9 @@ class SingleProductObject : public QObject
 {
     Q_OBJECT
     Q_PROPERTY (QString code READ getCode WRITE setCode)
+    Q_PROPERTY (QString name READ getName WRITE setName)
+    Q_PROPERTY (int qty READ getQty WRITE setQty)
+    Q_PROPERTY (int price READ getPrice WRITE setPrice)
     Q_PROPERTY (bool isCoupon READ getIsCoupon WRITE setIsCoupon)
 
 public:
@@ -17,13 +20,25 @@ public:
     SingleProductObject(const SingleProductObject& singleProduct,QObject* parent=0);
     SingleProductObject& operator =(const SingleProductObject& singleProduct);
     void FetchDataFromJson(const QJsonObject &json);
-    QString code;
-    bool isCoupon; //此单品是否是券;
+    QString code  = "";
+    QString name  = "";
+    int qty = 0;
+    int price = 0;
+    bool isCoupon = false; //此单品是否是券;
 
 protected:
     inline QString getCode(){ return code; }
     inline void setCode(const QString& v){ code = v; }
 
+    inline QString getName(){ return name; }
+    inline void setName(const QString& v){ name = v; }
+
+    inline int getQty(){ return qty; }
+    inline void setQty(const int& v){ qty = v; }
+
+    inline int getPrice(){ return price; }
+    inline void setPrice(const int& v){ price = v; }
+
     inline bool getIsCoupon(){ return isCoupon; }
     inline void setIsCoupon(const bool& v){ isCoupon = v; }
 

fmTakeout/detailForm.cpp

@@ -138,10 +138,10 @@ void DetailForm::InitData(OrderObject *orderObject)
     {
         CouponsObject* tempCouponObj = orderObject->coupList[coupNum];
         ui->detailTable0->insertRow(pNum);
-        QString tempCouponName = tempCouponObj->couponName.length()?tempCouponObj->couponName:QString::fromLocal8Bit("预约券");
-        ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(tempCouponName));  // 预约券名
+        QString tempName = tempCouponObj->name.length()?tempCouponObj->name:QString::fromLocal8Bit("券");
+        ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(tempName));  // 券名
         ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
-        ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(QString('-')));  // 预约券价格
+        ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(QString('-')));  // 券价格
         ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
         ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(1)));  // 券数量
         ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignCenter);

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 4,2020,508,1
-    PRODUCTVERSION 4,2020,508,1
+    FILEVERSION 4,2020,520,1
+    PRODUCTVERSION 4,2020,520,1
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "PmsPlugin.exe"
                 VALUE "ProductName", "PMS Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "4.2020.508.1"
-                VALUE "FileVersion", "4.2020.508.1"
+                VALUE "ProductVersion", "4.2020.520.1"
+                VALUE "FileVersion", "4.2020.520.1"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -7,7 +7,8 @@
 
 //#define APP_VERSION               "4.2019.1225.1"
 //#define APP_VERSION               "4.2020.318.1"
-#define APP_VERSION               "4.2020.508.1"
+//#define APP_VERSION               "4.2020.423.1"
+#define APP_VERSION               "4.2020.520.1"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"