diff --git a/src/main/java/com/sczx/sync/controller/SendDataController.java b/src/main/java/com/sczx/sync/controller/SendDataController.java index 96f26ca..1ecf074 100644 --- a/src/main/java/com/sczx/sync/controller/SendDataController.java +++ b/src/main/java/com/sczx/sync/controller/SendDataController.java @@ -82,6 +82,13 @@ public class SendDataController { return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); } + @ApiOperation(value = "接收充电同步数据接口") + @GetMapping("/OrderMeal/{id}") + public Map sendUserMeal(@PathVariable String id){ + log.info("/OrderMeal 接收用户订单套餐数据:{}",id); + return sendDataService.sendUserMeal(Long.parseLong(id)); + } + // @ApiOperation(value = "异步接收充电同步数据接口") // @GetMapping("/subOrder/{id}") diff --git a/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java index f87e995..18850fb 100644 --- a/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java +++ b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java @@ -21,4 +21,6 @@ public interface OrderBatteryInfoMapper extends BaseMapper { OrderBatteryInfo selectOrderBatteryInfoById(@Param("id") Long id); String selectOrderStatus(@Param("suborderId") Long suborderId); + + OrderBatteryInfo selectUserBatteryMealById(@Param("id") Long id); } diff --git a/src/main/java/com/sczx/sync/service/SendDataService.java b/src/main/java/com/sczx/sync/service/SendDataService.java index 641181e..9fddb2c 100644 --- a/src/main/java/com/sczx/sync/service/SendDataService.java +++ b/src/main/java/com/sczx/sync/service/SendDataService.java @@ -21,6 +21,8 @@ public interface SendDataService { Map sendStoreInfoToBattery(Long id); Map sendSubOrderToBattery(Long id); + + Map sendUserMeal(Long id); /** * 异步转发数据到第三方平台 * 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 c534aa7..932383c 100644 --- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java @@ -341,6 +341,36 @@ public class SendDataServiceImpl implements SendDataService { return map; } + @Override + @Transactional(rollbackFor = Exception.class) + public Map sendUserMeal(Long id) { + OrderBatteryInfo orderBatteryInfo = orderBatteryInfoMapper.selectUserBatteryMealById(id); + Map map = new HashMap<>(); + + String response = thirdPartyForwardService.forwardData(URL+"/check_meal",JSON.toJSONString(orderBatteryInfo)); + JSONObject jsonObject = JSON.parseObject(response); + String status = jsonObject.get("status").toString(); + + if (status.equals("40001") || status.equals("40002") || status.equals("40003") || status.equals("40005") || status.equals("40006")){ + map.put("code",status); + map.put("msg",jsonObject.get("msg").toString()); + return map; + }else if (status.equals("200")){ + String bOrdNo = jsonObject.get("order_no").toString(); + companyStoreMapper.updateOdId(bOrdNo,id); + map.put("code",status); + map.put("msg","发送成功"); + return map; + }else if (status.equals("401")){ + map.put("code",status); + map.put("msg","鉴权失败"); + return map; + } + map.put("code","500"); + map.put("msg","系统异常"); + return map; + } + private boolean saveRecord(SyncRequest request,String url,Long id,String dataType) { diff --git a/src/main/resources/mapper/OrderBatteryInfoMapper.xml b/src/main/resources/mapper/OrderBatteryInfoMapper.xml index a09a6c5..6748632 100644 --- a/src/main/resources/mapper/OrderBatteryInfoMapper.xml +++ b/src/main/resources/mapper/OrderBatteryInfoMapper.xml @@ -22,8 +22,8 @@ SELECT zom.customer_phone AS phone, zrb.meal_id AS meal_id, - zos.created_at AS start_date, - zos.return_time AS end_date, + zom.start_rent_time AS start_date, + zom.end_rent_time AS end_date, zcs.city_id as city, zcs.id as store, zrb.category_id as category, @@ -46,4 +46,23 @@ + + + +