Merge remote-tracking branch 'origin/release' into release

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -588,6 +588,7 @@ public class SDNYMainProcessController extends AbstractController {
                 }
             }
         } catch (Exception exception) {
+            log.error("同步SAP失败,报错信息为:{}",exception);
             exception.printStackTrace();
         }
         return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)));

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -779,14 +779,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
         InvoiceInfo invoice = new InvoiceInfo();
         invoice.setInvoiceTypeCode(snInvoice.getInvoiceType());
 
-        Date date = new Date();
+        if(snInvoice.getBillingDate() != null) {
-        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = new Date();
-        try {
+            SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
-            date = ft.parse(snInvoice.getBillingDate());
+            try {
-        } catch (ParseException e) {
+                date = ft.parse(snInvoice.getBillingDate());
-            e.printStackTrace();
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            invoice.setInvoiceDate(date);
+        }else{
+            log.error("开票日期为空");
         }
-        invoice.setInvoiceDate(date);
 
         invoice.setIdentityNumber(snInvoice.getIdcardNo());
         invoice.setPassenger(snInvoice.getRiderName());

pom.xml

@@ -187,10 +187,7 @@
                 <deployType>test</deployType>
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
-            <!-- 默认激活 -->
+
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
         <!-- 伊利测试环境 -->
         <profile>
@@ -223,6 +220,10 @@
                 <deployType>std</deployType>
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
+            <!-- 默认激活 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>