Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

2026-04-25 13:35:15 +08:00 · 2024-08-27 09:57:42 +08:00
parent e8dc924e8a bbb0c16275
commit 33838e6e7f
26 changed files with 571 additions and 242 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2121,7 +2121,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
        } catch (BaseAdaPayException e) {
            throw new RuntimeException(e);
        }
-        logger.info("根据订单号:{}, 查询到支付信息:{}", orderCode, JSON.toJSONString(paymentInfoSet));
+        logger.info("根据订单号:{}, 查询到支付信息:{}, ", orderCode, JSON.toJSONString(paymentInfoSet));
        if (CollectionUtils.isNotEmpty(paymentInfoSet)) {
            for (PaymentInfo paymentInfo : paymentInfoSet) {
                String paymentId = paymentInfo.getPaymentId();
@@ -3796,7 +3796,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
        String orderCode = generateNewOrderCode();
        String transactionCode = chargingStartupResult.getTransactionCode();

-        String status = StringUtils.equals(chargingStartupResult.getStartupResult(), "00")
+        String status = StringUtils.equals(chargingStartupResult.getStartupResult(), "01")
                ? OrderStatusEnum.IN_THE_CHARGING.getValue()
                : OrderStatusEnum.ORDER_CLOSE_TIMEOUT.getValue();

@@ -3826,11 +3826,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
                .reason(chargingStartupResult.getFailReason())
                .build();

+        OrderDetail orderDetail = OrderDetail.builder()
+                .orderCode(orderCode)
+                .delFlag(DelFlagEnum.NORMAL.getValue())
+                .build();
+
        // 保存到数据库
        OrderTransactionDTO createOrderTransactionDTO = OrderTransactionDTO.builder()
                .orderBasicInfo(orderBasicInfo)
-                .orderDetail(null)
+                .orderDetail(orderDetail)
                .build();
+        logger.info("createReservationOrder, chargingStartupResult:{}, 订单信息:{}", JSON.toJSONString(chargingStartupResult), JSON.toJSONString(orderBasicInfo));
        pileTransactionService.doCreateOrder(createOrderTransactionDTO);

        OrderPayRecord principalPayRecord = OrderPayRecord.builder()
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
@@ -412,6 +412,18 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
            return 0;
        }

+        // 是否发指令 false:不发指令 true:发指令, 默认不发指令
+        boolean sendFlag = false;
+        if (StringUtils.equals(pileReservationInfo.getStatus(), "1")) {
+            sendFlag = true;
+        }
+
+        // 发指令结果 false:失败 true:成功, 默认失败
+        boolean sendResult = false;
+
+        // 是否更新数据库 false:不更新 true:更新, 默认更新
+        boolean updateFlag = true;
+
        // 操作 0x01:启动 0x02:取消 0x03:修改
        String operation = "03";
        if (StringUtils.isNotBlank(dto.getStartTime())) {
@@ -431,47 +443,55 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
            if (StringUtils.equals(dto.getStatus(), Constants.ZERO)) {
                // 停用
                operation = "02";
+                sendFlag = true;
            } else if (StringUtils.equals(dto.getStatus(), Constants.ONE)) {
                // 启用
                operation = "01";
+                sendFlag = true;
            }
        }
        pileReservationInfo.setUpdateBy(dto.getMemberId());

        /*
-        先发送指令, 收到回复更新数据库
+        发送指令
         */
-        // 查询会员的绑定vin列表 2024年7月30日11点04分 以当前请求会员的VIN为准
-        List<MemberPlateNumberVO> plateNumberVOList = memberPlateNumberRelationService.selectMemberPlateNumberRelation(dto.getMemberId());
-        List<String> vinCodes = Lists.newArrayList();
-        int count = 0;
-        for (MemberPlateNumberVO vo : plateNumberVOList) {
-            if (count < 3 && StringUtils.isNotBlank(vo.getVinCode())) {
-                vinCodes.add(vo.getVinCode());
-                count++;
+        if (sendFlag) {
+            // 查询会员的绑定vin列表 2024年7月30日11点04分 以当前请求会员的VIN为准
+            List<MemberPlateNumberVO> plateNumberVOList = memberPlateNumberRelationService.selectMemberPlateNumberRelation(dto.getMemberId());
+            List<String> vinCodes = Lists.newArrayList();
+            int count = 0;
+            for (MemberPlateNumberVO vo : plateNumberVOList) {
+                if (count < 3 && StringUtils.isNotBlank(vo.getVinCode())) {
+                    vinCodes.add(vo.getVinCode());
+                    count++;
+                }
            }
+            // 如果 vinCodes 的数量少于 3，用 "0" 补足
+            while (vinCodes.size() < 3) {
+                vinCodes.add("");
+            }
+            String type = StringUtils.equals(pileReservationInfo.getReservationType(), "single") ? "00" : "01";
+            ReservationChargingCommand command = ReservationChargingCommand.builder()
+                    .transactionCode(Constants.ILLEGAL_TRANSACTION_CODE)
+                    .pileSn(pileReservationInfo.getPileSn())
+                    .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), ""))
+                    .operation(operation)
+                    .reservationType(type)
+                    .verifyIdentity(pileReservationInfo.getVerifyIdentity())
+                    .vin1(vinCodes.get(0))
+                    .vin2(vinCodes.get(1))
+                    .vin3(vinCodes.get(2))
+                    .reservedStartTime(pileReservationInfo.getStartTime().toLocalTime())
+                    .reservedEndTime(pileReservationInfo.getEndTime().toLocalTime())
+                    .amount(Constants.WHITELIST_DEFAULT_AMOUNT)
+                    .build();
+            String result = pileRemoteService.reservationCharging(command);
+            sendResult = StringUtils.equals(result, Constants.ONE);
        }
-        // 如果 vinCodes 的数量少于 3，用 "0" 补足
-        while (vinCodes.size() < 3) {
-            vinCodes.add("");
-        }
-        String type = StringUtils.equals(pileReservationInfo.getReservationType(), "single") ? "00" : "01";
-        ReservationChargingCommand command = ReservationChargingCommand.builder()
-                .transactionCode(Constants.ILLEGAL_TRANSACTION_CODE)
-                .pileSn(pileReservationInfo.getPileSn())
-                .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), ""))
-                .operation(operation)
-                .reservationType(type)
-                .verifyIdentity(pileReservationInfo.getVerifyIdentity())
-                .vin1(vinCodes.get(0))
-                .vin2(vinCodes.get(1))
-                .vin3(vinCodes.get(2))
-                .reservedStartTime(pileReservationInfo.getStartTime().toLocalTime())
-                .reservedEndTime(pileReservationInfo.getEndTime().toLocalTime())
-                .amount(Constants.WHITELIST_DEFAULT_AMOUNT)
-                .build();
-        String result = pileRemoteService.reservationCharging(command);
-        if (StringUtils.equals(result, Constants.ONE)) {
+
+        log.info("修改预约充电信息, updateFlag:{}, sendFlag:{}, sendResult:{}", updateFlag, sendFlag, sendResult);
+        // 更新数据库, 一般情况下是都更新的, 只有在发送指令并发送失败的情况下才不更新
+        if (updateFlag && (sendFlag == sendResult)) {
            return this.insertOrUpdateSelective(pileReservationInfo);
        }
        return 0;
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java
@@ -207,7 +207,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
        });

        // 等待获取结果
-        byte[] rpcResponse = syncPromise.get2(timeout, unit);
+        byte[] rpcResponse = syncPromise.get(timeout, unit);

        if(rpcResponse == null) {
            if(syncPromise.isTimeout()) {