From a21751b7230ba22d03c0e6b8ae2a8ba89ac3585c Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 20 Jun 2023 16:13:25 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BC=9A=E5=91=98=E5=85=85?= =?UTF-8?q?=E5=80=BC=E4=BD=99=E9=A2=9D=E6=97=B6=EF=BC=8C=E5=B0=86=E5=85=85?= =?UTF-8?q?=E5=80=BC=E9=87=91=E9=A2=9D=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E5=85=85=E7=94=B5=E7=9A=84=E8=AE=A2=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=EF=BC=88=E4=BB=85=E9=99=90=E5=8D=A1=E5=90=AF=E5=8A=A8=E3=80=81?= =?UTF-8?q?VIN=E5=90=AF=E5=8A=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/MemberService.java | 43 +++++++++++++------ .../jsowell/service/PileRemoteService.java | 4 +- .../com/jsowell/pile/vo/uniapp/OrderVO.java | 2 + .../mapper/pile/OrderBasicInfoMapper.xml | 1 + 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 660c17cce..7765e3545 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -26,17 +26,9 @@ import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; -import com.jsowell.pile.domain.MemberBasicInfo; -import com.jsowell.pile.domain.MemberInvoiceTitle; -import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.domain.MemberWalletInfo; -import com.jsowell.pile.domain.PileAuthCard; +import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberInvoiceTitleService; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IPileAuthCardService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.dto.MemberTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.vo.MemberPlateNumberVO; @@ -91,6 +83,12 @@ public class MemberService { @Autowired private IMemberInvoiceTitleService memberInvoiceTitleService; + @Autowired + private PileRemoteService pileRemoteService; + + @Autowired + private IOrderBasicInfoService orderBasicInfoService; + @Autowired private OrderService orderService; @@ -495,6 +493,11 @@ public class MemberService { return null; } + /** + * 充值订单金额 + * @param dto + * @throws ParseException + */ public void rechargeOrderAmount(RechargeOrderAmountDTO dto) throws ParseException { // 根据memberId查询出当前用户正在充电的 vin启动订单 或 卡启动订单 UniAppQueryOrderDTO orderDTO = new UniAppQueryOrderDTO(); @@ -511,13 +514,25 @@ public class MemberService { if (StringUtils.equals(orderVO.getStartMode(), StartModeEnum.AUTH_CARD.getValue()) || StringUtils.equals(orderVO.getStartMode(), StartModeEnum.OFFLINE_CARD.getValue()) || StringUtils.equals(orderVO.getStartMode(), StartModeEnum.VIN_CODE.getValue())) { + // 将充值后的余额计算出来 BigDecimal rechargeAmount = new BigDecimal(dto.getRechargeAmount()); - orderVO.setPayAmount(orderVO.getPayAmount().add(rechargeAmount)); + BigDecimal payAmount = orderVO.getPayAmount().add(rechargeAmount); + orderVO.setPayAmount(payAmount); + // 发送0x41指令更新账户余额 + RemoteAccountBalanceUpdateDTO remoteDTO = new RemoteAccountBalanceUpdateDTO(); + remoteDTO.setPileSn(orderVO.getPileSn()); + remoteDTO.setConnectorCode(orderVO.getConnectorCode()); + remoteDTO.setAccountBalance(String.valueOf(orderVO.getPayAmount())); + pileRemoteService.remoteAccountBalanceUpdate(remoteDTO); + + // 将支付金额修改数据库 + OrderBasicInfo basicInfo = new OrderBasicInfo(); + basicInfo.setId(Long.parseLong(orderVO.getId())); + basicInfo.setPayAmount(payAmount); + + orderBasicInfoService.updateOrderBasicInfo(basicInfo); } } - // 将充值后的余额计算出来 - - // 发送0x41指令更新账户余额 } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java index d3a9bdc6c..eb5527f39 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java @@ -201,10 +201,12 @@ public class PileRemoteService { RemoteAccountBalanceUpdateCommand command = RemoteAccountBalanceUpdateCommand.builder() .pileSn(dto.getPileSn()) .connectorCode(dto.getConnectorCode()) - .logicCard(dto.getLogicCard()) .accountBalance(dto.getAccountBalance()) .build(); + if (StringUtils.isNotBlank(dto.getLogicCard())) { + command.setLogicCard(dto.getLogicCard()); + } ykcPushCommandService.pushAccountBalanceUpdateCommand(command); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java index a02a7a1aa..cc641ff92 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java @@ -12,6 +12,8 @@ import java.math.BigDecimal; */ @Data public class OrderVO { + private String id; + /** * 订单号 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 1e5ccff24..8c6ab317b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -765,6 +765,7 @@