Merge branch 'master' of http://gitlab.freemud.com/guanghui.cui/familyMart_takeaway

Conflicts:
	src/JsonModule.cpp

src/JsonModule.cpp

@@ -359,7 +359,7 @@ std::string JsonModule::convertToNewOrderJson(orderObj &obj)
     writer.StartObject();
 
     writer.Key("fm_cmd");
-    writer.Int(obj.fm_cmd);
+    writer.Int(REQUEST_TYPE_NEWORDER_PUSH);
 
     writer.Key("channel");
     writer.String(obj.channel.c_str());
@@ -641,7 +641,7 @@ std::string JsonModule::convertToOrderStatusJson(orderStatusObj &obj)
     writer.StartObject();
 
     writer.Key("fm_cmd");
-    writer.Int(obj.fm_cmd);
+    writer.Int(REQUEST_TYPE_STATUS_CHANGE);
 
     writer.Key("order_id");
     writer.String(obj.order_id.c_str());
@@ -664,7 +664,7 @@ std::string JsonModule::convertToRefundJson(refundObj &obj)
     writer.StartObject();
 
     writer.Key("fm_cmd");
-    writer.Int(obj.fm_cmd);
+    writer.Int(REQUEST_TYPE_REFUND);
 
     writer.Key("channel");
     writer.String(obj.channel.c_str());
@@ -754,7 +754,7 @@ std::string JsonModule::convertToStockWarnJson(stockWarnObj &obj)
     writer.StartObject();
 
     writer.Key("fm_cmd");
-    writer.Int(obj.fm_cmd);
+    writer.Int(REQUEST_TYPE_STOCK_WARN);
 
     //----------------商品信息----------------
     writer.Key("products");
@@ -861,3 +861,17 @@ int JsonModule::_getPOSOrderStatus(int status)
     }
     return rltStatus;
 }
+
+void JsonModule::getStatusObj(IN orderObj &order_obj,OUT orderStatusObj &status_obj)
+{
+    status_obj.order_id=order_obj.order_id;
+    status_obj.order_status=order_obj.status;
+    status_obj.delivery_status=order_obj.deliveryInfo.status;
+}
+
+void JsonModule::getRefundObj(IN orderObj &order_obj,OUT refundObj &refund_obj)
+{
+    refund_obj.order_id=order_obj.order_id;
+    refund_obj.channel=order_obj.channel;
+    refund_obj.refund_amount=order_obj.total_price;
+}

src/JsonModule.h

@@ -58,6 +58,8 @@ public:
     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对应的状态）