ariesy 推送sap失敗報錯信息修改

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)));
         }
 
     }

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()));