PCS Plugin Skip PackageFee Save

V 4.2023.4.12

fmTakeout/Control/flowControl.cpp

@@ -526,6 +526,8 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
         orderObject->isGiftitForward = 0 ;
         orderObject->callBackUrl = "";
         orderObject->pcsCallbackUrl = "";
+        orderObject->deliveryAtProd = false;
+        orderObject->packageFeeAtProduct = false;
 
         orderObject->FromJson(jsonObject);
         orderObject->pushOrderType=0;

fmTakeout/DTools/pmsOrdersData.cpp

@@ -449,6 +449,10 @@ bool PmsOrdersData::insertProductData(const QList<dishesObject*> proList, const
             if ( dishesObjectTemp->code.contains("Default",Qt::CaseInsensitive) || (tempCodeLeftHead<QString('0')||tempCodeLeftHead>QString('9')) || !dishesObjectTemp->qty ){
                 continue;
             }
+            // 跳过--外送包装费组装的 poskey;
+            if ( dishesObjectTemp->code == "6000201" ) {
+                continue;
+            }
 
             ++availProNum;
 

fmTakeout/Model/orderObject.h

@@ -111,6 +111,9 @@ class OrderObject : public QObject
     Q_PROPERTY (int deliveryType READ getDeliveryType WRITE setDeliveryType)
     Q_PROPERTY (bool skipPrint READ getSkipPrint WRITE setSkipPrint)
 
+    Q_PROPERTY (bool deliveryAtProd READ getDeliveryAtProd WRITE setDeliveryAtProd)
+    Q_PROPERTY (bool packageFeeAtProduct READ getPackageFeeAtProduct WRITE setPackageFeeAtProduct)
+
 public:
     OrderObject(QObject *parent=0)
         :QObject(parent){}
@@ -199,7 +202,6 @@ public:
     int orderDiscount = 0;    // 订单整单折扣金额
     int estimation = 0;       // 订单预计制作时间（单位:分钟）
     int appointmentDayFlag = 0;  // 预约当天标志 [0: 非预约当天(提前/延期)；1:预约当天(推送实物入机)]
-
     int productPrice = 0;
     int totalPrice = 0;
     int orderStatus = 0;
@@ -214,21 +216,20 @@ public:
     QString subStoreId = "";           // 子门店号      【新增字段：string】
     int globalServiceType;            // 全链路服务类型: globalServiceType【新增字段：int】
     int globalOrderType;               // 全链路订单类型: globalOrderType   【新增字段：int】
-
     int forwardPosStatus = 0;  // 正向单入机状态： 0:未知  1: 成功  2:失败;
     int negativePosStatus = 0;  // 负向单同上;
-
     int isGiftitForward;                 // 1: 美好咖啡 ;   0: 普通wsg;
     QString remindTicketTime;  // 提醒小票时间
     QString carNumber;            // 车牌号
     QString privacyPhone;        // 隐私号
     QString  callBackUrl;   // 为阿里云配置新域名, 用于获取订单详情, 和汇报订单入机情况: 拉取订单详情成功时手动添加到订单json报文体中为了入机汇报接口;
     QString pcsCallbackUrl;   // 为走 O2O Fufillment Service 链路的EC-OMS新系统, PCS门店 Pad上操作订单状态变更 请求正确的 Url 地址;
-
     int extendType;                      // 20 Mod Plus 类型订单
     int deliveryProvider;               // 配送商户:  1-蜂鸟 , 2-美团
     int deliveryType;                     // 配送方式:  1-二轮车 , 2-四轮车
     bool skipPrint;                    // 上游推送的订单 是否跳过打印;
+    bool deliveryAtProd;                       // 配送费已添加到商品列表标志;
+    bool packageFeeAtProduct;            // 包装费已添加到商品列表标志;
 
     int deliveryStatus = 0;
     int payStatus = 0;
@@ -526,6 +527,12 @@ public:
 
     inline bool getSkipPrint()const{return skipPrint;}
     inline void setSkipPrint(const bool& v){skipPrint = v;}
+
+    inline bool getDeliveryAtProd()const{return deliveryAtProd;}
+    inline void setDeliveryAtProd(const bool& v){deliveryAtProd = v;}
+
+    inline bool getPackageFeeAtProduct()const{return packageFeeAtProduct;}
+    inline void setPackageFeeAtProduct(const bool& v){packageFeeAtProduct = v;}
 };
 
 #endif // ORDEROBJECT_H

fmTakeout/detailForm.cpp

@@ -185,27 +185,8 @@ void DetailForm::InitData(OrderObject *orderObject)
     }
     /*********************************** 遍历 预约实物 券列表：券信息展示 end *********************************************************/
 
-    // 新增配送费 + 打包费
-    ui->detailTable0->insertRow(pNum);
-    ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(QString::fromLocal8Bit("配送费:")  + QString("6000101")  ));  // 配送费
-    ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
-    ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(orderObject->deliveryPrice)));  // 价格
-    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);
-    pNum = pNum + 1;
-    // 新增展示配送费折扣项显示;
-    if (orderObject->deliveryDiscount > 0 && orderObject->deliveryDiscount<10000){
-        ui->detailTable0->insertRow(pNum);
-        ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem( QString("( ") + QString::fromLocal8Bit("配送费折扣")));  // 配送费折扣
-        ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignRight);
-        ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem( QString("-") + Penny2Dollar(orderObject->deliveryDiscount)));  // 价格
-        ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
-        ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(1) + QString(" )")));  // 数量
-        ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignLeft);
-        pNum = pNum + 1;
-    }
-
+    // 打包费
+    if ( !orderObject->packageFeeAtProduct ) {
         ui->detailTable0->insertRow(pNum);
         ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(QString::fromLocal8Bit("包装费:") + QString("6000201") ));  // 包装费
         ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
@@ -225,6 +206,7 @@ void DetailForm::InitData(OrderObject *orderObject)
             ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignLeft);
             pNum = pNum + 1;
         }
+    }
 
     // 新增展示整单折扣项显示;
     if (orderObject->orderDiscount> 0){

fmTakeout/fmTakeout.rc

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

fmTakeout/preDefine.h

@@ -20,7 +20,8 @@
 //#define APP_VERSION               "4.2022.4.11"
 //#define APP_VERSION               "4.2022.4.28"
 //#define APP_VERSION               "4.2022.8.1"
-#define APP_VERSION               "4.2023.2.23"
+//#define APP_VERSION               "4.2023.2.23"
+#define APP_VERSION               "4.2023.4.12"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"