ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit 0298dafe25e20d9e19a4fa9d548b441d4fc9edbc 1 parent 16b817c4

修改提示

Inline Side-by-side
Showing 2 changed files with 16 additions and 16 deletions
... ... @@ -70,7 +70,7 @@ public class BuyerOrderController {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("确认收货成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"确认收货失败":result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ... @@ -79,10 +79,10 @@ public class BuyerOrderController {
public ApiResponse qualityCheckPass(BuyerOrderReq req) {
LOGGER.info("qualityCheckPass in. req is {}", req);
JSONObject result = buyerOrderService.qualityCheckPass(req);
if(result.getIntValue("code") == 200) {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("质检通过成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ... @@ -91,10 +91,10 @@ public class BuyerOrderController {
public ApiResponse qualityCheckNotPass(BuyerOrderReq req) {
LOGGER.info("qualityCheckNotPass in. req is {}", req);
JSONObject result = buyerOrderService.qualityCheckNotPass(req);
if(result.getIntValue("code") == 200) {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("质检不通过成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ... @@ -103,10 +103,10 @@ public class BuyerOrderController {
public ApiResponse miniFaultConfirm(BuyerOrderReq req) {
LOGGER.info("miniFaultConfirm in. req is {}", req);
JSONObject result = buyerOrderService.miniFaultCreate(req);
if(result.getIntValue("code") == 200) {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ... @@ -127,10 +127,10 @@ public class BuyerOrderController {
public ApiResponse judgeCenterPass(String orderCode) {
LOGGER.info("judgeCenterPass in. req is {}", orderCode);
JSONObject result = buyerOrderService.judgeCenterPass(orderCode);
if(result.getIntValue("code") == 200) {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定通过完成").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ... @@ -139,10 +139,10 @@ public class BuyerOrderController {
public ApiResponse judgeCenterNotPass(String orderCode) {
LOGGER.info("judgeCenterNotPass in. req is {}", orderCode);
JSONObject result = buyerOrderService.judgeCenterNotPass(orderCode);
if(result.getIntValue("code") == 200) {
if(result!=null&&result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定不通过完成").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
return new ApiResponse.ApiResponseBuilder().code(500).message(result==null?"操作失败":result.getString("message")).build();
}
}
... ...
... ... @@ -800,7 +800,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
LOGGER.info("qualityCheckNotPass insert db success! orderCode={},record={}", orderCode,record);
if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
throw new ServiceException(400,"错误：订单状态变化，请重新刷新列表");
throw new ServiceException(400,"错误：订单状态变化，操作[质检不通过]失败，请重新刷新列表");
}
//记录操作日志
... ... @@ -844,7 +844,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
LOGGER.info("miniFaultCreate insert db success! orderCode={}, record={}", orderCode,record);
if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
throw new ServiceException(400,"错误：订单状态变化，请重新刷新列表");
throw new ServiceException(400,"错误：订单状态变化，操作[瑕疵确认]失败，请重新刷新列表");
}
//记录操作日志
... ... @@ -892,7 +892,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
if( Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal()!=buyerOrder.getStatus().byteValue()){
throw new ServiceException(400,"错误：订单状态变化，不允许鉴定通过,请重新刷新列表");
throw new ServiceException(400,"错误：订单状态变化，操作[鉴定通过且发货]失败,请重新刷新列表");
}
... ... @@ -926,7 +926,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
throw new ServiceException(400,"错误：订单状态变化,鉴定通过失败,请重新刷新列表");
throw new ServiceException(400,"错误：订单状态变化,操作[鉴定通过]失败,请重新刷新列表");
}
//记录操作日志
... ... @@ -955,7 +955,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
if( Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()!=buyerOrder.getStatus().byteValue()){
throw new ServiceException(400,"错误：订单状态变化,鉴定不通过失败,请重新刷新列表");
throw new ServiceException(400,"错误：订单状态变化,操作[鉴定不通过]失败,请重新刷新列表");
}
//记录操作日志
... ...