From c43938e67b19bb37cf054fe3523ec20f96090d51 Mon Sep 17 00:00:00 2001 From: "DESKTOP-D9QDT1P\\JS-ZZA" Date: Thu, 9 Mar 2023 13:34:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 30 ++++++++++--------- .../jsowell/common/constant/Constants.java | 4 +-- .../jsowell/pile/vo/uniapp/UniAppOrderVO.java | 30 +++++++++++++++++++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f3caf802f..cedc80ee2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -42,14 +42,7 @@ import com.jsowell.pile.dto.SettleOrderDTO; import com.jsowell.pile.dto.StopChargingDTO; import com.jsowell.pile.dto.UniAppQueryOrderDTO; import com.jsowell.pile.dto.WeixinPayDTO; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberTransactionRecordService; -import com.jsowell.pile.service.IOrderBasicInfoService; -import com.jsowell.pile.service.IOrderPayRecordService; -import com.jsowell.pile.service.IPileBillingTemplateService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.WechatPayService; -import com.jsowell.pile.service.WxpayCallbackRecordService; +import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.vo.base.PileInfoVO; @@ -59,6 +52,7 @@ import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.uniapp.UniAppOrderVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.OrderDetailInfoVO; +import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; import com.jsowell.wxpay.dto.WeChatRefundDTO; import com.jsowell.wxpay.response.WechatPayNotifyParameter; @@ -72,12 +66,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -130,6 +119,9 @@ public class OrderService { @Autowired private RedisCache redisCache; + @Autowired + private IPileStationInfoService pileStationInfoService; + /** * 生成订单 * @@ -705,6 +697,16 @@ public class OrderService { vo.setPileConnectorCode(orderBasicInfo.getPileSn() + orderBasicInfo.getConnectorCode()); String orderStatus = orderBasicInfo.getOrderStatus(); vo.setOrderStatus(orderStatus); + vo.setStartChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())); + Date chargeEndTime = orderBasicInfo.getChargeEndTime(); + if (Objects.nonNull(chargeEndTime)) { + vo.setEndChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeEndTime)); + } + PileStationVO stationInfo = pileStationInfoService.getStationInfo(orderBasicInfo.getStationId()); + vo.setStationName(stationInfo.getStationName()); + vo.setReason(orderBasicInfo.getReason()); + vo.setOrderAmount(String.valueOf(orderBasicInfo.getOrderAmount())); + vo.setPayAmount(String.valueOf(orderBasicInfo.getPayAmount())); // 订单状态描述 String orderStatusDescribe; diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 2e87f8c47..078300c1d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -21,7 +21,7 @@ public class Constants { public static final Integer SOCKET_PORT = 9011; public static final String updateServerIP = "192.168.2.2"; - public static final int port = 0x21; + public static final int port = 0x15; public static final byte[] updateServerPort = new byte[]{port}; @@ -29,7 +29,7 @@ public class Constants { public static final String updateServerPassword = "vuser1"; - public static final String filePath = "/pevc1xx_main_update_v2.0.0.8.bin"; + public static final String filePath = "/test.bin"; public static final String partnerId = "1632405339"; // 商户号Id diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java index 7de495f35..38c0e464b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java @@ -13,6 +13,11 @@ import java.util.List; @AllArgsConstructor @Builder public class UniAppOrderVO { + /** + * 站点名称 + */ + private String stationName; + /** * 订单编号 */ @@ -33,6 +38,11 @@ public class UniAppOrderVO { */ private String pileConnectorCode; + /** + * 异常原因 + */ + private String reason; + /** * 订单状态 */ @@ -43,6 +53,16 @@ public class UniAppOrderVO { */ private String orderStatusDescribe; + /** + * 用户支付金额 + */ + private String payAmount; + + /** + * 订单金额 + */ + private String orderAmount; + /** * 当前SOC */ @@ -93,6 +113,16 @@ public class UniAppOrderVO { */ private String batteryMaxTemperature; + /** + * 开始充电时间 + */ + private String startChargingTime; + + /** + * 结束充电时间 + */ + private String endChargingTime; + /** * 充电实时数据列表 */