Commit 4c83c5be by hanghang.wang

围餐中英文切换

parent cbd88e83
...@@ -15,9 +15,12 @@ public class ServiceException extends RuntimeException { ...@@ -15,9 +15,12 @@ public class ServiceException extends RuntimeException {
private String message; private String message;
private String enMessage;
public ServiceException(ResponseResult result) { public ServiceException(ResponseResult result) {
this.result = result; this.result = result;
this.message = result.getMessage(); this.message = result.getMessage();
this.enMessage = result.getEnMessage();
} }
public ServiceException(ResponseResult result, String message) { public ServiceException(ResponseResult result, String message) {
...@@ -42,4 +45,12 @@ public class ServiceException extends RuntimeException { ...@@ -42,4 +45,12 @@ public class ServiceException extends RuntimeException {
public void setMessage(String message) { public void setMessage(String message) {
this.message = message; this.message = message;
} }
public String getEnMessage() {
return enMessage;
}
public void setEnMessage(String enMessage) {
this.enMessage = enMessage;
}
} }
...@@ -149,7 +149,6 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -149,7 +149,6 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO); if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO);
if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR); if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
if(storeTable.getData().getOrderState() == 1) { if(storeTable.getData().getOrderState() == 1) {
log.info("门店返回1,已开台");
return ResponseUtil.success(); return ResponseUtil.success();
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment