Commit b879b279 by ping.wu

500状态码处理

parent 1b93a61a
......@@ -2616,7 +2616,7 @@ public class OrderSdkAdapter {
public BaseOrderResponse convent2NewOrderUpdateThirdOrderCode(BaseResponse updateThirdOrderCode) {
BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 500);
baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 501);
baseOrderResponse.setErrmsg(updateThirdOrderCode.getMessage());
return baseOrderResponse;
......@@ -2624,7 +2624,7 @@ public class OrderSdkAdapter {
public BaseOrderResponse convent2UpdatePickUpGoodNo(BaseResponse baseResponse) {
BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
baseOrderResponse.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 500);
baseOrderResponse.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 501);
baseOrderResponse.setErrmsg(baseResponse.getMessage());
return baseOrderResponse;
......
......@@ -162,7 +162,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
CreateFatherSonOrderResponse createFatherSonOrderResponse = orderSdkAdapter.convent2NEWFatherOrderInfoReqs(baseResponse);
List<QueryOrdersResponse.DataBean.OrderBean> productOrderInfo = createFatherSonOrderResponse.getOrderBeanList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList());
if (CollectionUtils.isEmpty(productOrderInfo)) {
return CreateFatherSonOrderResponse.error("500", "");
return CreateFatherSonOrderResponse.error("501", "");
}
CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
BaseOrderResponse baseOrderResponse =updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
......@@ -1307,7 +1307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
dataBean.setOrders(orderBeanList);
}
response.setData(dataBean);
response.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 500);
response.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 501);
response.setErrmsg(baseResponse.getMessage());
return response;
}
......
......@@ -3899,7 +3899,7 @@ public class OrderAdapter {
*/
public String newSendPayFailedMessage() {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed");
return gson.toJson(map);
}
......
......@@ -303,7 +303,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
// 新版支付成功的情况下code为100
return newSendPaySuccessNoticeMessage();
} else {
return newSendPayFaileMessage();
return res;
}
}
return newSendPayFaileMessage();
......@@ -366,7 +366,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
*/
public String newSendPayFaileMessage() {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed");
return gson.toJson(map);
}
......@@ -1834,7 +1834,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
*/
public String refundFailedMessage(String errorMes) {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed:" + errorMes);
return gson.toJson(map);
}
......
......@@ -989,7 +989,7 @@ public class MallOrderServiceImpl implements MallOrderService {
*/
public String refundFaileMessage(String errorMes) {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed:" + errorMes);
return gson.toJson(map);
}
......
......@@ -209,7 +209,7 @@ public class OrderCommonService {
*/
public String newSendPayFaileMessage() {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed");
return JSON.toJSONString(map);
}
......
......@@ -2285,7 +2285,7 @@ public class OrderServiceImpl implements Orderservice {
*/
public String refundFaileMessage(String errorMes) {
Map<String, Object> map = Maps.newTreeMap();
map.put("code", 500);
map.put("code", 102);
map.put("message", "failed:" + errorMes);
return gson.toJson(map);
}
......
......@@ -163,7 +163,6 @@ public class CalculationServiceImpl {
// try {
activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);
// } catch (Exception ex) {
// ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
// throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
// }
//优惠券互斥
......
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