huanghai
/
YltProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main^2
黄海 12 months ago
parent 469b332583
commit 9c0ed7b78c
2 changed files with 163 additions and 115 deletions
Show Stats Download Patch File Download Diff File

194
Ylt/ms-order/src/main/java/com/charge/order/apiservice/OrderApiService.java
Unescape View File

@ -65,9 +65,11 @@ public class OrderApiService {
UserAccountStateService userAccountStateService; 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); return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN);
} }
startChargeBO.setUserId(Integer.parseInt(request.getHeader("userId"))); startChargeBO.setUserId(Integer.parseInt(request.getHeader("userId")));
@ -91,8 +93,8 @@ public class OrderApiService {
log.info("调用下发启动充电接口失败，失败原因：{}", e); log.info("调用下发启动充电接口失败，失败原因：{}", e);
removeFreezeUser(userDO); removeFreezeUser(userDO);
} }
orderTrackService.setStartChargeOrderTrack(startResult,startChargeBO,orderNo);/**订单轨迹*/ orderTrackService.setStartChargeOrderTrack(startResult, startChargeBO, orderNo);/**订单轨迹*/
if (startResult.getCode() != 1000){ if (startResult.getCode() != 1000) {
removeFreezeUser(userDO); removeFreezeUser(userDO);
return I100cResponse.exception(startResult.getMsg()); return I100cResponse.exception(startResult.getMsg());
} }
@ -100,15 +102,18 @@ public class OrderApiService {
//new Thread(()->orderTrackService.setStartChargeOrderTrack(startResult,startChargeBO,orderNo)).start();/**订单轨迹*/ //new Thread(()->orderTrackService.setStartChargeOrderTrack(startResult,startChargeBO,orderNo)).start();/**订单轨迹*/
return startResult; return startResult;
} }
/**创建订单*/
private String creatOrder(StartChargeBO startChargeBO){ /**
* 创建订单
*/
private String creatOrder(StartChargeBO startChargeBO) {
UserTypeVO userTypeInfo = userDOMapper.queryUserType(startChargeBO.getUserId()); UserTypeVO userTypeInfo = userDOMapper.queryUserType(startChargeBO.getUserId());
Integer chargeSettleType = Optional.ofNullable(equipmentDOMapper.getEquipmentChargeSettleType(startChargeBO.getEquipmentId())).orElse(2); Integer chargeSettleType = Optional.ofNullable(equipmentDOMapper.getEquipmentChargeSettleType(startChargeBO.getEquipmentId())).orElse(2);
EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO();
equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo());
equipmentChargeOrderDO.setState((byte) 0); equipmentChargeOrderDO.setState((byte) 0);
equipmentChargeOrderDO.setOperateState((byte)1); equipmentChargeOrderDO.setOperateState((byte) 1);
equipmentChargeOrderDO.setPayStatus((byte)0); equipmentChargeOrderDO.setPayStatus((byte) 0);
equipmentChargeOrderDO.setOrderNo(OrderUtil.generateOrder()); equipmentChargeOrderDO.setOrderNo(OrderUtil.generateOrder());
equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo());
equipmentChargeOrderDO.setUserId(startChargeBO.getUserId().longValue()); equipmentChargeOrderDO.setUserId(startChargeBO.getUserId().longValue());
@ -122,10 +127,10 @@ public class OrderApiService {
equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate());
equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource());
equipmentChargeOrderDO.setChargeSettleType(chargeSettleType.byteValue()); equipmentChargeOrderDO.setChargeSettleType(chargeSettleType.byteValue());
if(startChargeBO.getPayment() == 1){ if (startChargeBO.getPayment() == 1) {
equipmentChargeOrderDO.setPayMethod((byte)0);/**余额支付*/ equipmentChargeOrderDO.setPayMethod((byte) 0);/**余额支付*/
}else { } else {
equipmentChargeOrderDO.setPayMethod((byte)2);/**线上支付先默认微信小程序支付,结算后更改*/ equipmentChargeOrderDO.setPayMethod((byte) 2);/**线上支付先默认微信小程序支付,结算后更改*/
} }
equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); 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); return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN);
} }
//1、用户ID
stopChargeBO.setUserId(Integer.parseInt(request.getHeader("userId"))); stopChargeBO.setUserId(Integer.parseInt(request.getHeader("userId")));
log.info("停止充电请求参数：{}", JSON.toJSONString(stopChargeBO)); 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()); EquipmentChargeOrderDO orderInfo = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(stopChargeBO.getOrderNo());
if (orderInfo != null){ //如果订单存在
orderInfo.setOperateState((byte)2); // 【黄海理解：小程序送上来的数据应该是有订单号的，如果没有的话，那么一定是携带了桩号和枪号，也可以查询出订单号,为什么小程序有时不携带订单号呢？不明白原因】
if (orderInfo != null) {
orderInfo.setOperateState((byte) 2);
orderInfo.setUpdateTime(ToolDateTime.getDate()); orderInfo.setUpdateTime(ToolDateTime.getDate());
equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfo);/**更新订单状态为结束中*/ equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfo);/**更新订单状态为结束中*/
CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(),stopChargeBO.getConnectorNo(),orderInfo.getOrderNo());/**调取分发服务停止充电*/ CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(), stopChargeBO.getConnectorNo(), orderInfo.getOrderNo());
orderTrackService.setStopChargeOrderTrack(stopResult,orderInfo);/**订单轨迹*/ /**调取分发服务停止充电*/
}else { 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); EquipmentChargeOrderDO orderInfos = equipmentChargeOrderDOMapper.queryChargeOrderByPileIdAndPlugNo(stopChargeBO);
if (orderInfos != null){ if (orderInfos != null) {
orderInfos.setOperateState((byte)2); orderInfos.setOperateState((byte) 2);
orderInfos.setUpdateTime(ToolDateTime.getDate()); orderInfos.setUpdateTime(ToolDateTime.getDate());
equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfos);/**更新订单状态为结束中*/ equipmentChargeOrderDOMapper.updateByPrimaryKeySelective(orderInfos);/**更新订单状态为结束中*/
CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(),stopChargeBO.getConnectorNo(),orderInfos.getOrderNo());/**调取分发服务停止充电*/ CommonResponse stopResult = distributeApi.stopCharge(stopChargeBO.getEquipmentSn(), stopChargeBO.getConnectorNo(), orderInfos.getOrderNo());
orderTrackService.setStopChargeOrderTrack(stopResult,orderInfos);/**订单轨迹*/ /**调取分发服务停止充电*/
orderTrackService.setStopChargeOrderTrack(stopResult, orderInfos);/**订单轨迹*/
} }
} }
//stopResult.setData(stopResult.getMsg()); //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()); UserChargeBillVO userChargeBillVO = equipmentChargeOrderDOMapper.queryChargeBill(userChargeBillBO.getOrderNo());
if (userChargeBillVO == null){ if (userChargeBillVO == null) {
return I100cResponse.exception("未查到到账单信息"); return I100cResponse.exception("未查到到账单信息");
} }
//分时段信息 //分时段信息
if (userChargeBillVO.getChargeSettleType() == 2){ if (userChargeBillVO.getChargeSettleType() == 2) {
userChargeBillVO.setChargeTimeShare(equipmentChargeOrderDetailDOMapper.getChargeTimeShareInfoByOrderNo(userChargeBillVO.getOrderNo())); 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){ * 【我的】用户充电充电订单 state -> 2 充电中 3 已完成 5挂起 待支付
if (StringUtils.isBlank(request.getHeader("userId"))){ */
public CommonResponse queryUserChargeOrder(HttpServletRequest request, UserChargeOrderBO userChargeOrderBO) {
if (StringUtils.isBlank(request.getHeader("userId"))) {
return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN); return I100cResponse.exception("凭证过期请重新登录", Constant.RESCODE_NOLOGIN);
} }
userChargeOrderBO.setSql(OrderUtil.userChargeOrderQuerySql(userChargeOrderBO.getType())); userChargeOrderBO.setSql(OrderUtil.userChargeOrderQuerySql(userChargeOrderBO.getType()));
@ -195,37 +233,43 @@ public class OrderApiService {
} }
/**【我的】用户碳减量信息*/ /**
public UserCarbonReduceVO queryUserCarbonReduce(HttpServletRequest request){ * 【我的】用户碳减量信息
*/
public UserCarbonReduceVO queryUserCarbonReduce(HttpServletRequest request) {
Integer userId = Integer.parseInt(request.getHeader("userId")); Integer userId = Integer.parseInt(request.getHeader("userId"));
UserCarbonReduceVO userCarbonReduceVO = equipmentChargeOrderDOMapper.queryUserCarbonReduce(userId); UserCarbonReduceVO userCarbonReduceVO = equipmentChargeOrderDOMapper.queryUserCarbonReduce(userId);
//改版新统计充值与消费 //改版新统计充值与消费
UserAccountDO userAccountDO = userDOMapper.getAccountInfo(userId.longValue()); UserAccountDO userAccountDO = userDOMapper.getAccountInfo(userId.longValue());
userCarbonReduceVO.setRechargeFree(userAccountDO.getUaBalance().setScale(2 , BigDecimal.ROUND_HALF_UP).doubleValue()); userCarbonReduceVO.setRechargeFree(userAccountDO.getUaBalance().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
userCarbonReduceVO.setConsumptionFree(userAccountDO.getUaConsumeMoney().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()); ChargingOrderVO chargingOrder = equipmentChargeOrderDOMapper.queryChargingOrderByOrderNo(chargingOrderBO.getOrderNo());
if (chargingOrder == null){ if (chargingOrder == null) {
return I100cResponse.exception("未查询到订单信息"); return I100cResponse.exception("未查询到订单信息");
} }
return I100cResponse.success(chargingOrder); 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()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo());
HashMap map = equipmentDOMapper.getEquipmentChargeSettleTypeAndIdAndStationId(startChargeBO.getEquipmentSn()); HashMap map = equipmentDOMapper.getEquipmentChargeSettleTypeAndIdAndStationId(startChargeBO.getEquipmentSn());
EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO();
equipmentChargeOrderDO.setState((byte) 0); equipmentChargeOrderDO.setState((byte) 0);
equipmentChargeOrderDO.setOperateState((byte)1); equipmentChargeOrderDO.setOperateState((byte) 1);
equipmentChargeOrderDO.setPayStatus((byte)0); equipmentChargeOrderDO.setPayStatus((byte) 0);
equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo());
equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo());
equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId());
@ -240,7 +284,7 @@ public class OrderApiService {
equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate());
equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource());
equipmentChargeOrderDO.setChargeSettleType(Byte.valueOf(String.valueOf(map.get("chargeSettleType")))); equipmentChargeOrderDO.setChargeSettleType(Byte.valueOf(String.valueOf(map.get("chargeSettleType"))));
equipmentChargeOrderDO.setPayMethod((byte)0); equipmentChargeOrderDO.setPayMethod((byte) 0);
equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO);
//记录当前充电折扣活动 //记录当前充电折扣活动
orderService.handlePreOrderActivity(equipmentChargeOrderDO); orderService.handlePreOrderActivity(equipmentChargeOrderDO);
@ -250,15 +294,17 @@ public class OrderApiService {
orderService.handlePreCompanyInfo(equipmentChargeOrderDO); 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()); 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 equipmentChargeOrderDO = new EquipmentChargeOrderDO();
equipmentChargeOrderDO.setState((byte) 0); equipmentChargeOrderDO.setState((byte) 0);
equipmentChargeOrderDO.setOperateState((byte)1); equipmentChargeOrderDO.setOperateState((byte) 1);
equipmentChargeOrderDO.setPayStatus((byte)0); equipmentChargeOrderDO.setPayStatus((byte) 0);
equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo());
equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo());
equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId());
@ -272,7 +318,7 @@ public class OrderApiService {
equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate()); equipmentChargeOrderDO.setReportTime(ToolDateTime.getDate());
equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource());
equipmentChargeOrderDO.setChargeSettleType(startChargeCardDTO.getChargeSettleType()); equipmentChargeOrderDO.setChargeSettleType(startChargeCardDTO.getChargeSettleType());
equipmentChargeOrderDO.setPayMethod((byte)0); equipmentChargeOrderDO.setPayMethod((byte) 0);
equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO);
//记录当前充电折扣活动 //记录当前充电折扣活动
orderService.handlePreOrderActivity(equipmentChargeOrderDO); orderService.handlePreOrderActivity(equipmentChargeOrderDO);
@ -282,15 +328,17 @@ public class OrderApiService {
orderService.handlePreCompanyInfo(equipmentChargeOrderDO); 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()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo());
EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO); EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO);
EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO();
equipmentChargeOrderDO.setState((byte) 0); equipmentChargeOrderDO.setState((byte) 0);
equipmentChargeOrderDO.setOperateState((byte)1); equipmentChargeOrderDO.setOperateState((byte) 1);
equipmentChargeOrderDO.setPayStatus((byte)0); equipmentChargeOrderDO.setPayStatus((byte) 0);
equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo());
equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo());
equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId());
@ -305,7 +353,7 @@ public class OrderApiService {
equipmentChargeOrderDO.setControlSource(startChargeBO.getSource()); equipmentChargeOrderDO.setControlSource(startChargeBO.getSource());
equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue());
equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo());
equipmentChargeOrderDO.setPayMethod((byte)0); equipmentChargeOrderDO.setPayMethod((byte) 0);
equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO);
//记录当前充电折扣活动 //记录当前充电折扣活动
orderService.handlePreOrderActivity(equipmentChargeOrderDO); orderService.handlePreOrderActivity(equipmentChargeOrderDO);
@ -315,14 +363,14 @@ public class OrderApiService {
orderService.handlePreCompanyInfo(equipmentChargeOrderDO); orderService.handlePreCompanyInfo(equipmentChargeOrderDO);
} }
public void createOrderInfoByVin(StartChargeBO startChargeBO){ public void createOrderInfoByVin(StartChargeBO startChargeBO) {
log.info("vin充电创建订单,订单编号：{}",startChargeBO.getOrderNo()); log.info("vin充电创建订单,订单编号：{}", startChargeBO.getOrderNo());
UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo()); UserTypeVO userTypeInfo = userDOMapper.queryUserTypeByCardNo(startChargeBO.getUserCardNo());
EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO); EquipmentInfoVO equipmentInfoVO = connectorDOMapper.getEquipmentInfoByPileSnAndConnectorNo(startChargeBO);
EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO(); EquipmentChargeOrderDO equipmentChargeOrderDO = new EquipmentChargeOrderDO();
equipmentChargeOrderDO.setState((byte) 0); equipmentChargeOrderDO.setState((byte) 0);
equipmentChargeOrderDO.setOperateState((byte)1); equipmentChargeOrderDO.setOperateState((byte) 1);
equipmentChargeOrderDO.setPayStatus((byte)0); equipmentChargeOrderDO.setPayStatus((byte) 0);
equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo()); equipmentChargeOrderDO.setOrderNo(startChargeBO.getOrderNo());
equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo()); equipmentChargeOrderDO.setUserCardNo(startChargeBO.getUserCardNo());
equipmentChargeOrderDO.setUserId(userTypeInfo.getId()); equipmentChargeOrderDO.setUserId(userTypeInfo.getId());
@ -338,7 +386,7 @@ public class OrderApiService {
equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue()); equipmentChargeOrderDO.setChargeSettleType(equipmentInfoVO.getChargeSettleType().byteValue());
equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo()); equipmentChargeOrderDO.setChargePlateNo(startChargeBO.getCarPlateNo());
equipmentChargeOrderDO.setChargeVin(startChargeBO.getVin()); equipmentChargeOrderDO.setChargeVin(startChargeBO.getVin());
equipmentChargeOrderDO.setPayMethod((byte)0); equipmentChargeOrderDO.setPayMethod((byte) 0);
equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO); equipmentChargeOrderDOMapper.insertSelective(equipmentChargeOrderDO);
//记录当前充电折扣活动 //记录当前充电折扣活动
orderService.handlePreOrderActivity(equipmentChargeOrderDO); orderService.handlePreOrderActivity(equipmentChargeOrderDO);
@ -352,15 +400,15 @@ public class OrderApiService {
String equipmentSn = startChargeBO.getEquipmentSn(); String equipmentSn = startChargeBO.getEquipmentSn();
EquipmentDO equipmentDO = equipmentDOMapper.queryEquimentInfoBySn(equipmentSn); EquipmentDO equipmentDO = equipmentDOMapper.queryEquimentInfoBySn(equipmentSn);
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("equipmentId",equipmentDO.getId()); map.put("equipmentId", equipmentDO.getId());
map.put("connectorNo",startChargeBO.getPlugNo()); map.put("connectorNo", startChargeBO.getPlugNo());
Long connectorId = connectorDOMapper.getIByEquipmentIdAndConnectorNo(map); Long connectorId = connectorDOMapper.getIByEquipmentIdAndConnectorNo(map);
map.put("connectorId",connectorId); map.put("connectorId", connectorId);
map.put("orderNo",startChargeBO.getOrderNo()); map.put("orderNo", startChargeBO.getOrderNo());
equipmentChargeOrderDOMapper.updateOrderByEquipmentSn(map); equipmentChargeOrderDOMapper.updateOrderByEquipmentSn(map);
} }
public EquipmentChargeOrderDO getChargeOrder(String equipmentSn,Integer connectorNo){ public EquipmentChargeOrderDO getChargeOrder(String equipmentSn, Integer connectorNo) {
EquipmentChargeOrderDO chargeOrder = equipmentChargeOrderDOMapper.getChargeOrder(equipmentSn, connectorNo); EquipmentChargeOrderDO chargeOrder = equipmentChargeOrderDOMapper.getChargeOrder(equipmentSn, connectorNo);
return chargeOrder; return chargeOrder;
} }
@ -368,16 +416,16 @@ public class OrderApiService {
public CommonResponse companyNewestChargeOrder(HttpServletRequest request, CompanyNewestChargeOrderBO companyNewestChargeOrderBO) { public CommonResponse companyNewestChargeOrder(HttpServletRequest request, CompanyNewestChargeOrderBO companyNewestChargeOrderBO) {
String userId = request.getHeader("userId"); String userId = request.getHeader("userId");
if (userId == null || "".equals(userId)){ if (userId == null || "".equals(userId)) {
return I100cResponse.exception("参数缺失", Constant.RESCODE_EXCEPTION); return I100cResponse.exception("参数缺失", Constant.RESCODE_EXCEPTION);
} }
PageHelper.startPage(companyNewestChargeOrderBO.getPageNum(),companyNewestChargeOrderBO.getPageSize()); PageHelper.startPage(companyNewestChargeOrderBO.getPageNum(), companyNewestChargeOrderBO.getPageSize());
List<CompanyNewestChargeOrderVO> companyNewestChargeOrderVOS = equipmentChargeOrderDOMapper.companyNewestChargeOrder(companyNewestChargeOrderBO.getCompanyId()); List<CompanyNewestChargeOrderVO> companyNewestChargeOrderVOS = equipmentChargeOrderDOMapper.companyNewestChargeOrder(companyNewestChargeOrderBO.getCompanyId());
PageInfo<CompanyNewestChargeOrderVO> companyNewestChargeOrderVOPageInfo = new PageInfo<CompanyNewestChargeOrderVO>(companyNewestChargeOrderVOS); PageInfo<CompanyNewestChargeOrderVO> companyNewestChargeOrderVOPageInfo = new PageInfo<CompanyNewestChargeOrderVO>(companyNewestChargeOrderVOS);
return I100cResponse.success(companyNewestChargeOrderVOPageInfo); return I100cResponse.success(companyNewestChargeOrderVOPageInfo);
} }
public CommonResponse commonStopCharge(Long connectorId,String cancelMsg) { public CommonResponse commonStopCharge(Long connectorId, String cancelMsg) {
StopChargeBO stopChargeBO = equipmentChargeOrderDOMapper.queryChargeOrderByConnectorId(connectorId); StopChargeBO stopChargeBO = equipmentChargeOrderDOMapper.queryChargeOrderByConnectorId(connectorId);
if (stopChargeBO != null && StringUtils.isNotBlank(stopChargeBO.getOrderNo())) { if (stopChargeBO != null && StringUtils.isNotBlank(stopChargeBO.getOrderNo())) {
EquipmentChargeOrderDO equipmentChargeOrderDO = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(stopChargeBO.getOrderNo()); EquipmentChargeOrderDO equipmentChargeOrderDO = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(stopChargeBO.getOrderNo());
@ -393,8 +441,8 @@ public class OrderApiService {
return I100cResponse.exception("该枪没有正在充电中的订单"); return I100cResponse.exception("该枪没有正在充电中的订单");
} }
private void removeFreezeUser(UserDO userDO){ private void removeFreezeUser(UserDO userDO) {
if(userDO.getSharedUser() == 1) { if (userDO.getSharedUser() == 1) {
Boolean removeFreezeUserResult = userAccountStateService.removeFreezeUser(userDO.getId().intValue()); Boolean removeFreezeUserResult = userAccountStateService.removeFreezeUser(userDO.getId().intValue());
log.info("启动充电失败，解冻用户返回结果：{}", removeFreezeUserResult); log.info("启动充电失败，解冻用户返回结果：{}", removeFreezeUserResult);
} }

BIN
业务梳理/~$特收到的需求、分析与现状.docx
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save