|
|
@@ -210,7 +210,18 @@ public class ConsumeBusiness {
|
|
|
if (R.isError(result)) {
|
|
|
return result;
|
|
|
}
|
|
|
- return this.postOrder(bo, mac, xfPwd);
|
|
|
+ try {
|
|
|
+ result = postOrder(bo, mac, xfPwd);
|
|
|
+ //如果入明细表出错,入明细异常表并返回错误
|
|
|
+ if (R.isError(result)) {
|
|
|
+ setConsumeDetailException(bo, JSONUtil.toJsonStr(result.getData()));
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ return R.ok();
|
|
|
+ } catch (Exception e) {
|
|
|
+ setConsumeDetailException(bo, e.getMessage());
|
|
|
+ return R.fail(new ErrorInfo(500, ApiErrorTypeConstants.EXCEPTION, e.getMessage(), ""));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -322,9 +333,11 @@ public class ConsumeBusiness {
|
|
|
if (R.isSuccess(response)) {
|
|
|
handleSuccessfulRecord(record, result);
|
|
|
} else {
|
|
|
+ setConsumeDetailException(record, JSONUtil.toJsonStr(response.getData()));
|
|
|
handleFailedRecord(record, response.getData(), result);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
+ setConsumeDetailException(record, e.getMessage());
|
|
|
handleException(record, e, result);
|
|
|
}
|
|
|
});
|