mergin

CMakeLists.txt

@@ -17,6 +17,13 @@ add_compile_options(-std=c++11)
 #设置执行文件输出目录
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 
+#设置编译后的可执行程序优先调用本地库(和可执行程序在同一个文件夹下的库)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+SET(CMAKE_SKIP_BUILD_RPATH TRUE)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+SET(CMAKE_INSTALL_RPATH ".")
+SET(CMAKE_LIBRARY_PATH ".")
+
 
 # 查找目录下的所有源文件,并将名称保存到 DIR_ 变量中
 aux_source_directory(./3rdParty/easylogging/ DIR_LOGS)

src/JsonModule.h

@@ -12,7 +12,7 @@ public:
     JsonModule();
     ~JsonModule();
     
-    void getPushOrders(IN const char* json,OUT std::vector<orderObj> &vecOrders);
+    bool getPushOrders(IN const char* json,OUT orderObj &order);
 
     /* 功能:判断是否是初始化数据
      * 参数:[1]待判断数据
@@ -53,17 +53,19 @@ public:
      * */
     bool convertDataOds2Pos(IN const std::string& data, OUT std::string& result);
 
-    std::string convertToNewOrderJson(orderObj &obj);
-    std::string convertToOrderStatusJson(orderStatusObj &obj);
-    std::string convertToRefundJson(refundObj &obj);
-    std::string convertToStockWarnJson(stockWarnObj &obj);
 
-    void getStatusObj(IN orderObj &order_obj,OUT orderStatusObj &status_obj);
-    void getRefundObj(IN orderObj &order_obj,OUT refundObj &refund_obj);
 private:
     std::string _getDeliveryTypeString(int type);
     //订单状态转换（转换为POS对应的状态）
     int _getPOSOrderStatus(int status);
+
+    void _getStatusObj(IN orderObj &order_obj,OUT orderStatusObj &status_obj);
+    void _getRefundObj(IN orderObj &order_obj,OUT refundObj &refund_obj);
+
+    std::string _convertToNewOrderJson(orderObj &obj);
+    std::string _convertToOrderStatusJson(orderStatusObj &obj);
+    std::string _convertToRefundJson(refundObj &obj);
+    std::string _convertToStockWarnJson(stockWarnObj &obj);
 };
 
 #endif