fix bug: 隔日预约单存储 reserve_type 未存储为 10

Version: 4.2021.5.10

fmTakeout/Control/flowControl.cpp

@@ -1758,17 +1758,14 @@ void FlowControl::_CrondClearExpireOrder()
     OrderObject *order=nullptr;
     m_OrderEntryMutex.lock();
     foreach (order, m_FmOrdersMap.values()) {
-        //需要考虑预约实物(ORS)的订单：配送日期是否是当天,如果是当天则不能根据订单 createTime 进行清除;
-        if( "ORS" == order->channel ) {
-            QDate deliveryDate = QDate::fromString((order->deliveryTime).mid(0,10),"yyyy-MM-dd");
-            if( ! deliveryDate.daysTo(currentDate) ) {
-                continue;
-            }
-        }
         QDate createDate = QDate::fromString( (order->createTime).mid(0,10),"yyyy-MM-dd");
+        // 如果是预约单 则需以预约日期为准，实现过期订单清理条件;
+         if ( 7 == order->orderType || 11 == order->orderType ) {
+             createDate = QDate::fromString( (order->expectDate).mid(0,10),"yyyy-MM-dd");
+         }
 
-        //QLOG_INFO()<<QString("[<<<<---_CrondClearExpireOrder-> order->createTime:%1--->>>>]").arg(order->createTime); //--按秒数来验证ok--
-        QLOG_INFO()<<QString("[<<<<---_CrondClearExpireOrder-> order  createDate:%1--->>>>]").arg(createDate.toString("yyyy-MM-dd"));
+        //QLOG_INFO()<<QString("[<<<<---_CrondClearExpireOrder-> order->createTime Or expectDate :%1--->>>>]").arg(order->createTime); //--按秒数来验证ok--
+        QLOG_INFO()<<QString("[<<<<---_CrondClearExpireOrder-> order  createDate Or expectDate :%1--->>>>]").arg(createDate.toString("yyyy-MM-dd"));
         //qint64 seconds = createDateTime.secsTo(currentDateTime);  //--按秒数来验证ok--
         qint64 days = createDate.daysTo(currentDate);
         //QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---_CrondClearExpireOrder: ClearExpireOrder: 相差多少秒:%1--->>>>]").arg(seconds); //--按秒数来验证ok--

fmTakeout/DTools/pmsOrdersData.cpp

@@ -282,7 +282,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef)
         int tempBusinessType = orderObj->businessType.toInt();
         if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource)
             tempBusinessType = 20;
-        if ( 7 == orderObj->orderType)
+        if ( 7 == orderObj->orderType || 11 == orderObj->orderType )
             tempBusinessType = 10;
         else if (8 == orderObj->orderType) {
             tempBusinessType = 30;

fmTakeout/DTools/qtRedisClient.cpp

@@ -89,7 +89,7 @@ bool QtRedisClient::pushOrder2Redis(const OrderObject* orderObj ){
     orderStatusObj.insert("MAKESOURCE",orderObj->makeSource);
     orderStatusObj.insert("MAKEDEVICEID",orderObj->makeDeviceId);
     orderStatusObj.insert("MAKEDEVICENAME","");
-    if ( 7== orderObj->orderType ) {
+    if ( 7== orderObj->orderType ||  11== orderObj->orderType) {
         orderStatusObj.insert( "ARRIVEAHEAD", orderObj->inAdvanceTakemeal );
     }
     QJsonDocument orderStatusDoc = QJsonDocument(orderStatusObj);

fmTakeout/Model/orderObject.cpp

@@ -133,7 +133,9 @@ QString OrderObject::getChannelName()
         if (3 == orderType ) {
             return QString::fromLocal8Bit("星-客诉");
         } else if ( 7 == orderType  ) {
-            return QString::fromLocal8Bit("预-MOD");
+            return QString::fromLocal8Bit("预-MOD-当日");
+        } else if ( 11 == orderType  ) {
+            return QString::fromLocal8Bit("预-MOD-隔日");
         } else if ( 8 == orderType  ) {
             return QString::fromLocal8Bit("拼-MOD");
         } else {
@@ -155,7 +157,9 @@ QString OrderObject::getChannelName()
 
     }else if("ELE" == channel){
         if ( 7 == orderType  ) {
-            return QString::fromLocal8Bit("预-饿了么");
+            return QString::fromLocal8Bit("预-饿了么-当日");
+        } else if ( 11 == orderType  ) {
+            return QString::fromLocal8Bit("预-饿了么-隔日");
         } else {
             return QString::fromLocal8Bit("饿了么");
         }
@@ -164,7 +168,9 @@ QString OrderObject::getChannelName()
         if (4 == orderType ) {
             return QString::fromLocal8Bit("星-自测");
         } else if ( 7 == orderType  ) {
-            return QString::fromLocal8Bit("预-MOP");
+            return QString::fromLocal8Bit("预-MOP-当日");
+        } else if ( 11 == orderType  ) {
+            return QString::fromLocal8Bit("预-MOP-隔日");
         } else if ( 8 == orderType  ) {
             return QString::fromLocal8Bit("拼-MOP");
         } else {

fmTakeout/detailForm.cpp

@@ -54,7 +54,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     } else {
         deliveryFinishTime = orderObject->deliveryTime;
     }
-    if (7 == orderObject->orderType) {
+    if (7 == orderObject->orderType  || 11 == orderObject->orderType )  {
         deliveryFinishTime = deliveryFinishTime + QString::fromLocal8Bit("预约时间: ") + orderObject->expectDate;
     }
     ui->detailLab2->setText(deliveryFinishTime);

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 4,2021,1,8
-    PRODUCTVERSION 4,2021,1,8
+    FILEVERSION 4,2021,5,10
+    PRODUCTVERSION 4,2021,5,10
     //*************************************************************************//
     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.2021.1.8"
-                VALUE "FileVersion", "4.2021.1.8"
+                VALUE "ProductVersion", "4.2021.5.10"
+                VALUE "FileVersion", "4.2021.5.10"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -13,7 +13,8 @@
 //#define APP_VERSION               "4.2020.6.29"
 //#define APP_VERSION               "4.2020.6.30"
 //#define APP_VERSION               "4.2020.8.10"
-#define APP_VERSION               "4.2021.1.8"
+//#define APP_VERSION               "4.2021.1.8"
+#define APP_VERSION               "4.2021.5.10"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"