签名方式修改

eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -63,12 +63,12 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             String strSign = weChatMapSalesMsg.get("sign").toString().trim();
             String merchId = weChatMapSalesMsg.get("merchId").toString().trim()==null?"":weChatMapSalesMsg.get("merchId").toString().trim();
             String timestamp = weChatMapSalesMsg.get("timestamp").toString().trim()==null?"":weChatMapSalesMsg.get("timestamp").toString().trim();
-            String str = "JY8Te9WNt2SbMPH";
+            String str = configMapper.getConfigValue("salesdetai").trim();;
             if(timestamp.equals("")||merchId.equals("")){
-                return Result.error("1002","参数错误");
+                return Result.error("900000051","参数错误");
             }
             if(!strSign.equals(checkType(weChatMapSalesMsg.get("data").toString(),timestamp,str))){
-                return Result.error("1003","签名错误");
+                return Result.error("900000052","签名错误");
             }
             Map<String, Object> weSalesMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapSalesMsg.get("data").toString()), Map.class);
 
@@ -81,7 +81,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             weSalesMsg.put("offset",pageIndex);
             weSalesMsg.put("limit",pageSize);
             if((pageSize-pageIndex)>500){
-                return Result.error("1005","请求总数或时间区间过大");
+                return Result.error("900000053","请求总数或时间区间过大");
             }
                 //记录调用参数接口日志
             long diff=(Long.parseLong(endTime) - Long.parseLong(starTime))/1000/60/60;
@@ -90,7 +90,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
                 List<NewSystemFormatEntiy> list = mallMngChangeMapper.getSalesDetaiData(weSalesMsg);
                 //desList = DesUtils.encode(JSON.toJSONString(list));
                 if(list.size()==0){
-                    return Result.error("1004","该条件下无数据");
+                    return Result.error("900000054","该条件下无数据");
                 }else{
                     Map<String,Object> map = new HashMap<>();
                     map.put("total",list.size());
@@ -98,12 +98,12 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
                     return Result.success(map);
                 }
             }else{
-                return Result.error("1005","请求总数或时间区间过大");
+                return Result.error("900000053","请求总数或时间区间过大");
             }
 
         }catch (Exception e){
             logger.error("外部系统查询订单销售数据错误="+ JSON.toJSONString(msg),e);
-            return Result.error("1002","参数错误");
+            return Result.error("900000051","参数错误");
         }
 
     }
@@ -159,12 +159,12 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             String strSign = weChatMapMsg.get("sign").toString().trim();
             String merchId = weChatMapMsg.get("merchId").toString().trim()==null?"":weChatMapMsg.get("merchId").toString().trim();
             String timestamp = weChatMapMsg.get("timestamp").toString().trim()==null?"":weChatMapMsg.get("timestamp").toString().trim();
-            String str = "LYDfyGhwm1JcVlH";
+            String str = configMapper.getConfigValue("inventory");;
             if(timestamp.equals("")||merchId.equals("")){
-                return Result.error("1005","参数错误");
+                return Result.error("900000001","参数错误");
             }
             if(!strSign.equals(checkType(weChatMapMsg.get("data").toString(),timestamp,str))){
-                return Result.error("1003","签名错误");
+                return Result.error("900000002","签名错误");
             }
             Map<String, Object> weDtilMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapMsg.get("data").toString()), Map.class);
             Integer pageIndex = Integer.parseInt(weDtilMsg.get("pageIndex")+"");
@@ -174,13 +174,13 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             weChatMapMsg.put("merchId",merchId);
             weChatMapMsg.put("sign",strSign);
             if(pageSize>3000){
-                return Result.error("1004","请求数量过大");
+                return Result.error("900000003","请求数量过大");
             }
             //数据查询
             pullQueryData(weChatMapMsg);
             List<InventoryDataPushVo> list = inventoryDataMapper.getInventoryData(weChatMapMsg);
             if(list.size()==0){
-                return Result.error("1002","该条件下无数据");
+                return Result.error("900000004","该条件下无数据");
             }else{
                 Map<String,Object> map = new HashMap<>();
                 map.put("total",list.size());
@@ -189,7 +189,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             }
         }catch (Exception e){
             logger.error("外部系统查询库存系统条件="+JSON.toJSONString(msg),e);
-            return Result.error("1005","参数错误");
+            return Result.error("900000001","参数错误");
         }
 
     }