From 56a6157ca21acb2a85ff171150df21fa0ce75058 Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Sat, 30 Aug 2025 21:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=A7=9F=E7=94=B5=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/controller/SendDataController.java | 47 +++- .../com/sczx/sync/dto/ReceiveMealReq.java | 2 +- .../com/sczx/sync/mapper/BaseUserMapper.java | 2 + .../sczx/sync/mapper/CompanyInfoMapper.java | 2 + .../sczx/sync/mapper/CompanyStoreMapper.java | 4 + .../sync/mapper/OrderBatteryInfoMapper.java | 22 ++ .../com/sczx/sync/mapper/UserStoreMapper.java | 4 +- .../java/com/sczx/sync/po/CompanyInfo.java | 32 ++- .../com/sczx/sync/po/OrderBatteryInfo.java | 55 +++++ src/main/java/com/sczx/sync/po/StoreInfo.java | 26 ++- .../sczx/sync/service/SendDataService.java | 9 + .../service/impl/SendDataServiceImpl.java | 214 ++++++++++++++---- .../impl/ThirdPartyForwardServiceImpl.java | 19 +- src/main/resources/application.yml | 6 +- src/main/resources/mapper/BaseUserMapper.xml | 10 +- .../resources/mapper/CompanyInfoMapper.xml | 11 +- .../resources/mapper/CompanyStoreMapper.xml | 19 +- .../mapper/OrderBatteryInfoMapper.xml | 45 ++++ src/main/resources/mapper/UserStoreMapper.xml | 1 - 19 files changed, 464 insertions(+), 66 deletions(-) create mode 100644 src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java create mode 100644 src/main/java/com/sczx/sync/po/OrderBatteryInfo.java create mode 100644 src/main/resources/mapper/OrderBatteryInfoMapper.xml diff --git a/src/main/java/com/sczx/sync/controller/SendDataController.java b/src/main/java/com/sczx/sync/controller/SendDataController.java index 56e00a6..56c4ea2 100644 --- a/src/main/java/com/sczx/sync/controller/SendDataController.java +++ b/src/main/java/com/sczx/sync/controller/SendDataController.java @@ -11,10 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; @@ -44,6 +41,48 @@ public class SendDataController { return Result.ok(sendDataService.recAndSend(dataRceiveReq)); } + @ApiOperation(value = "接收用户同步数据接口") + @GetMapping("/userinfo/{id}") + public Result sendUserInfoToBattery(@PathVariable String id){ + return Result.ok(sendDataService.sendUserInfoById(Long.parseLong(id))); + } + + @ApiOperation(value = "接收运营商同步数据接口") + @GetMapping("/companyinfo/{id}") + public Result sendCompanyInfoToBattery(@PathVariable String id){ + return Result.ok(sendDataService.sendCompanyInfoToBattery(Long.parseLong(id))); + } + + @ApiOperation(value = "接收门店同步数据接口") + @GetMapping("/storeinfo/{id}") + public Result sendStoreInfoToBattery(@PathVariable String id){ + return Result.ok(sendDataService.sendStoreInfoToBattery(Long.parseLong(id))); + } + + @ApiOperation(value = "接收充电同步数据接口") + @GetMapping("/subOrder/{id}") + public Result sendSubOrderToBattery(@PathVariable String id){ + return Result.ok(sendDataService.sendSubOrderToBattery(Long.parseLong(id))); + } + +// +// @ApiOperation(value = "接收需同步数据接口") +// @GetMapping("/companyinfo") +// public Result sendDataToBattery(@PathVariable Long id){ +// return Result.ok(sendDataService.recAndSend(dataRceiveReq)); +// } +// +// @ApiOperation(value = "接收需同步数据接口") +// @GetMapping("/storeinfo") +// public Result sendDataToBattery(@PathVariable Long id){ +// return Result.ok(sendDataService.recAndSend(dataRceiveReq)); +// } +// +// @ApiOperation(value = "接收需同步数据接口") +// @GetMapping("/order") +// public Result sendDataToBattery(@PathVariable Long id){ +// return Result.ok(sendDataService.recAndSend(dataRceiveReq)); +// } // @ApiOperation(value = "c2btest") // @PostMapping("/json") // public Result json(@RequestBody String dataRceiveReq){ diff --git a/src/main/java/com/sczx/sync/dto/ReceiveMealReq.java b/src/main/java/com/sczx/sync/dto/ReceiveMealReq.java index 420f6a4..1ea96ba 100644 --- a/src/main/java/com/sczx/sync/dto/ReceiveMealReq.java +++ b/src/main/java/com/sczx/sync/dto/ReceiveMealReq.java @@ -13,7 +13,7 @@ public class ReceiveMealReq { @ApiModelProperty("APPID") private String appid; - @ApiModelProperty("租车平台对应表主键ID") + @ApiModelProperty("access_token") private String access_token; @ApiModelProperty("传入数据Map") diff --git a/src/main/java/com/sczx/sync/mapper/BaseUserMapper.java b/src/main/java/com/sczx/sync/mapper/BaseUserMapper.java index 547f485..9f5db08 100644 --- a/src/main/java/com/sczx/sync/mapper/BaseUserMapper.java +++ b/src/main/java/com/sczx/sync/mapper/BaseUserMapper.java @@ -19,6 +19,8 @@ public interface BaseUserMapper extends BaseMapper { BaseUser selectByPhoneNumber(@Param("phoneNumber") String phoneNumber); + BaseUser selectById(@Param("id") Long id); + /** * 插入用户信息 * @param user 用户信息 diff --git a/src/main/java/com/sczx/sync/mapper/CompanyInfoMapper.java b/src/main/java/com/sczx/sync/mapper/CompanyInfoMapper.java index ef3f264..2c71be0 100644 --- a/src/main/java/com/sczx/sync/mapper/CompanyInfoMapper.java +++ b/src/main/java/com/sczx/sync/mapper/CompanyInfoMapper.java @@ -18,6 +18,8 @@ public interface CompanyInfoMapper extends BaseMapper { */ CompanyInfo selectByPhone(@Param("phone") String phone); + + CompanyInfo selectById(@Param("id") Long id); /** * 根据opid查询公司信息 * @param bOpId 电话号码 diff --git a/src/main/java/com/sczx/sync/mapper/CompanyStoreMapper.java b/src/main/java/com/sczx/sync/mapper/CompanyStoreMapper.java index 6a17425..d3223a6 100644 --- a/src/main/java/com/sczx/sync/mapper/CompanyStoreMapper.java +++ b/src/main/java/com/sczx/sync/mapper/CompanyStoreMapper.java @@ -5,6 +5,8 @@ import com.sczx.sync.po.StoreInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface CompanyStoreMapper extends BaseMapper { @@ -24,7 +26,9 @@ public interface CompanyStoreMapper extends BaseMapper { StoreInfo selectByBid(@Param("bpStoreId") Long bpStoreId); + List selectByOpId(@Param("opId") Long opId); + StoreInfo selectById(@Param("id") Long id); /** * 根据门店名称更新门店信息 * @param storeInfo 门店信息 diff --git a/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java new file mode 100644 index 0000000..4244385 --- /dev/null +++ b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java @@ -0,0 +1,22 @@ +package com.sczx.sync.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sczx.sync.po.DataReceivePo; +import com.sczx.sync.po.OrderBatteryInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 电池订单信息Mapper接口 + */ +@Mapper +public interface OrderBatteryInfoMapper extends BaseMapper { + + /** + * 根据子订单ID查询电池订单信息 + * + * @param id 子订单ID + * @return 电池订单信息 + */ + OrderBatteryInfo selectOrderBatteryInfoById(@Param("id") Long id); +} diff --git a/src/main/java/com/sczx/sync/mapper/UserStoreMapper.java b/src/main/java/com/sczx/sync/mapper/UserStoreMapper.java index 1fddf79..cc5c36f 100644 --- a/src/main/java/com/sczx/sync/mapper/UserStoreMapper.java +++ b/src/main/java/com/sczx/sync/mapper/UserStoreMapper.java @@ -5,6 +5,8 @@ import com.sczx.sync.po.UserStore; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 用户与门店信息 Mapper 接口 */ @@ -16,7 +18,7 @@ public interface UserStoreMapper extends BaseMapper { * @param userId 用户ID * @return 用户门店信息 */ - UserStore selectByUserId(@Param("userId") Long userId); + List selectByUserId(@Param("userId") Long userId); /** * 根据用户ID更新用户门店信息 diff --git a/src/main/java/com/sczx/sync/po/CompanyInfo.java b/src/main/java/com/sczx/sync/po/CompanyInfo.java index 7886a6b..da7bdb9 100644 --- a/src/main/java/com/sczx/sync/po/CompanyInfo.java +++ b/src/main/java/com/sczx/sync/po/CompanyInfo.java @@ -41,7 +41,37 @@ public class CompanyInfo implements Serializable { * 是否删除标记 (0-未删除, 1-已删除) */ private Integer isDelete; - + + private String company_name; + + private String contact_name; + + private String is_delete; + + public String getCompany_name() { + return company_name; + } + + public void setCompany_name(String company_name) { + this.company_name = company_name; + } + + public String getContact_name() { + return contact_name; + } + + public void setContact_name(String contact_name) { + this.contact_name = contact_name; + } + + public String getIs_delete() { + return is_delete; + } + + public void setIs_delete(String is_delete) { + this.is_delete = is_delete; + } + /** * 同步时间 */ diff --git a/src/main/java/com/sczx/sync/po/OrderBatteryInfo.java b/src/main/java/com/sczx/sync/po/OrderBatteryInfo.java new file mode 100644 index 0000000..9c5f013 --- /dev/null +++ b/src/main/java/com/sczx/sync/po/OrderBatteryInfo.java @@ -0,0 +1,55 @@ +package com.sczx.sync.po; + +import lombok.Data; + +/** + * 电池订单信息实体类 + */ +@Data +public class OrderBatteryInfo { + + /** + * 客户手机号 + */ + private String phone; + + /** + * 套餐ID + */ + private Long meal_id; + + /** + * 租赁开始时间 + */ + private String start_date; + + /** + * 租赁结束时间 + */ + private String end_date; + + /** + * 城市ID + */ + private Long city; + + /** + * 门店ID + */ + private Long store; + + /** + * 分类ID + */ + private Long category; + + /** + * 运营公司ID + */ + private Long operator_id; + + /** + * 子订单号 + */ + private String order_no; +} diff --git a/src/main/java/com/sczx/sync/po/StoreInfo.java b/src/main/java/com/sczx/sync/po/StoreInfo.java index 884f9db..fe32422 100644 --- a/src/main/java/com/sczx/sync/po/StoreInfo.java +++ b/src/main/java/com/sczx/sync/po/StoreInfo.java @@ -23,6 +23,8 @@ public class StoreInfo implements Serializable { * 联系人姓名 */ private String contactName; + + private String contact_name; /** * 联系电话 @@ -58,7 +60,9 @@ public class StoreInfo implements Serializable { * 纬度 */ private Double latitude; - + + + /** * 经度 */ @@ -69,8 +73,12 @@ public class StoreInfo implements Serializable { */ private Integer isDelete; + + private Long bpStoreId; + private String is_delete; + public String getName() { return name; } @@ -166,4 +174,20 @@ public class StoreInfo implements Serializable { public void setBpStoreId(Long bpStoreId) { this.bpStoreId = bpStoreId; } + + public String getContact_name() { + return contact_name; + } + + public void setContact_name(String contact_name) { + this.contact_name = contact_name; + } + + public String getIs_delete() { + return is_delete; + } + + public void setIs_delete(String is_delete) { + this.is_delete = is_delete; + } } diff --git a/src/main/java/com/sczx/sync/service/SendDataService.java b/src/main/java/com/sczx/sync/service/SendDataService.java index 1417d89..8793a78 100644 --- a/src/main/java/com/sczx/sync/service/SendDataService.java +++ b/src/main/java/com/sczx/sync/service/SendDataService.java @@ -12,6 +12,13 @@ public interface SendDataService { */ boolean recAndSend(DataRceiveReq request); + boolean sendUserInfoById(Long id); + + boolean sendCompanyInfoToBattery(Long id); + + boolean sendStoreInfoToBattery(Long id); + + boolean sendSubOrderToBattery(Long id); /** * 异步转发数据到第三方平台 * @@ -25,4 +32,6 @@ public interface SendDataService { * @param recordId 记录ID */ void retryForward(Long recordId); + + } 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 6d83c6e..1a0e5de 100644 --- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java @@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.sczx.sync.dto.DataRceiveReq; -import com.sczx.sync.mapper.CompanyStoreMapper; -import com.sczx.sync.mapper.DataReceiveRecordMapper; -import com.sczx.sync.po.DataReceivePo; +import com.sczx.sync.entity.UserInfo; +import com.sczx.sync.mapper.*; +import com.sczx.sync.po.*; import com.sczx.sync.service.SendDataService; import com.sczx.sync.service.ThirdPartyForwardService; import lombok.extern.slf4j.Slf4j; @@ -18,7 +18,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; @Slf4j @Service @@ -34,6 +37,18 @@ public class SendDataServiceImpl implements SendDataService { @Autowired private ThirdPartyForwardService thirdPartyForwardService; + @Autowired + private BaseUserMapper baseUserMapper; + + @Autowired + private UserStoreMapper userStoreMapper; + + @Autowired + private CompanyInfoMapper companyInfoMapper; + + @Autowired + private OrderBatteryInfoMapper orderBatteryInfoMapper; + @Value("${third-party.platform.api-url}") private String URL; @Value("${third-party.platform.app-id}") @@ -43,30 +58,135 @@ public class SendDataServiceImpl implements SendDataService { @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public boolean recAndSend(DataRceiveReq dataRceiveReq) { String dataType = dataRceiveReq.getDataType(); - System.out.println("dataType "+dataType); + return saveRecord(dataRceiveReq,URL+"/"+dataType); - switch (dataType){ - case "userinfo": + } - return saveRecord(dataRceiveReq,URL+"/"+dataType); - case "companyinfo": - return saveRecord(dataRceiveReq,URL+"/"+dataType); + @Override + @Transactional(rollbackFor = Exception.class) + public boolean sendUserInfoById(Long id) { + BaseUser user = baseUserMapper.selectById( id); + List userStoreList = userStoreMapper.selectByUserId( id); - case "storeinfo": - return saveRecord(dataRceiveReq,URL+"/"+dataType); - - case "batteryorder": - return saveRecord(dataRceiveReq,URL+"/"+dataType); + UserInfo userInfo = new UserInfo(); + userInfo.setWxunionid(""); + userInfo.setMywxunionid(""); + userInfo.setPhone(user.getPhoneNumber()); + userInfo.setName(user.getRealName()); + userInfo.setIsauthentication(user.getAuthed()); + userInfo.setCardno(user.getIdNo()); + userInfo.setCard1(user.getFrontPhoto()); + userInfo.setCard2(user.getBackPhoto()); + userInfo.setIsmerchant(user.getIsStore()); + StringBuilder storeIdsBuilder = new StringBuilder(); + if (userStoreList != null && !userStoreList.isEmpty()) { + for (int i = 0; i < userStoreList.size(); i++) { + UserStore store = userStoreList.get(i); + if (store != null && store.getStoreId() != null) { + if (storeIdsBuilder.length() > 0) { + storeIdsBuilder.append(","); + } + storeIdsBuilder.append(store.getStoreId().toString()); + userInfo.setOperatorId(store.getOperatorId().toString()); + } + } + String storeIdsStr = storeIdsBuilder.toString(); + userInfo.setStoreId(storeIdsStr); } - return false; + SyncRequest syncRequest = new SyncRequest(); + syncRequest.setData(userInfo); + return saveRecord(syncRequest,URL+"/userinfo",id,"userinfo"); + } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean sendCompanyInfoToBattery(Long id) { + CompanyInfo company = companyInfoMapper.selectById( id); + List storeInfoList = companyStoreMapper.selectByOpId(id); + + CompanyInfo companyInfo = new CompanyInfo(); + companyInfo.setCompany_name(company.getCompanyName()); + companyInfo.setContact_name(company.getContactName()); + companyInfo.setPhone(company.getPhone()); + companyInfo.setAddress(company.getAddress()); + companyInfo.setIs_delete(company.getIsDelete().toString()); + + // 使用 Set 去除重复城市 + Set uniqueCities = new HashSet<>(); + if (storeInfoList != null && !storeInfoList.isEmpty()) { + for (StoreInfo store : storeInfoList) { + if (store != null && store.getCity() != null) { + uniqueCities.add(store.getCity()); + } + } + } + + // 拼接去重后的城市字符串 + String citysStr = String.join(",", uniqueCities); + companyInfo.setCitys(citysStr); + + SyncRequest syncRequest = new SyncRequest(); + syncRequest.setData(companyInfo); + return saveRecord(syncRequest, URL + "/companyinfo", id,"companyinfo"); + } + + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean sendStoreInfoToBattery(Long id) { + StoreInfo storeInfo = companyStoreMapper.selectById(id); + + SyncRequest syncRequest = new SyncRequest(); + syncRequest.setData(storeInfo); + return saveRecord(syncRequest,URL+"/storeinfo",id,"storeinfo"); + } + + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean sendSubOrderToBattery(Long id) { + OrderBatteryInfo orderBatteryInfo = orderBatteryInfoMapper.selectOrderBatteryInfoById(id); + + SyncRequest syncRequest = new SyncRequest(); + syncRequest.setData(orderBatteryInfo); + return saveRecord(syncRequest,URL+"/batteryorder",id,"batteryorder"); + } + + + private boolean saveRecord(SyncRequest request,String url,Long id,String dataType) { + + try { + + // 保存接收记录 + DataReceivePo record = new DataReceivePo(); + record.setCid( id); + record.setDataType(dataType); + record.setRequestData(JSON.toJSONString(request.getData())); + record.setRequestTime(LocalDateTime.now()); + record.setStatus(0); // 待转发 + record.setRetryCount(0); + + dataReceiveRecordMapper.insert(record); + + // 异步转发数据 + forwardToThirdParty(record.getId(),url); + + log.info("数据接收成功，记录ID: {}", record.getId()); + return true; + } catch (Exception e) { + log.error("数据接收失败", e); + return false; + } + } + + @Override @Async public void forwardToThirdParty(Long recordId,String url) { @@ -83,9 +203,9 @@ public class SendDataServiceImpl implements SendDataService { String dataType = record.getDataType(); // 转发数据 - String response = thirdPartyForwardService.forwardData(dataType,record.getRequestData()); + String response = thirdPartyForwardService.forwardData(url,record.getRequestData()); - modifyData(dataType,record.getCid(),response); + modifyData(record.getCid(),response,dataType); // 更新记录状态 record.setStatus(2); // 转发成功 @@ -143,8 +263,6 @@ public class SendDataServiceImpl implements SendDataService { } private boolean saveRecord(DataRceiveReq request,String url) { - System.out.println(url); - try { // 保存接收记录 @@ -169,29 +287,45 @@ public class SendDataServiceImpl implements SendDataService { } } - private void modifyData(String dataType,Long Cid,String response){ + private void modifyData(Long Cid,String response,String dataType){ - JSONObject jsonObject=JSON.parseObject(response.toString()); - jsonObject.remove("status"); - jsonObject.remove("msg"); - JSONObject jsonObj = JSON.parseObject(jsonObject.toJSONString()); - for (Map.Entry entry : jsonObj.entrySet()) { - System.out.println(entry.getKey() + ":" + entry.getValue()); - String keyStr = entry.getKey(); - long bId = Long.parseLong(entry.getValue().toString()); - switch (keyStr){ - case "order_no": - companyStoreMapper.updateOdId(bId,Cid); - break; - case "store_id": - companyStoreMapper.updateStoreId(bId,Cid); - break; - case "operator_id": - companyStoreMapper.updateOpeId(bId,Cid); - break; - } + JSONObject jsonObject=JSON.parseObject(response); + Long bId = Long.parseLong(jsonObject.get("data").toString()); + switch (dataType){ + case "userinfo": + break; + case "companyinfo": + companyStoreMapper.updateOpeId(bId,Cid); + break; + case "storeinfo": + companyStoreMapper.updateStoreId(bId,Cid); + break; + case "batteryorder": + companyStoreMapper.updateOdId(bId,Cid); + break; } + +// jsonObject.remove("status"); +// jsonObject.remove("msg"); +// JSONObject jsonObj = JSON.parseObject(jsonObject.toJSONString()); +// for (Map.Entry entry : jsonObj.entrySet()) { +// System.out.println(entry.getKey() + ":" + entry.getValue()); +// String keyStr = entry.getKey(); +// long bId = Long.parseLong(entry.getValue().toString()); +// switch (keyStr){ +// case "order_no": +// companyStoreMapper.updateOdId(bId,Cid); +// break; +// case "store_id": +// companyStoreMapper.updateStoreId(bId,Cid); +// break; +// case "operator_id": +// companyStoreMapper.updateOpeId(bId,Cid); +// break; +// } +// } + } } 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 8ad2965..ef135bd 100644 --- a/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java @@ -34,15 +34,12 @@ public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService { private String appId; @Value("${third-party.platform.access-token}") private String accessToken; - @Value("${third-party.platform.api-url}") - private String apiUrl; @Value("${third-party.platform.timeout}") private int timeOut; - @Value("${third-party.platform.retry-times}") - private int retryTimes; + @Override - public String forwardData(String datatype,String data) { + public String forwardData(String url,String data) { CloseableHttpClient httpClient = null; CloseableHttpResponse response = null; @@ -51,7 +48,6 @@ public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService { try { // 创建HTTP客户端 httpClient = HttpClients.createDefault(); - String url = URL+'/'+datatype; // 创建POST请求 HttpPost httpPost = new HttpPost(url); @@ -61,10 +57,13 @@ public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService { // 构建请求体 Map requestBody = new HashMap<>(); - requestBody.put("appId", appId); - requestBody.put("accessToken",accessToken); - requestBody.put("data", JSON.parse(data)); + requestBody.put("appid", appId); + requestBody.put("access_token",accessToken); + requestBody.put("Data", JSON.parse(data)); requestBody.put("timestamp", System.currentTimeMillis()); + + + StringEntity entity = new StringEntity(JSON.toJSONString(requestBody), StandardCharsets.UTF_8); httpPost.setEntity(entity); @@ -76,7 +75,7 @@ public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService { .build(); httpPost.setConfig(requestConfig); - log.info("开始转发数据到第三方平台: {}, 数据: {}", url, data); + log.info("开始转发数据到第三方平台: {}, 数据: {}", url, requestBody); // 执行请求 response = httpClient.execute(httpPost); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 40d06bd..3dede08 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -58,9 +58,9 @@ mybatis-plus: # 第三方平台配置 third-party: platform: - app-id: 111 - access-token: 111 - api-url: 127.0.0.1:8081/api/ddd + app-id: C202508001 + access-token: 5DCCABD4641B40948B64F1B4B4D59DAC + api-url: https://sczx-zuche-datasync.de-wincle.cn/c2b timeout: 30000 retry-times: 3 diff --git a/src/main/resources/mapper/BaseUserMapper.xml b/src/main/resources/mapper/BaseUserMapper.xml index 6b734b1..0878c1a 100644 --- a/src/main/resources/mapper/BaseUserMapper.xml +++ b/src/main/resources/mapper/BaseUserMapper.xml @@ -27,7 +27,7 @@ - id, user_name, avatar_url, phone_number, role_id, is_store, nick_name,id_no + id, user_name, avatar_url, phone_number, role_id, is_store, nick_name,id_no,real_name,front_photo,back_photo,authed + + INSERT INTO zc_base_user diff --git a/src/main/resources/mapper/CompanyInfoMapper.xml b/src/main/resources/mapper/CompanyInfoMapper.xml index 8674d34..4975952 100644 --- a/src/main/resources/mapper/CompanyInfoMapper.xml +++ b/src/main/resources/mapper/CompanyInfoMapper.xml @@ -9,13 +9,13 @@ - + - b_op_id, company_name, contact_name, phone, address, citys, is_delete + b_op_id, company_name, contact_name, phone, address, citys, del_flag @@ -27,6 +27,13 @@ AND is_delete = 0 + + + + + + @@ -179,5 +197,4 @@ update zc_order_sub set b_order_id = #{bOdId} where order_id =#{cId} and suborder_type = "RENTBATTEY" - diff --git a/src/main/resources/mapper/OrderBatteryInfoMapper.xml b/src/main/resources/mapper/OrderBatteryInfoMapper.xml new file mode 100644 index 0000000..318e088 --- /dev/null +++ b/src/main/resources/mapper/OrderBatteryInfoMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/UserStoreMapper.xml b/src/main/resources/mapper/UserStoreMapper.xml index 24a404b..40a9346 100644 --- a/src/main/resources/mapper/UserStoreMapper.xml +++ b/src/main/resources/mapper/UserStoreMapper.xml @@ -25,7 +25,6 @@ SELECT FROM zc_base_user_store WHERE user_id = #{userId} - AND del_flag = '0'