From 67bdcd22f05d4ed0f89f77c77e07bf4f0ca6f21e Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Tue, 2 Sep 2025 16:02:43 +0800
Subject: [PATCH] no message

---
 .../sczx/sync/service/impl/SendDataServiceImpl.java    | 10 +++++-----
 .../service/impl/ThirdPartyForwardServiceImpl.java     |  2 +-
 src/main/resources/mapper/OrderBatteryInfoMapper.xml   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java
index c2880ea..5060bb9 100644
--- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java
+++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java
@@ -114,12 +114,12 @@ public class SendDataServiceImpl implements SendDataService {
             return map;
         }
 
-        if (company.getCompanyName() == null || company.getCompanyName().isEmpty()){
+        if (company.getCompany_name() == null || company.getCompany_name().isEmpty()){
             map.put("msg","运营商名称不能为空");
             map.put("code","500");
             return map;
         }
-        if (company.getContactName() == null || company.getContactName().isEmpty()){
+        if (company.getContact_name() == null || company.getContact_name().isEmpty()){
             map.put("msg","运营商联系人不能为空");
             map.put("code","500");
             return map;
@@ -138,8 +138,8 @@ public class SendDataServiceImpl implements SendDataService {
         }
 
         CompanyInfo companyInfo = new CompanyInfo();
-        companyInfo.setCompany_name(company.getCompanyName());
-        companyInfo.setContact_name(company.getContactName());
+        companyInfo.setCompany_name(company.getCompany_name());
+        companyInfo.setContact_name(company.getContact_name());
         companyInfo.setPhone(company.getPhone());
         companyInfo.setAddress(company.getAddress());
         companyInfo.setIs_delete(company.getIsDelete().toString());
@@ -187,7 +187,7 @@ public class SendDataServiceImpl implements SendDataService {
             map.put("code","500");
             return map;
         }
-        if (storeInfo.getContactName() == null || storeInfo.getContactName().isEmpty()){
+        if (storeInfo.getContact_name() == null || storeInfo.getContact_name().isEmpty()){
             map.put("msg","门店联系人不能为空");
             map.put("code","500");
             return map;
diff --git a/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java
index ef135bd..f50213a 100644
--- a/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java
+++ b/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java
@@ -60,7 +60,7 @@ public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService {
             requestBody.put("appid", appId);
             requestBody.put("access_token",accessToken);
             requestBody.put("Data", JSON.parse(data));
-            requestBody.put("timestamp", System.currentTimeMillis());
+            //requestBody.put("timestamp", System.currentTimeMillis());
 
 
 
diff --git a/src/main/resources/mapper/OrderBatteryInfoMapper.xml b/src/main/resources/mapper/OrderBatteryInfoMapper.xml
index 318e088..1f101bb 100644
--- a/src/main/resources/mapper/OrderBatteryInfoMapper.xml
+++ b/src/main/resources/mapper/OrderBatteryInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT
             zom.customer_phone AS phone,
             zrb.meal_id AS meal_id,
-            zom.start_rent_time AS start_date,
+            zom.first_order_time AS start_date,
             zom.end_rent_time AS end_date,
             zcs.city_id as city,
             zcs.id as store,