diff --git a/src/main/java/com/zteits/irain/portal/web/ebochong/receive/EBoChongReceiveController.java b/src/main/java/com/zteits/irain/portal/web/ebochong/receive/EBoChongReceiveController.java index 16c330e..3bf1ef2 100644 --- a/src/main/java/com/zteits/irain/portal/web/ebochong/receive/EBoChongReceiveController.java +++ b/src/main/java/com/zteits/irain/portal/web/ebochong/receive/EBoChongReceiveController.java @@ -2,6 +2,7 @@ package com.zteits.irain.portal.web.ebochong.receive; import java.io.BufferedReader; import java.io.IOException; +import java.math.BigDecimal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -10,6 +11,7 @@ import com.alibaba.fastjson.JSONObject; import com.clouds.common.utils.EBoChongAESUtil; import com.clouds.common.utils.ResultUtils; +import com.xiaoleilu.hutool.date.DateUnit; import com.xiaoleilu.hutool.date.DateUtil; import com.zteits.clouds.api.apibase.bean.BaseInfo; import com.zteits.clouds.api.apibase.bean.BizResult; @@ -23,6 +25,7 @@ import com.zteits.clouds.api.service.park.IInOutParkingService; import com.zteits.clouds.api.service.park.InterfaceLogService; import com.zteits.clouds.api.service.park.ParkFreeBerthService; import com.zteits.clouds.api.service.park.ParkingLotQueryService; +import com.zteits.clouds.api.service.pay.ParkOrderService; import com.zteits.irain.portal.constant.ParkConstant.InterfaceLog; import com.zteits.irain.portal.constant.ParkConstant.InterfaceLog.Type; import com.zteits.irain.portal.vo.ebochong.EBoChongEnum; @@ -79,6 +82,12 @@ public class EBoChongReceiveController { @Autowired private InterfaceLogService interfaceLogService; + /** + * 停车场订单service + */ + @Autowired + private ParkOrderService parkOrderService; + @Value("${ebochong.key}") private String key; @@ -145,6 +154,18 @@ public class EBoChongReceiveController { logger.info("===调用dubbo服务停车记录保存 dubboReq={}", JSONObject.toJSONString(inParkingRequest)); BizResult bizResult = iInOutParkingService.SaveIRainInParking(inParkingRequest); logger.info("===调用dubbo服务停车记录保存 dubboRes={}", JSONObject.toJSONString(bizResult)); + + try { + logger.info("插入停车订单--begin----"); + inParkingRequest.setSourceType(3); + inParkingRequest.setFromType(2); + BizResult orderResult = parkOrderService.insertParkingOrder(inParkingRequest); + logger.info("插入停车订单--end----结果=[errorMsg={},orderId={}]", orderResult.getErrMsg(), + orderResult.getData()); + } catch (Exception e) { + logger.info("插入停车订单捕获异常:", e); + } + } else { logSaveRequest.setType(Type.TYPE_OUT_PARKING); //出场 @@ -154,6 +175,7 @@ public class EBoChongReceiveController { outParkingRequest.setFreeBerths(req.getRemaining()); outParkingRequest.setFromType(4); outParkingRequest.setInTime(DateUtil.parse(req.getInTime())); + outParkingRequest.setOutTime(DateUtil.parse(req.getPassTime())); outParkingRequest.setParkCode(req.getParkIndex()); outParkingRequest.setRecordId(req.getUuid()); outParkingRequest.setPlNo(req.getParkIndex()); @@ -162,6 +184,23 @@ public class EBoChongReceiveController { logger.info("===调用dubbo服务停车记录保存 dubboReq={}", JSONObject.toJSONString(outParkingRequest)); BizResult bizResult = iInOutParkingService.SaveIRainOutParking(outParkingRequest); logger.info("===调用dubbo服务停车记录保存 dubboRes={}", JSONObject.toJSONString(bizResult)); + + try { + logger.info("更新停车订单--begin----"); + outParkingRequest.setSourceType(3); + outParkingRequest.setFromType(2); + outParkingRequest.setPayType("1"); + outParkingRequest.setCalcCharge(new BigDecimal(req.getReceivable())); + outParkingRequest.setTotalCharge(new BigDecimal(req.getReceivable())); + outParkingRequest.setParkingDuration( + DateUtil.between(outParkingRequest.getInTime(), outParkingRequest.getOutTime(), + DateUnit.SECOND)); + BizResult orderResult = parkOrderService.updateParkingOrder(outParkingRequest); + logger.info("更新停车订单--end----结果=[errorMsg={},orderId={}]", orderResult.getErrMsg(), + orderResult.getData()); + } catch (Exception e) { + logger.info("更新停车订单捕获异常:", e); + } } HandledVehicleInfoRes res = new HandledVehicleInfoRes();