From fd5420dc78f4d58a272288626938ade341905033 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 14 Aug 2023 13:57:58 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=B0=E5=BD=95scenarioType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/OrderService.java | 5 ++++- .../service/impl/OrderPileOccupyServiceImpl.java | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 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 765e52e64..975ad5a02 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -983,7 +983,9 @@ public class OrderService { .build(); memberTransactionRecordService.insertSelective(record); + String scenarioType = null; if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 + scenarioType = ScenarioEnum.ORDER.getValue(); // 支付订单成功 PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() .orderCode(orderCode) @@ -1003,6 +1005,7 @@ public class OrderService { .build(); orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 + scenarioType = ScenarioEnum.BALANCE.getValue(); // 充值余额成功 UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); dto.setMemberId(memberId); @@ -1017,7 +1020,7 @@ public class OrderService { memberAdapayRecord.setMemberId(memberId); memberAdapayRecord.setPaymentId(adapayCallbackRecord.getPaymentId()); memberAdapayRecord.setPaymentOrderNo(adapayCallbackRecord.getOutTransId()); - memberAdapayRecord.setScenarioType(ScenarioEnum.BALANCE.getValue()); + memberAdapayRecord.setScenarioType(scenarioType); memberAdapayRecord.setPayAmt(amount); memberAdapayRecord.setRefundAmt(BigDecimal.ZERO); memberAdapayRecord.setSpendAmt(BigDecimal.ZERO); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index ff5075558..754b27b00 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -117,11 +117,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ orderPileOccupy.setPileConnectorCode(pileSn + connectorCode); orderPileOccupy.setStartTime(DateUtils.getNowDate()); orderPileOccupy.setDelFlag(DelFlagEnum.NORMAL.getValue()); - orderPileOccupyMapper.insertOrUpdate(orderPileOccupy); + orderPileOccupyMapper.insertSelective(orderPileOccupy); } /** - * 占桩订单停止计费 + * 占桩订单停止计费/停止占桩订单计费 */ @Override public void stopOccupyPileOrder(String occupyCode) { @@ -131,7 +131,15 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ return; } orderPileOccupy.setEndTime(DateUtils.getNowDate()); - orderPileOccupyMapper.insertOrUpdate(orderPileOccupy); + orderPileOccupyMapper.updateByPrimaryKeySelective(orderPileOccupy); + } + + /** + * 计算占桩订单金额 + * calculateTheAmountOfTheOccupancyOrder + */ + public void calculateOccupyPileOrderAmount(String occupyCode) { + } }