From 672360b756ebf3e97b40d39ddd4105e7df71587c Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Fri, 5 Sep 2025 22:10:40 +0800 Subject: [PATCH] no message --- .../java/com/sczx/sync/dto/StoreInfoDTO.java | 2 ++ src/main/java/com/sczx/sync/po/StoreInfo.java | 10 ++++++++++ .../sync/service/impl/ReceiveServiceImpl.java | 19 ++++++++++++------- .../service/impl/SendDataServiceImpl.java | 2 ++ .../resources/mapper/CompanyInfoMapper.xml | 2 +- .../resources/mapper/CompanyStoreMapper.xml | 6 ++++++ 6 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sczx/sync/dto/StoreInfoDTO.java b/src/main/java/com/sczx/sync/dto/StoreInfoDTO.java index b015c58..bf385c5 100644 --- a/src/main/java/com/sczx/sync/dto/StoreInfoDTO.java +++ b/src/main/java/com/sczx/sync/dto/StoreInfoDTO.java @@ -47,4 +47,6 @@ public class StoreInfoDTO { private Long store_id; private String is_delete; + + private Long operator_id; } diff --git a/src/main/java/com/sczx/sync/po/StoreInfo.java b/src/main/java/com/sczx/sync/po/StoreInfo.java index c6ea53e..39ccd60 100644 --- a/src/main/java/com/sczx/sync/po/StoreInfo.java +++ b/src/main/java/com/sczx/sync/po/StoreInfo.java @@ -75,6 +75,8 @@ public class StoreInfo implements Serializable { private Long store_id; + private Long operator_id; + private Long bpStoreId; @@ -207,4 +209,12 @@ public class StoreInfo implements Serializable { public void setStore_id(Long store_id) { this.store_id = store_id; } + + public Long getOperator_id() { + return operator_id; + } + + public void setOperator_id(Long operator_id) { + this.operator_id = operator_id; + } } diff --git a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java index 50e524a..08bfeae 100644 --- a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java @@ -41,7 +41,7 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public Map recceiveMeals(String request) { - + log.info("/meals 接收套餐数据：{}",JSON.toJSONString( request)); SyncRequest syncRequest = JSON.parseObject(request, SyncRequest.class); Map map = new HashMap<>(); if (!syncRequest.getAppid().equals(appId) || !syncRequest.getAccessToken().equals(accessToken)) { @@ -144,7 +144,7 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public Map recceiveUserInfo(String request) { - + log.info("/userinfo 接收用户数据：{}",JSON.toJSONString( request)); SyncRequest syncRequest = JSON.parseObject(request, SyncRequest.class); Map map = new HashMap<>(); if (!syncRequest.getAppid().equals(appId) || !syncRequest.getAccessToken().equals(accessToken)) { @@ -241,7 +241,7 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public Map recceiveCompanyInfo(String request) { - log.info("接收运营商数据:", request); + log.info("接收运营商数据:{}", JSON.toJSONString(request)); SyncRequest syncRequest = JSON.parseObject(request, SyncRequest.class); Map map = new HashMap<>(); if (!syncRequest.getAppid().equals(appId) || !syncRequest.getAccessToken().equals(accessToken)) { @@ -308,7 +308,7 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public Map recceiveStoreInfo(String request) { - log.info("接收门店数据:", request); + log.info("接收门店数据:{}", JSON.toJSONString(request)); SyncRequest syncRequest = JSON.parseObject(request, SyncRequest.class); Map map = new HashMap<>(); if (!syncRequest.getAppid().equals(appId) || !syncRequest.getAccessToken().equals(accessToken)) { @@ -373,12 +373,17 @@ public class ReceiveServiceImpl implements ReceiveService { map.put("code", "500"); return map; } + if (storeInfo.getOperator_id() == null) { + map.put("msg", "租电平台运营商id不能为空,请补传'operation_id'"); + map.put("code", "500"); + return map; + } + CompanyInfo companyInfo = companyInfoMapper.selectByOpId(storeInfo.getOperator_id()); + storeInfo.setOperator_id(companyInfo.getId()); if (companyStoreMapper.selectByBid(storeInfo.getStore_id()) != null) { companyStoreMapper.updateByBid(storeInfo); - } else if (companyStoreMapper.selectByPhone(storeInfo.getPhone()) != null) { - companyStoreMapper.updateByName(storeInfo); - } else { + } else { companyStoreMapper.insertStoreInfo(storeInfo); } map.put("msg", "成功"); 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 a45735c..d4708d6 100644 --- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java @@ -229,6 +229,7 @@ public class SendDataServiceImpl implements SendDataService { storeInfo.setStore_id(id); + StoreInfoDTO storeInfoDTO = new StoreInfoDTO(); storeInfoDTO.setName(storeInfo.getName()); storeInfoDTO.setContact_name(storeInfo.getContact_name()); @@ -241,6 +242,7 @@ public class SendDataServiceImpl implements SendDataService { storeInfoDTO.setLatitude(storeInfo.getLatitude()); storeInfoDTO.setLongitude(storeInfo.getLongitude()); storeInfoDTO.setIs_delete(storeInfo.getIs_delete()); + storeInfoDTO.setOperator_id(storeInfo.getOperator_id()); storeInfoDTO.setStore_id(storeInfo.getStore_id()); SyncRequest syncRequest = new SyncRequest(); diff --git a/src/main/resources/mapper/CompanyInfoMapper.xml b/src/main/resources/mapper/CompanyInfoMapper.xml index 1564c77..c6ab0a3 100644 --- a/src/main/resources/mapper/CompanyInfoMapper.xml +++ b/src/main/resources/mapper/CompanyInfoMapper.xml @@ -48,7 +48,7 @@ SELECT FROM zc_company - WHERE b_op_id = #{operator_id} + WHERE b_op_id = #{bOpId} AND is_delete = 0 diff --git a/src/main/resources/mapper/CompanyStoreMapper.xml b/src/main/resources/mapper/CompanyStoreMapper.xml index eaf020b..9974073 100644 --- a/src/main/resources/mapper/CompanyStoreMapper.xml +++ b/src/main/resources/mapper/CompanyStoreMapper.xml @@ -12,6 +12,7 @@ + @@ -150,6 +151,9 @@ del_flag = #{is_delete}, + + operating_company_id = #{operator_id}, + WHERE bp_store_id = #{bpStoreId} @@ -168,6 +172,7 @@ latitude, longitude, del_flag, + operating_company_id, bp_store_id ) VALUES ( #{name}, @@ -181,6 +186,7 @@ #{latitude}, #{longitude}, #{is_delete}, + #{operator_id}, #{bpStoreId} )