通知回调状态

kmall-admin/src/main/java/com/kmall/admin/controller/OrderProcessRecordExternalController.java

@@ -50,14 +50,14 @@ public class OrderProcessRecordExternalController {
             String key = sysConfigService.getValueHk("HK_NOTICE_KEY");
             Integer dataNum = Integer.valueOf(sysConfigService.getValueHk("HK_NOTICE_NUM"));
             if(strSign.equals("")||timestamp.equals("")){
-                return Message.error("120101","参数错误");
+                return Message.success(false,"参数错误");
             }
             if(!strSign.equals(checkMsg(timestamp,key))){
-                return Message.error("120102","签名错误");
+                return Message.success(false,"签名错误");
             }
             List<OrderProcessRecordEntity> orderProcessRecordList = orderProcessRecordHkEntity.getRecordHkList();
             if(orderProcessRecordList.size()>dataNum){
-                return Message.error("120105","通知数据最多"+dataNum+"条，请分批通知");
+                return Message.success(false,"通知数据最多"+dataNum+"条，请分批通知");
             }
             // 根据指定属性分组，并统计数量（key：指定属性，value：数量）
             Map<Object, Long> mapGroup = orderProcessRecordList.stream().collect(Collectors.groupingBy(recordEntity -> recordEntity.getOrderSn(), Collectors.counting()));
@@ -65,12 +65,12 @@ public class OrderProcessRecordExternalController {
             Stream<Object> stringStream = mapGroup.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey());
             Long num = stringStream.count();
             if(num>0L){
-                return Message.error("120103","订单数据存在重复");
+                return Message.success(false,"订单数据存在重复");
             }
             return orderProcessRecordService.saveHkNoticeMsg(orderProcessRecordList);
         }catch (Exception e){
             logger.error("hknoticeMsg---订单流转信息回调通知接口数据="+ JSON.toJSONString(outRequestMessage),e);
-            return Message.error("120101","参数错误");
+            return Message.success(false,"参数错误");
         }
     }
 

kmall-admin/src/main/java/com/kmall/admin/haikong/utils/Message.java

@@ -17,85 +17,62 @@ import java.io.Serializable;
 public class Message implements Serializable {
 
 	private static final long serialVersionUID = 4081619286503989887L;
+	private static String success;
+	private static String message;
 
 
 	/**
 	 * 消息代码 , 由使用者自由发挥
 	 */
-	private String code;
+	private Boolean Success;
 	/**
 	 * 消息内容体 , 由使用者自由发挥
 	 */
-	private String msg;
+	private String Message;
+
+//	/**
+//	 * 消息代码 , 由使用者自由发挥
+//	 */
+//	private String Success;
+//	/**
+//	 * 消息内容体 , 由使用者自由发挥
+//	 */
+//	private String Message;
+
+
 
 	private Message() {
 	}
 
-	public String getCode() {
-		return code;
+	public Boolean getSuccess() {
+		return Success;
 	}
-	public String getMsg() {
-		return msg;
+
+	public String getMessage() {
+		return Message;
 	}
 
 	public static Builder builder() {
 		return new Builder();
 	}
-	public static Builder builder(String code, String msg) {
-		return new Builder(code, msg);
-	}
-	public static Builder builder(String code, String msg, Object extend) {
-		return new Builder(code, msg, extend);
+	public static Builder builder(Boolean Success, String Message) {
+		return new Builder(Success, Message);
 	}
-
-
+	
 	//---------- 直接返回结果 ----------
 	public static Message success() {
 		return new Builder().build();
 	}
-	public static Message success(Object object) {
-		Builder builder = new Builder();
-		return builder.setExtend(object).build();
-	}
-
-	public static Message success(String msg) {
-		return new Builder(MessageCode.SUCCESS_CODE, msg).build();
-	}
-
-	public static Message success(String msg, Object object) {
-		Builder builder = new Builder(MessageCode.SUCCESS_CODE, msg, object);
-		return builder.build();
-	}
 
-	public static Message success(String code, String msg, Object object) {
-		Builder builder = new Builder(code, msg, object);
-		return builder.build();
-	}
-	public static Message success(String code, String msg) {
-		return new Builder(code, msg).build();
+	public static Message success(boolean Success, String Message) {
+		return new Builder(Success, Message).build();
 	}
 
 	//--- 错误----------
-	public static Message error() {
-		return new Builder(MessageCode.ERROR_CODE, MessageCode.ERROR_MSG).build();
-	}
-	public static Message error(String msg) {
-		return new Builder(MessageCode.ERROR_CODE, msg).build();
-	}
-	public static Message error(String code, String msg) {
-		return new Builder(code, msg).build();
+	public static Message error(boolean Success, String Message) {
+		return new Builder(Success, Message).build();
 	}
 
-	//--- 失败----------
-	public static Message failed() {
-		return new Builder(MessageCode.FAILED_CODE, MessageCode.FAILED_MSG).build();
-	}
-	public static Message failed(String msg) {
-		return new Builder(MessageCode.FAILED_CODE, msg).build();
-	}
-	public static Message failed(String code, String msg) {
-		return new Builder(code, msg).build();
-	}
 
 
 	/**
@@ -103,58 +80,45 @@ public class Message implements Serializable {
 	 */
 	public static class Builder {
 
-		private boolean isSuccess;
-		private String code;
-		private String msg;
-		private Object extend;
+//		private boolean isSuccess;
+//		private Object extend;
+		private Boolean Success;
+		private String Message;
 
 		public Builder() {
-			this.isSuccess = true;
-			this.code = MessageCode.SUCCESS_CODE;
-			this.msg = MessageCode.SUCCESS_MSG;
-			this.extend = null;
+			this.Success = true;
+			this.Message = MessageCode.SUCCESS_MSG;
 		}
 
-		public Builder(String code, String msg) {
-			this.code = Strings.isNullOrEmpty(code) ? MessageCode.SUCCESS_CODE : code;
-			this.msg = Strings.isNullOrEmpty(msg) ? MessageCode.SUCCESS_MSG : msg;
-			this.isSuccess = this.code.equals(MessageCode.SUCCESS_CODE) ? true : false;
+		public Builder(boolean Success, String Message) {
+			this.Success = Success;
+			this.Message = Message;
 		}
 
-		public Builder(String code, String msg, Object extend) {
-			this.code = Strings.isNullOrEmpty(code) ? MessageCode.SUCCESS_CODE : code;
-			this.msg = Strings.isNullOrEmpty(msg) ? MessageCode.SUCCESS_MSG : msg;
-			this.extend = extend;
-			this.isSuccess = this.code.equals(MessageCode.SUCCESS_CODE) ? true : false;
-		}
+
 
 		public Message build() {
 			Message message = new Message();
-			message.code = this.code;
-			message.msg = this.msg;
+			message.Success = this.Success;
+			message.Message = this.Message;
 			return message;
 		}
 
-		public void setSuccess(boolean success) {
-			isSuccess = success;
+		public Boolean getSuccess() {
+			return Success;
 		}
 
-		public Builder setCode(String code) {
-			this.code = code;
-			return this;
+		public void setSuccess(Boolean success) {
+			Success = success;
 		}
 
-		public Builder setMsg(String msg) {
-			this.msg = msg;
-			return this;
+		public String getMessage() {
+			return Message;
 		}
 
-		public Builder setExtend(Object extend) {
-			this.extend = extend;
-			return this;
+		public void setMessage(String message) {
+			Message = message;
 		}
-
-
 	}
 
 }

kmall-admin/src/main/java/com/kmall/admin/haikong/utils/ResponseMessage.java

@@ -1,255 +0,0 @@
-package com.kmall.admin.haikong.utils;
-
-import com.google.common.base.Strings;
-import com.kmall.admin.utils.data.response.ResponseMessageData;
-import com.kmall.admin.utils.oms.result.Result;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Scott Chen
- * @date 2017/4/20
- */
-public class ResponseMessage {
-
-    private static final String SUCCESS_CODE = "0";
-    private static final String SUCCESS_INFO = "成功";
-
-    public static final String ERROR_CODE = "-1";
-    public static final String ERROR_INFO = "消息错误";
-
-    private static final String FAILURE_CODE = "-2";
-    private static final String FAILUER_INFO = "消息失败";
-
-    private String code;
-    private String msg;
-    private ResponseMessageData data;
-
-    private ResponseMessage() {
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public ResponseMessageData getData() {
-        return data;
-    }
-
-    public static boolean isSuccess(ResponseMessage message) {
-        return message.getCode() == null ? false : message.getCode().equals(SUCCESS_CODE) ? true : false;
-    }
-
-    public static ResponseMessage transResponseMessage(Object object) {
-        if (object instanceof Message) {
-            Message message = (Message) object;
-            return new Builder(message.getCode(), message.getMsg(), Object.class).build();
-        } else if (object instanceof Result) {
-            Result result = (Result) object;
-            return new Builder(result.getCode(), result.getMsg(), result.getData(), Object.class).build();
-        } else {
-            return null;
-        }
-
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    public static Builder builder(String code, String msg) {
-        return new Builder(code, msg);
-    }
-    public static Builder builder(String code, String msg, ResponseMessageData responseMessageData) {
-        return new Builder(code, msg, responseMessageData);
-    }
-    public static Builder builder(String code, String msg, List list) {
-        return new Builder(code, msg, list);
-    }
-    public static <T> Builder builder(T t,  Class<T> type) {
-        return new Builder(SUCCESS_CODE, SUCCESS_INFO, t, type);
-    }
-    public static <T> Builder builder(String msg, T t, Class<T> type) {
-        return new Builder(SUCCESS_CODE, msg, t, type);
-    }
-    public static <T> Builder builder(String code, String msg, T t, Class<T> type) {
-        return new Builder(code, msg, t, type);
-    }
-
-
-    //---------- 直接返回结果 ----------
-    //成功
-    public static ResponseMessage success() {
-        return new Builder().build();
-    }
-    public static ResponseMessage success(String code, String msg) {
-        return new Builder(code, msg).build();
-    }
-    public static ResponseMessage success(String msg) {
-        return new Builder(SUCCESS_CODE, msg).build();
-    }
-
-    public static ResponseMessage success(Map map) {
-        return new Builder(SUCCESS_CODE, SUCCESS_INFO, map).build();
-    }
-    public static ResponseMessage success(String msg, Map map) {
-        return new Builder(SUCCESS_CODE, msg, map).build();
-    }
-    public static ResponseMessage success(List rows) {
-        return new Builder(SUCCESS_CODE, SUCCESS_INFO, rows).build();
-    }
-    public static ResponseMessage success(String msg, List rows) {
-        return new Builder(SUCCESS_CODE, msg, rows).build();
-    }
-    public static ResponseMessage success(String code, String msg, List rows) {
-        return new Builder(code, msg, rows).build();
-    }
-    public static <T> ResponseMessage success(T t, Class<T> type) {
-        return new Builder(SUCCESS_CODE, SUCCESS_INFO, t, type).build();
-    }
-    public static <T> ResponseMessage success(String msg, T t, Class<T> type) {
-        return new Builder(SUCCESS_CODE, msg, t, type).build();
-    }
-    public static <T> ResponseMessage success(String code, String msg, T t, Class<T> type) {
-        return new Builder(code, msg, t, type).build();
-    }
-
-    //错误
-    public static ResponseMessage error() {
-        return new Builder(ERROR_CODE, ERROR_INFO).build();
-    }
-    public static ResponseMessage error(String code, String msg) {
-        return new Builder(code, msg).build();
-    }
-    public static ResponseMessage error(String msg) {
-        return new Builder(ERROR_CODE, msg).build();
-    }
-    public static ResponseMessage error(Map map) {
-        return new Builder(ERROR_CODE, ERROR_INFO, map).build();
-    }
-    public static ResponseMessage error(String msg, Map map) {
-        return new Builder(ERROR_CODE, msg, map).build();
-    }
-    public static ResponseMessage error(List rows) {
-        return new Builder(ERROR_CODE, ERROR_INFO, rows).build();
-    }
-    public static ResponseMessage error(String msg, List rows) {
-        return new Builder(ERROR_CODE, msg, rows).build();
-    }
-    public static ResponseMessage error(String code, String msg, List rows) {
-        return new Builder(code, msg, rows).build();
-    }
-
-    //失败
-    public static ResponseMessage failed() {
-        return new Builder(FAILURE_CODE, FAILUER_INFO).build();
-    }
-    public static ResponseMessage failed(String code, String msg) {
-        return new Builder(code, msg).build();
-    }
-    public static ResponseMessage failed(String msg) {
-        return new Builder(FAILURE_CODE, msg).build();
-    }
-
-    public static ResponseMessage failed(Map map) {
-        return new Builder(ERROR_CODE, ERROR_INFO, map).build();
-    }
-    public static ResponseMessage failed(String msg, Map map) {
-        return new Builder(ERROR_CODE, msg, map).build();
-    }
-    public static ResponseMessage failed(List rows) {
-        return new Builder(FAILURE_CODE, FAILUER_INFO, rows).build();
-    }
-    public static ResponseMessage failed(String msg, List rows) {
-        return new Builder(ERROR_CODE, msg, rows).build();
-    }
-    public static ResponseMessage failed(String code, String msg, List rows) {
-        return new Builder(code, msg, rows).build();
-    }
-
-    /**
-     * 消息构建器类
-     */
-    public static class Builder {
-        private String code;
-        private String msg;
-        private ResponseMessageData data;
-
-        public Builder() {
-            this.code = SUCCESS_CODE;
-            this.msg = SUCCESS_INFO;
-            this.data = ResponseMessageData.builder().build();
-        }
-
-        public Builder(String code, String msg) {
-            this.code = Strings.isNullOrEmpty(code) ? SUCCESS_CODE : code;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = ResponseMessageData.builder().build();
-        }
-
-        public Builder(String code, String msg, ResponseMessageData responseMessageData) {
-            this.code = Strings.isNullOrEmpty(code) ? SUCCESS_CODE : code;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = responseMessageData;
-        }
-
-        public Builder(String code, String msg, Map map) {
-            this.code = Strings.isNullOrEmpty(code) ? SUCCESS_CODE : code;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = ResponseMessageData.builder(map, Map.class).build();
-        }
-
-        public Builder(String code, String msg, List rows) {
-            this.code = Strings.isNullOrEmpty(code) ? SUCCESS_CODE : code;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = ResponseMessageData.builder(rows).build();
-        }
-
-        public <T> Builder(T t, Class<T> type) {
-            this.code = SUCCESS_CODE;
-            this.msg = SUCCESS_INFO;
-            this.data = ResponseMessageData.builder(t, type).build();
-        }
-
-        public <T> Builder(String msg, T t, Class<T> type) {
-            this.code = SUCCESS_CODE;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = ResponseMessageData.builder(t, type).build();
-        }
-
-        public <T> Builder(String code, String msg, T t, Class<T> type) {
-            this.code = Strings.isNullOrEmpty(code) ? SUCCESS_CODE : code;
-            this.msg = Strings.isNullOrEmpty(msg) ? SUCCESS_INFO : msg;
-            this.data = ResponseMessageData.builder(t, type).build();
-        }
-
-        public Builder setCode(String code) {
-            this.code = code;
-            return this;
-        }
-
-        public Builder setMsg(String msg) {
-            this.msg = msg;
-            return this;
-        }
-
-        public Builder setData(ResponseMessageData data) {
-            this.data = data;
-            return this;
-        }
-
-        public ResponseMessage build() {
-            ResponseMessage message = new ResponseMessage();
-            message.code = this.code;
-            message.msg = this.msg;
-            message.data = this.data;
-            return message;
-        }
-
-    }
-}
-

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderProcessRecordServiceImpl.java

@@ -168,14 +168,14 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
        try{
            Integer count = orderProcessRecordDao.queryHkOrderTotal(orderProcessRecordList);
            if(orderProcessRecordList.size()!=count){
-               return Message.success("120104","订单不存在");
+               return Message.success(false,"订单不存在");
            }else{
                orderProcessRecordDao.updateHkNoticeMsg(orderProcessRecordList);
            }
        }catch (Exception e){
            logger.error("saveHkNoticeMsg---海控通知回调接口插入错误="+ JSON.toJSONString(orderProcessRecordList),e);
-           return Message.success("120101","参数错误");
+           return Message.success(false,"参数错误");
        }
-        return Message.success("120100","成功");
+        return Message.success(true,"成功");
     }
 }