From 9c0ed7b78c3e44cea0074c2d3731900dcb78c5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 12 Aug 2024 13:58:09 +0800 Subject: [PATCH] 'commit' --- .../order/apiservice/OrderApiService.java | 278 ++++++++++-------- ...$特收到的需求、分析与现状.docx | Bin 0 -> 162 bytes 2 files changed, 163 insertions(+), 115 deletions(-) create mode 100644 业务梳理/~$特收到的需求、分析与现状.docx diff --git a/Ylt/ms-order/src/main/java/com/charge/order/apiservice/OrderApiService.java b/Ylt/ms-order/src/main/java/com/charge/order/apiservice/OrderApiService.java index 5a227f1..cd30288 100644 --- a/Ylt/ms-order/src/main/java/com/charge/order/apiservice/OrderApiService.java +++ b/Ylt/ms-order/src/main/java/com/charge/order/apiservice/OrderApiService.java @@ -65,9 +65,11 @@ public class OrderApiService { UserAccountStateService userAccountStateService; - /**【充电流程】启动充电*/ - public CommonResponse queryStartCharge (HttpServletRequest request,StartChargeBO startChargeBO){ - if (StringUtils.isBlank(request.getHeader("userId"))){ + /** + * 【充电流程】启动充电 + */ + public CommonResponse queryStartCharge(HttpServletRequest request, StartChargeBO startChargeBO) { + if (StringUtils.isBlank(request.getHeader("userId"))) { return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN); } startChargeBO.setUserId(Integer.parseInt(request.getHeader("userId"))); @@ -91,8 +93,8 @@ public class OrderApiService { log.info("调用下发启动充电接口失败，失败原因：{}", e); removeFreezeUser(userDO); } - orderTrackService.setStartChargeOrderTrack(startResult,startChargeBO,orderNo);/**订单轨迹*/ - if (startResult.getCode() != 1000){ + orderTrackService.setStartChargeOrderTrack(startResult, startChargeBO, orderNo);/**订单轨迹*/ + if (startResult.getCode() != 1000) { removeFreezeUser(userDO); return I100cResponse.exception(startResult.getMsg()); } @@ -100,32 +102,35 @@ public class OrderApiService { //new Thread(()->orderTrackService.setStartChargeOrderTrack(startResult,startChargeBO,orderNo)).start();/**订单轨迹*/ return startResult; } - /**创建订单*/ - private String creatOrder(StartChargeBO startChargeBO){ + + /** + * 创建订单 + */ + private String creatOrder(StartChargeBO startChargeBO) { UserTypeVO userTypeInfo = userDOMapper.queryUserType(startChargeBO.getUserId()); Integer chargeSettleType = Optional.ofNullable(equipmentDOMapper.getEquipmentChargeSettleType(startChargeBO.getEquipmentId())).orElse(2); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); equipmentChargeOrderDO.setState((byte) 0); - equipmentChargeOrderDO.setOperateState((byte)1); - equipmentChargeOrderDO.setPayStatus((byte)0); + equipmentChargeOrderDO.setOperateState((byte) 1); + equipmentChargeOrderDO.setPayStatus((byte) 0); equipmentChargeOrderDO.setOrderNo(OrderUtil.generateOrder()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserId(startChargeBO.getUserId().longValue()); - equipmentChargeOrderDO.setStationId(startChargeBO.getStationId().longValue()); - equipmentChargeOrderDO.setEquipmentId(startChargeBO.getEquipmentId().longValue()); - equipmentChargeOrderDO.setConnectorId(startChargeBO.getConnectorId().longValue()); - equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); - equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); - equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); - equipmentChargeOrderDO.setChargeSettleType(chargeSettleType.byteValue()); - if(startChargeBO.getPayment() == 1){ - equipmentChargeOrderDO.setPayMethod((byte)0);/**余额支付*/ - }else { - equipmentChargeOrderDO.setPayMethod((byte)2);/**线上支付先默认微信小程序支付,结算后更改*/ + equipmentChargeOrderDO.setStationId(startChargeBO.getStationId().longValue()); + equipmentChargeOrderDO.setEquipmentId(startChargeBO.getEquipmentId().longValue()); + equipmentChargeOrderDO.setConnectorId(startChargeBO.getConnectorId().longValue()); + equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); + equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); + equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); + equipmentChargeOrderDO.setChargeSettleType(chargeSettleType.byteValue()); + if (startChargeBO.getPayment() == 1) { + equipmentChargeOrderDO.setPayMethod((byte) 0);/**余额支付*/ + } else { + equipmentChargeOrderDO.setPayMethod((byte) 2);/**线上支付先默认微信小程序支付,结算后更改*/ } equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); //记录当前充电折扣活动 @@ -138,28 +143,57 @@ public class OrderApiService { } - /**【充电流程】停止充电*/ - public CommonResponse queryStopCharge (HttpServletRequest request,StopChargeBO stopChargeBO){ - if (StringUtils.isBlank(request.getHeader("userId"))){ + /** + * 【充电流程】停止充电 + */ + public CommonResponse queryStopCharge(HttpServletRequest request, StopChargeBO stopChargeBO) { + if (StringUtils.isBlank(request.getHeader("userId"))) { return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN); } + //1、用户ID stopChargeBO.setUserId(Integer.parseInt(request.getHeader("userId"))); log.info("停止充电请求参数：{}", JSON.toJSONString(stopChargeBO)); + + //2、根据定单号获取定单信息 + //stopChargeBO.getOrderNo() + //SELECT eco.* FROM t_equipment_charge_order eco WHERE eco.order_no = #{orderNo} EquipmentChargeOrderDO orderInfo = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(stopChargeBO.getOrderNo()); - if (orderInfo != null){ - orderInfo.setOperateState((byte)2); + //如果订单存在 + // 【黄海理解：小程序送上来的数据应该是有订单号的，如果没有的话，那么一定是携带了桩号和枪号，也可以查询出订单号,为什么小程序有时不携带订单号呢？不明白原因】 + if (orderInfo != null) { + orderInfo.setOperateState((byte) 2); orderInfo.setUpdateTime(ToolDateTime.getDate()); equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfo);/**更新订单状态为结束中*/ - CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(),stopChargeBO.getConnectorNo(),orderInfo.getOrderNo());/**调取分发服务停止充电*/ - orderTrackService.setStopChargeOrderTrack(stopResult,orderInfo);/**订单轨迹*/ - }else { + CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(), stopChargeBO.getConnectorNo(), orderInfo.getOrderNo()); + /**调取分发服务停止充电*/ + orderTrackService.setStopChargeOrderTrack(stopResult, orderInfo);/**订单轨迹*/ + } else {//如果订单不存在 + //上下两者不同之处在这里,只有这一句不同 + //equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo: 通过订单号查询订单 + //equipmentChargeOrderDOMapper.queryChargeOrderByPileIdAndPlugNo: 通过桩号和枪号查询订单 + /** + t_connector: 充电枪表 + t_equipment_charge_order: 订单表 + + SELECT + eco.* + FROM + t_equipment_charge_order eco + LEFT JOIN t_connector c ON c.id = eco.connector_id + WHERE + eco.state = 2 + AND eco.user_id = #{userId} + AND eco.equipment_id = #{equipmentId} + AND c.connector_no = #{connectorNo} + */ EquipmentChargeOrderDO orderInfos = equipmentChargeOrderDOMapper.queryChargeOrderByPileIdAndPlugNo(stopChargeBO); - if (orderInfos != null){ - orderInfos.setOperateState((byte)2); + if (orderInfos != null) { + orderInfos.setOperateState((byte) 2); orderInfos.setUpdateTime(ToolDateTime.getDate()); equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfos);/**更新订单状态为结束中*/ - CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(),stopChargeBO.getConnectorNo(),orderInfos.getOrderNo());/**调取分发服务停止充电*/ - orderTrackService.setStopChargeOrderTrack(stopResult,orderInfos);/**订单轨迹*/ + CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(), stopChargeBO.getConnectorNo(), orderInfos.getOrderNo()); + /**调取分发服务停止充电*/ + orderTrackService.setStopChargeOrderTrack(stopResult, orderInfos);/**订单轨迹*/ } } //stopResult.setData(stopResult.getMsg()); @@ -167,23 +201,27 @@ public class OrderApiService { } - /**【结束充电】查询账单*/ - public CommonResponse queryChargeBill(UserChargeBillBO userChargeBillBO){ + /** + * 【结束充电】查询账单 + */ + public CommonResponse queryChargeBill(UserChargeBillBO userChargeBillBO) { UserChargeBillVO userChargeBillVO = equipmentChargeOrderDOMapper.queryChargeBill(userChargeBillBO.getOrderNo()); - if (userChargeBillVO == null){ + if (userChargeBillVO == null) { return I100cResponse.exception("未查到到账单信息"); } //分时段信息 - if (userChargeBillVO.getChargeSettleType() == 2){ + if (userChargeBillVO.getChargeSettleType() == 2) { userChargeBillVO.setChargeTimeShare(equipmentChargeOrderDetailDOMapper.getChargeTimeShareInfoByOrderNo(userChargeBillVO.getOrderNo())); } - return I100cResponse.success(userChargeBillVO); + return I100cResponse.success(userChargeBillVO); } - /**【我的】用户充电充电订单 state -> 2 充电中 3 已完成 5挂起 待支付*/ - public CommonResponse queryUserChargeOrder (HttpServletRequest request, UserChargeOrderBO userChargeOrderBO){ - if (StringUtils.isBlank(request.getHeader("userId"))){ + /** + * 【我的】用户充电充电订单 state -> 2 充电中 3 已完成 5挂起 待支付 + */ + public CommonResponse queryUserChargeOrder(HttpServletRequest request, UserChargeOrderBO userChargeOrderBO) { + if (StringUtils.isBlank(request.getHeader("userId"))) { return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN); } userChargeOrderBO.setSql(OrderUtil.userChargeOrderQuerySql(userChargeOrderBO.getType())); @@ -191,41 +229,47 @@ public class OrderApiService { PageHelper.startPage(userChargeOrderBO.getPageNum(), userChargeOrderBO.getPageSize()); List userChargeOrderList = equipmentChargeOrderDOMapper.queryUserChargeOrder(userChargeOrderBO); PageInfo userChargeOrderPageInfo = new PageInfo(userChargeOrderList); - return I100cResponse.success(userChargeOrderPageInfo); + return I100cResponse.success(userChargeOrderPageInfo); } - /**【我的】用户碳减量信息*/ - public UserCarbonReduceVO queryUserCarbonReduce(HttpServletRequest request){ - Integer userId = Integer.parseInt(request.getHeader("userId")); - UserCarbonReduceVO userCarbonReduceVO = equipmentChargeOrderDOMapper.queryUserCarbonReduce(userId); - //改版新统计充值与消费 - UserAccountDO userAccountDO = userDOMapper.getAccountInfo(userId.longValue()); - userCarbonReduceVO.setRechargeFree(userAccountDO.getUaBalance().setScale(2 , BigDecimal.ROUND_HALF_UP).doubleValue()); - userCarbonReduceVO.setConsumptionFree(userAccountDO.getUaConsumeMoney().setScale(2 ,BigDecimal.ROUND_HALF_UP).doubleValue()); + /** + * 【我的】用户碳减量信息 + */ + public UserCarbonReduceVO queryUserCarbonReduce(HttpServletRequest request) { + Integer userId = Integer.parseInt(request.getHeader("userId")); + UserCarbonReduceVO userCarbonReduceVO = equipmentChargeOrderDOMapper.queryUserCarbonReduce(userId); + //改版新统计充值与消费 + UserAccountDO userAccountDO = userDOMapper.getAccountInfo(userId.longValue()); + userCarbonReduceVO.setRechargeFree(userAccountDO.getUaBalance().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + userCarbonReduceVO.setConsumptionFree(userAccountDO.getUaConsumeMoney().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); - return userCarbonReduceVO; + return userCarbonReduceVO; } - /**根据订单号查询充电中订单*/ - public CommonResponse queryChargingOrder(ChargingOrderBO chargingOrderBO){ + /** + * 根据订单号查询充电中订单 + */ + public CommonResponse queryChargingOrder(ChargingOrderBO chargingOrderBO) { ChargingOrderVO chargingOrder = equipmentChargeOrderDOMapper.queryChargingOrderByOrderNo(chargingOrderBO.getOrderNo()); - if (chargingOrder == null){ + if (chargingOrder == null) { return I100cResponse.exception("未查询到订单信息"); } return I100cResponse.success(chargingOrder); } - /**创建订单*/ - public void creatOrderByCard(StartChargeBO startChargeBO){ - log.info("桩上报充电创建订单,订单编号：{}",startChargeBO.getOrderNo()); + /** + * 创建订单 + */ + public void creatOrderByCard(StartChargeBO startChargeBO) { + log.info("桩上报充电创建订单,订单编号：{}", startChargeBO.getOrderNo()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo()); HashMap map = equipmentDOMapper.getEquipmentChargeSettleTypeAndIdAndStationId(startChargeBO.getEquipmentSn()); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); equipmentChargeOrderDO.setState((byte) 0); - equipmentChargeOrderDO.setOperateState((byte)1); - equipmentChargeOrderDO.setPayStatus((byte)0); + equipmentChargeOrderDO.setOperateState((byte) 1); + equipmentChargeOrderDO.setPayStatus((byte) 0); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); @@ -240,7 +284,7 @@ public class OrderApiService { equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setChargeSettleType(Byte.valueOf(String.valueOf(map.get("chargeSettleType")))); - equipmentChargeOrderDO.setPayMethod((byte)0); + equipmentChargeOrderDO.setPayMethod((byte) 0); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); //记录当前充电折扣活动 orderService.handlePreOrderActivity(equipmentChargeOrderDO); @@ -250,15 +294,17 @@ public class OrderApiService { orderService.handlePreCompanyInfo(equipmentChargeOrderDO); } - /**创建订单*/ - public void createOrderByCardV2(StartChargeBO startChargeBO){ - log.info("桩上报充电创建订单,订单编号：{}",startChargeBO.getOrderNo()); + /** + * 创建订单 + */ + public void createOrderByCardV2(StartChargeBO startChargeBO) { + log.info("桩上报充电创建订单,订单编号：{}", startChargeBO.getOrderNo()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo()); - StartChargeCardDTO startChargeCardDTO = equipmentDOMapper.getStartChargeCardInfo(startChargeBO.getEquipmentSn(),startChargeBO.getPlugNo()); + StartChargeCardDTO startChargeCardDTO = equipmentDOMapper.getStartChargeCardInfo(startChargeBO.getEquipmentSn(), startChargeBO.getPlugNo()); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); equipmentChargeOrderDO.setState((byte) 0); - equipmentChargeOrderDO.setOperateState((byte)1); - equipmentChargeOrderDO.setPayStatus((byte)0); + equipmentChargeOrderDO.setOperateState((byte) 1); + equipmentChargeOrderDO.setPayStatus((byte) 0); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); @@ -272,7 +318,7 @@ public class OrderApiService { equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setChargeSettleType(startChargeCardDTO.getChargeSettleType()); - equipmentChargeOrderDO.setPayMethod((byte)0); + equipmentChargeOrderDO.setPayMethod((byte) 0); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); //记录当前充电折扣活动 orderService.handlePreOrderActivity(equipmentChargeOrderDO); @@ -282,30 +328,32 @@ public class OrderApiService { orderService.handlePreCompanyInfo(equipmentChargeOrderDO); } - /**星星充电刷卡创建订单*/ - public void creatOrderByCardToXx(StartChargeBO startChargeBO){ - log.info("刷卡充电创建订单,订单编号：{}",startChargeBO.getOrderNo()); + /** + * 星星充电刷卡创建订单 + */ + public void creatOrderByCardToXx(StartChargeBO startChargeBO) { + log.info("刷卡充电创建订单,订单编号：{}", startChargeBO.getOrderNo()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo()); EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); equipmentChargeOrderDO.setState((byte) 0); - equipmentChargeOrderDO.setOperateState((byte)1); - equipmentChargeOrderDO.setPayStatus((byte)0); + equipmentChargeOrderDO.setOperateState((byte) 1); + equipmentChargeOrderDO.setPayStatus((byte) 0); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); - equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); - equipmentChargeOrderDO.setStationId(equipmentInfoVO.getStationId()); - equipmentChargeOrderDO.setEquipmentId(equipmentInfoVO.getEquipmentId()); - equipmentChargeOrderDO.setConnectorId(equipmentInfoVO.getConnectorId()); - equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); - equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); - equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); - equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); - equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); - equipmentChargeOrderDO.setPayMethod((byte)0); + equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); + equipmentChargeOrderDO.setStationId(equipmentInfoVO.getStationId()); + equipmentChargeOrderDO.setEquipmentId(equipmentInfoVO.getEquipmentId()); + equipmentChargeOrderDO.setConnectorId(equipmentInfoVO.getConnectorId()); + equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); + equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); + equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); + equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); + equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); + equipmentChargeOrderDO.setPayMethod((byte) 0); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); //记录当前充电折扣活动 orderService.handlePreOrderActivity(equipmentChargeOrderDO); @@ -315,30 +363,30 @@ public class OrderApiService { orderService.handlePreCompanyInfo(equipmentChargeOrderDO); } - public void createOrderInfoByVin(StartChargeBO startChargeBO){ - log.info("vin充电创建订单,订单编号：{}",startChargeBO.getOrderNo()); + public void createOrderInfoByVin(StartChargeBO startChargeBO) { + log.info("vin充电创建订单,订单编号：{}", startChargeBO.getOrderNo()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo()); EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); equipmentChargeOrderDO.setState((byte) 0); - equipmentChargeOrderDO.setOperateState((byte)1); - equipmentChargeOrderDO.setPayStatus((byte)0); + equipmentChargeOrderDO.setOperateState((byte) 1); + equipmentChargeOrderDO.setPayStatus((byte) 0); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); - equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); - equipmentChargeOrderDO.setStationId(equipmentInfoVO.getStationId()); - equipmentChargeOrderDO.setEquipmentId(equipmentInfoVO.getEquipmentId()); - equipmentChargeOrderDO.setConnectorId(equipmentInfoVO.getConnectorId()); - equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); - equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); - equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); - equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); - equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); - equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); - equipmentChargeOrderDO.setChargeVin(startChargeBO.getVin()); - equipmentChargeOrderDO.setPayMethod((byte)0); + equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); + equipmentChargeOrderDO.setStationId(equipmentInfoVO.getStationId()); + equipmentChargeOrderDO.setEquipmentId(equipmentInfoVO.getEquipmentId()); + equipmentChargeOrderDO.setConnectorId(equipmentInfoVO.getConnectorId()); + equipmentChargeOrderDO.setCompanyId(userTypeInfo.getCompanyId().longValue()); + equipmentChargeOrderDO.setOrderType(userTypeInfo.getUserType().byteValue()); + equipmentChargeOrderDO.setCreateTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setOrderTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); + equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); + equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); + equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); + equipmentChargeOrderDO.setChargeVin(startChargeBO.getVin()); + equipmentChargeOrderDO.setPayMethod((byte) 0); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); //记录当前充电折扣活动 orderService.handlePreOrderActivity(equipmentChargeOrderDO); @@ -352,15 +400,15 @@ public class OrderApiService { String equipmentSn = startChargeBO.getEquipmentSn(); EquipmentDO equipmentDO = equipmentDOMapper.queryEquimentInfoBySn(equipmentSn); HashMap map = new HashMap(); - map.put("equipmentId",equipmentDO.getId()); - map.put("connectorNo",startChargeBO.getPlugNo()); + map.put("equipmentId", equipmentDO.getId()); + map.put("connectorNo", startChargeBO.getPlugNo()); Long connectorId = connectorDOMapper.getIByEquipmentIdAndConnectorNo(map); - map.put("connectorId",connectorId); - map.put("orderNo",startChargeBO.getOrderNo()); + map.put("connectorId", connectorId); + map.put("orderNo", startChargeBO.getOrderNo()); equipmentChargeOrderDOMapper.updateOrderByEquipmentSn(map); } - public EquipmentChargeOrderDO getChargeOrder(String equipmentSn,Integer connectorNo){ + public EquipmentChargeOrderDO getChargeOrder(String equipmentSn, Integer connectorNo) { EquipmentChargeOrderDO chargeOrder = equipmentChargeOrderDOMapper.getChargeOrder(equipmentSn, connectorNo); return chargeOrder; } @@ -368,16 +416,16 @@ public class OrderApiService { public CommonResponse companyNewestChargeOrder(HttpServletRequest request, CompanyNewestChargeOrderBO companyNewestChargeOrderBO) { String userId = request.getHeader("userId"); - if (userId == null || "".equals(userId)){ + if (userId == null || "".equals(userId)) { return I100cResponse.exception("参数缺失", Constant.RESCODE_EXCEPTION); } - PageHelper.startPage(companyNewestChargeOrderBO.getPageNum(),companyNewestChargeOrderBO.getPageSize()); + PageHelper.startPage(companyNewestChargeOrderBO.getPageNum(), companyNewestChargeOrderBO.getPageSize()); List companyNewestChargeOrderVOS = equipmentChargeOrderDOMapper.companyNewestChargeOrder(companyNewestChargeOrderBO.getCompanyId()); PageInfo companyNewestChargeOrderVOPageInfo = new PageInfo(companyNewestChargeOrderVOS); return I100cResponse.success(companyNewestChargeOrderVOPageInfo); } - public CommonResponse commonStopCharge(Long connectorId,String cancelMsg) { + public CommonResponse commonStopCharge(Long connectorId, String cancelMsg) { StopChargeBO stopChargeBO = equipmentChargeOrderDOMapper.queryChargeOrderByConnectorId(connectorId); if (stopChargeBO != null && StringUtils.isNotBlank(stopChargeBO.getOrderNo())) { EquipmentChargeOrderDO equipmentChargeOrderDO = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(stopChargeBO.getOrderNo()); @@ -393,8 +441,8 @@ public class OrderApiService { return I100cResponse.exception("该枪没有正在充电中的订单"); } - private void removeFreezeUser(UserDO userDO){ - if(userDO.getSharedUser() == 1) { + private void removeFreezeUser(UserDO userDO) { + if (userDO.getSharedUser() == 1) { Boolean removeFreezeUserResult = userAccountStateService.removeFreezeUser(userDO.getId().intValue()); log.info("启动充电失败，解冻用户返回结果：{}", removeFreezeUserResult); } diff --git a/业务梳理/~$特收到的需求、分析与现状.docx b/业务梳理/~$特收到的需求、分析与现状.docx new file mode 100644 index 0000000000000000000000000000000000000000..67c3e0ffd304dea9b65c4a0ddc0a69270acfad7e GIT binary patch literal 162 zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oQfCTPq rnM^I?N`G^UQ7N8z{@T+F3>D1MK2<