wangyingyang

fix

......@@ -34,7 +34,9 @@ public enum ErrorCodeEnum implements BaseEnum {
SKUS_STOCK_NO_ENOUGH_TODAY(406000008, "下单菜品: {0} 库存不足"),
ORDER_CANCEL(406000009, "订单已自动取消")
ORDER_CANCEL(406000009, "订单已自动取消"),
ORDER_PAY_CANCEL_FAILED(406000010, "支付撤销失败")
;
private final int code;
......
......@@ -373,15 +373,16 @@ public class PayServiceClient {
// RequestBody body = RequestBody.create(mediaType, jsonDataString);
String url = businessConfig.getCancelPayUrl() + "?" + "appid=" + appId + "&paycontent=" + payContent + "&signinfo=" + signInfo;
log.info("cancel order pay url:" + url);
Request request =
new Request.Builder().url(url).get().build();
Response payResponse = client.newCall(request).execute();
if (payResponse.code() != 200) {
log.error("cancel order pay failed, resp http code:" + payResponse.code());
return false;
}
String cancelPayJsonData = payResponse.body().string();
log.info("pay json:" + cancelPayJsonData);
log.info("cancel order pay resp:" + cancelPayJsonData);
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(Feature.ALLOW_MISSING_VALUES, true);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
......@@ -391,7 +392,8 @@ public class PayServiceClient {
objectMapper.readValue(cancelPayJsonData, CancelPayResponseDto.class);
if (payResponseDto.getCode() != 0) {
return false;
log.error("cancel order pay failed, resp code:" + payResponseDto.getCode());
throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_CANCEL_FAILED);
} else {
// 更新订单撤销状态
final var build =
......@@ -404,8 +406,8 @@ public class PayServiceClient {
return true;
}
} catch (Exception e) {
log.error(e.getStackTrace().toString());
return false;
log.error(e.getMessage());
throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_CANCEL_FAILED);
}
}
}
......