From 45b4003c1c0ed384b78ff67d0d86229d987c76da Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 22 Aug 2023 21:06:33 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=8E=A8=E9=80=81sap=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E5=A0=B1=E9=8C=AF=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 7 ++++--- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 008e54f5..17b66682 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -25,6 +25,7 @@ import com.dxhy.erp.utils.HmacSHA1Util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.*; @@ -927,7 +928,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT))); + return ResponseEntity.status(HttpStatus.GATEWAY_TIMEOUT).body(JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT))); } catch(NullPointerException exception){ log.error("同步SAP失败,报错信息为:{}", exception); exception.printStackTrace(); @@ -940,7 +941,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT))); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT))); } catch(Exception exception){ log.error("同步SAP失败,报错信息为:{}", exception); exception.printStackTrace(); @@ -953,7 +954,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("发票同步接口记录保存失败，errormsg:{}",e); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index e1da36d4..a2972213 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -770,7 +770,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setInvoiceType(fplxdm); reimburse.setInvoiceCode(invoice.getInvoiceCode()); reimburse.setInvoiceNo(invoice.getInvoiceNumber()); - reimburse.setInvoiceDate(invoice.getBillingDate()); + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = formatter.format(new Date()); + + reimburse.setInvoiceDate(StringUtils.isEmpty(invoice.getBillingDate()) ? dateString : invoice.getBillingDate()); + reimburse.setPassenger(invoice.getRiderName()); if (invoice.getTotalAmount() != null) { reimburse.setInvoiceAmount(new BigDecimal(invoice.getTotalAmount()));