新增销售单部分金额字段

fmPlugin/fmPlugin.cpp

@@ -124,12 +124,15 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject, bool bVe
     cObj.insert("pay_str", "非码外卖");
     cObj.insert("pay_ebcode", orderObject->channel);
     cObj.insert("pay_ebcode_str", orderObject->channelName);
-    cObj.insert("total_fee", orderObject->total_fee);
-    cObj.insert("discount_fee", orderObject->discount_fee);
-    cObj.insert("send_fee", orderObject->send_fee);
-    cObj.insert("user_fee", orderObject->user_fee);
-    cObj.insert("shop_fee", orderObject->shop_fee);
-    cObj.insert("invoice_amount",orderObject->shop_fee);
+    cObj.insert("products_fee", orderObject->shop_fee-orderObject->package_fee);    // 商品金额
+    cObj.insert("service_fee", orderObject->service_fee);   // 平台佣金
+    cObj.insert("discount_fee", orderObject->discount_fee); // 优惠总额
+    cObj.insert("dis_shop_fee", orderObject->dis_shop_fee); // 商家承担优惠金额
+    cObj.insert("dis_platform_fee", orderObject->dis_platform_fee); // 平台承担优惠金额
+    cObj.insert("send_fee", orderObject->send_fee);         // 配送费
+    cObj.insert("shop_fee", orderObject->total_fee-orderObject->send_fee-orderObject->service_fee-orderObject->dis_shop_fee);         // 商户能够拿到的钱(去除平台佣金)
+    cObj.insert("package_fee", orderObject->package_fee);   // 打包费
+    cObj.insert("invoice_amount",orderObject->total_fee-orderObject->send_fee-orderObject->service_fee-orderObject->dis_shop_fee);
     cObj.insert("paid_trans_id",orderObject->order_id);
     cObj.insert("fm_id",orderObject->order_id);
     rObj.insert("pay_id", cObj);

fmTakeaway/Model/orderObject.cpp

@@ -19,6 +19,46 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+int OrderObject::getservice_fee() const
+{
+    return service_fee;
+}
+
+void OrderObject::setservice_fee(const int &v)
+{
+    service_fee = v;
+}
+
+int OrderObject::getdis_platform_fee() const
+{
+    return dis_platform_fee;
+}
+
+void OrderObject::setdis_platform_fee(const int &v)
+{
+    dis_platform_fee = v;
+}
+
+int OrderObject::getdis_shop_fee() const
+{
+    return dis_shop_fee;
+}
+
+void OrderObject::setdis_shop_fee(const int &v)
+{
+    dis_shop_fee = v;
+}
+
+int OrderObject::getpackage_fee() const
+{
+    return package_fee;
+}
+
+void OrderObject::setpackage_fee(const int &v)
+{
+    package_fee = v;
+}
+
 int OrderObject::getstatus() const
 {
     return status;

fmTakeaway/Model/orderObject.h

@@ -52,6 +52,16 @@ public:
     Q_PROPERTY (int delivery_status READ getdelivery_status WRITE setdelivery_status)
     Q_PROPERTY (QString fm_id READ getfm_id WRITE setfm_id)
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
+    Q_PROPERTY (int service_fee READ getservice_fee WRITE setservice_fee)
+    Q_PROPERTY (int dis_platform_fee READ getdis_platform_fee WRITE setdis_platform_fee)
+    Q_PROPERTY (int dis_shop_fee READ getdis_shop_fee WRITE setdis_shop_fee)
+    Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee)
+
+
+    int service_fee;         //平台佣金
+    int dis_platform_fee;    //平台承担的优惠金额
+    int dis_shop_fee;        //商户承担的优惠金额
+    int package_fee;         //打包费
 
     QString address;         //地址
     QString channel;         //渠道
@@ -90,7 +100,18 @@ public:
     int user_fee;            //应付金额
     QStringList records;         //订单操作记录
 
+
+
 protected:
+    int getservice_fee() const ;
+    void setservice_fee(const int& v);
+    int getdis_platform_fee() const ;
+    void setdis_platform_fee(const int& v);
+    int getdis_shop_fee() const ;
+    void setdis_shop_fee(const int& v);
+    int getpackage_fee() const ;
+    void setpackage_fee(const int& v);
+
     int getstatus() const ;
     void setstatus(const int& v);
     QString getChannel() const ;

fmTakeaway/Network/billSocket.cpp

@@ -48,6 +48,7 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
        return false;
    }
    recvJson = QJsonDocument::fromJson(recvArray).object();
+   qDebug() << recvJson;
    reply->deleteLater();
 
    return true;

fmTakeaway/preDefine.h

@@ -56,8 +56,8 @@
 #define JSON_DELIVERYNAME       "deliveryman_name"
 #define JSON_DELIVERYPHONE      "deliveryman_phone"
 #define JSON_ORDER              "order"
-#define JSON_SHOPSTATUS         "channel_shops"
-#define JSON_SHOPSTATUSDESC     "business_status_desc"
+#define JSON_SHOPSTATUS         "channels"
+#define JSON_SHOPSTATUSDESC     "status_desc"
 
 // 订单的操作码
 #define OPERATION_GETDELIVERS   "getDelivers"