From e7ae59dad25e57764d7b3754049f588e4df39fdd Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 17 Aug 2021 11:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A9=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A1=A9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/common/dto/PileEndOrder.java | 6 +- .../order/api/HxpcPileOrderController.java | 83 +++++++++++++++++-- .../xhpc/order/domain/HxpcChargeOrder.java | 13 +++ .../mapper/XhpcChargeOrderMapper.xml | 33 +++++++- 4 files changed, 121 insertions(+), 14 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/PileEndOrder.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/PileEndOrder.java index e1c1beda..6236f970 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/PileEndOrder.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/dto/PileEndOrder.java @@ -12,7 +12,7 @@ public class PileEndOrder { private Integer chargingTime; //累计充电时间 private Integer chargingDegree; //充电度数 private Integer amountCharged; //已充金额 - private Integer erroRemark; //备注 + private String erroRemark; //备注 public String getOrderNo() { @@ -75,12 +75,12 @@ public class PileEndOrder { this.chargingDegree = chargingDegree; } - public Integer getErroRemark() { + public String getErroRemark() { return erroRemark; } - public void setErroRemark(Integer erroRemark) { + public void setErroRemark(String erroRemark) { this.erroRemark = erroRemark; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java index 6382ca10..509c9188 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java @@ -7,13 +7,16 @@ import com.xhpc.common.api.PileOrderService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.dto.PileEndOrder; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.util.ConnectionRabbitMQUtil; import com.xhpc.order.domain.HxpcChargeOrder; import com.xhpc.order.service.IHxpcChargeOrderService; import com.xhpc.order.service.IXhpcHistoryOrderService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -28,7 +31,7 @@ public class HxpcPileOrderController extends BaseController { private RedisService redisService; @Autowired - private IHxpcChargeOrderService iHxpcChargeOrderService; + private IHxpcChargeOrderService hxpcChargeOrderService; @Autowired private IXhpcHistoryOrderService xhpcHistoryOrderService; @@ -128,17 +131,32 @@ public class HxpcPileOrderController extends BaseController { /** * 桩订单结束回调 * - * @param orderNo 订单号 - * @param status 状态 1正常 2异常 - * @param remark 备注 - * @return */ @GetMapping("/pileEndOrder") - public R pileEndOrder(String orderNo, Integer status, String remark) { + public R pileEndOrder(@RequestBody PileEndOrder pileEndOrder) { //解析订单编号 - String s = orderNo.split("\\.")[0]; + String s = pileEndOrder.getOrderNo().split("\\.")[0]; String s1 = s.split(":")[1]; + Date date = new Date(); + + //获取充电订单 + HxpcChargeOrder hxpcChargeOrder = hxpcChargeOrderService.getSerialNumberMessage(s1); + hxpcChargeOrder.setStartSoc(pileEndOrder.getStartSoc()); + hxpcChargeOrder.setEndSoc(pileEndOrder.getEndSoc()); + hxpcChargeOrder.setStatus(pileEndOrder.getStatus()); + hxpcChargeOrder.setEndTime(date); + hxpcChargeOrder.setChargingTime(pileEndOrder.getChargingTime().toString()); + hxpcChargeOrder.setChargingDegree(pileEndOrder.getChargingDegree().toString()); + hxpcChargeOrder.setAmountCharged(pileEndOrder.getAmountCharged().toString()); + hxpcChargeOrder.setErroRemark(pileEndOrder.getErroRemark()); + hxpcChargeOrderService.updateXhpcChargeOrder(hxpcChargeOrder); + + //历史订单 + + + + // Date date = new Date(); @@ -190,6 +208,53 @@ public class HxpcPileOrderController extends BaseController { } + private void gun(){ + // Date date = new Date(); +// //获取实时订单 +// Map cacheMap = redisService.getCacheMap("order:"+serialNumber); +// JSONArray st = (JSONArray)cacheMap.get("realtimeDataList"); +// System.out.println(st.toString()); +// CacheRealtimeData cacheRealtimeData = JSON.toJavaObject(st.getJSONObject(0), CacheRealtimeData.class); +// +// //用户第几次充电 +// int count = iHxpcChargeOrderService.getCount(userId); +// String state =""; +// String discount =""; +// if(count==0){ +// //活动折扣 +// Map promotion = iHxpcChargeOrderService.getPromotion(); +// if(promotion !=null){ +// //state 1.总金额 2.金额 3.服务费 discount 折扣率 +// state = promotion.get("state").toString(); +// discount = promotion.get("discount").toString(); +// } +// } +// +// //生成一条历史订单 +// XhpcHistoryOrder xhpcHistoryOrder =new XhpcHistoryOrder(); +// xhpcHistoryOrder.setChargeOrderId(hxpcChargeOrder.getChargeOrderId()); +// xhpcHistoryOrder.setChargingStationId(hxpcChargeOrder.getChargingStationId()); +// xhpcHistoryOrder.setUserId(userId); +// xhpcHistoryOrder.setTerminalId(hxpcChargeOrder.getTerminalId()); +// xhpcHistoryOrder.setSerialNumber(hxpcChargeOrder.getSerialNumber()); +// xhpcHistoryOrder.setStartSoc(hxpcChargeOrder.getStartSoc()); +// xhpcHistoryOrder.setReconciliationStatus(0); +// xhpcHistoryOrder.setSortingStatus(0); +// xhpcHistoryOrder.setType(1); +// xhpcHistoryOrder.setStatus(0); +// xhpcHistoryOrder.setDelFlag(0); +// xhpcHistoryOrder.setCreateTime(date); +// //订单总价---运维服务费抽成 +// //结束时soc +// xhpcHistoryOrderService.insert(xhpcHistoryOrder); +// +// //充电订单 --结束soc、充电时长、充电度数 +// hxpcChargeOrder.setEndTime(date); +// +// //实时数据存入MYsql、soc、电流、电压 + } + + /** * @param status 状态 * @param delFlag 是否删除 @@ -200,7 +265,7 @@ public class HxpcPileOrderController extends BaseController { */ private Long update(Integer status, Integer delFlag, String remark, String serialNumber, Integer type) { - HxpcChargeOrder hxpcChargeOrder = iHxpcChargeOrderService.getSerialNumberMessage(serialNumber); + HxpcChargeOrder hxpcChargeOrder = hxpcChargeOrderService.getSerialNumberMessage(serialNumber); hxpcChargeOrder.setStatus(status); hxpcChargeOrder.setDelFlag(delFlag); hxpcChargeOrder.setErroRemark(remark); @@ -211,7 +276,7 @@ public class HxpcPileOrderController extends BaseController { //充电订单 --结束soc、充电时长、充电度数 hxpcChargeOrder.setEndTime(date); } - iHxpcChargeOrderService.updateXhpcChargeOrder(hxpcChargeOrder); + hxpcChargeOrderService.updateXhpcChargeOrder(hxpcChargeOrder); return userId; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java index 1450d0f0..e9c04c26 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java @@ -91,6 +91,9 @@ public class HxpcChargeOrder extends BaseEntity { /** 异常备注 */ private String erroRemark; + /** 总金额 */ + private String amountCharged; + public Long getChargeOrderId() { @@ -282,4 +285,14 @@ public class HxpcChargeOrder extends BaseEntity { this.erroRemark = erroRemark; } + public String getAmountCharged() { + + return amountCharged; + } + + public void setAmountCharged(String amountCharged) { + + this.amountCharged = amountCharged; + } + } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 6f31cba6..edf55a42 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -28,6 +28,8 @@ + + @@ -120,6 +122,9 @@ start_soc, + + end_soc, + source, @@ -145,7 +150,16 @@ charging_time, - charging_degree + charging_degree, + + + type, + + + erro_remark, + + + amount_charged @@ -167,6 +181,9 @@ #{startSoc}, + + #{endSoc}, + #{source}, @@ -192,7 +209,16 @@ #{chargingTime}, - #{chargingDegree} + #{chargingDegree}, + + + #{type}, + + + #{erroRemark}, + + + #{amountCharged} @@ -200,6 +226,7 @@ update xhpc_charge_order + start_soc = #{startSoc}, end_soc = #{endSoc}, status = #{status}, remark = #{remark}, @@ -207,6 +234,8 @@ charging_time = #{chargingTime}, charging_degree = #{chargingDegree}, type = #{type}, + erro_remark = #{erroRemark}, + amount_charged = #{amountCharged}, where charge_order_id = #{chargingStationId}