库存预警接口修改

base/BaseDefine.h

@@ -92,6 +92,6 @@
 
 //推送类型
 #define ODS_PUSH_TYPE_HEARTBEAT               3          //心跳
-#define ODS_PUSH_TYPE_STOCKWARN               1015       //库存预警
+#define ODS_PUSH_TYPE_STOCKWARN               1006       //库存预警
 
 #endif
\ No newline at end of file

src/JsonModule.cpp

@@ -555,16 +555,22 @@ bool JsonModule::getInitBackData(IN const char* inJson,OUT std::string& outJson)
         rapidjson::Value& code = document["code"];
         status_code = atoi(code.GetString());
 
-        if(document.HasMember("OrderConfirmType")){
-            autoconfirm = document["OrderConfirmType"].GetInt();
+        if(document.HasMember("orderConfirmType")){
+            autoconfirm = document["orderConfirmType"].GetInt();
         }
         
-        if(document.HasMember("OrderPushPosIndex")){
-            default_pos = document["OrderPushPosIndex"].GetString();
+        if(document.HasMember("orderPushPosIndex")){
+            default_pos = document["orderPushPosIndex"].GetString();
         }
 
-        if(document.HasMember("message")){
-            msg = document["message"].GetString();
+        // if(document.HasMember("message")){
+        //     msg = document["message"].GetString();
+        // }
+        if(status_code==100){
+            msg="success";
+        }
+        else{
+            msg="failed";
         }
 
         rapidjson::StringBuffer buffer;
@@ -1405,29 +1411,23 @@ void JsonModule::_getStockWarnObj(IN const char* json,OUT stockWarnObj &warn_obj
     }
     else
     {
-        rapidjson::Value& products_array = document["products"];
-        if(products_array.IsArray())
-        {
-            for(unsigned int i=0;i<products_array.Size();i++){
-                rapidjson::Value& product_obj = products_array[i];
-
-                productWarn detail;
+        productWarn detail;
 
-                rapidjson::Value& qty = product_obj["qty"];
-                detail.stock = qty.GetInt();
+        rapidjson::Value& qty = document["qty"];
+        detail.stock = qty.GetInt();
 
-                rapidjson::Value& sku = product_obj["sku"];
-                detail.sku = sku.GetString();
+        rapidjson::Value& sku = document["sku"];
+        detail.sku = sku.GetString();
 
-                rapidjson::Value& safeQty = product_obj["safeQty"];
-                detail.safeQty = safeQty.GetInt();
+        if(document.HasMember("saftQty")){
+            rapidjson::Value& safeQty = document["saftQty"];
+            detail.safeQty = safeQty.GetInt();
+        }
 
-                rapidjson::Value& alertTime = product_obj["alertTime"];
-                detail.alertTime = alertTime.GetString();
+        rapidjson::Value& alertTime = document["alertTime"];
+        detail.alertTime = alertTime.GetString();
 
-                warn_obj.vecProducts.push_back(detail);
-            }
-        }
+        warn_obj.vecProducts.push_back(detail);
     }
 }