From 0b8f80cc5c3681ee9db88e142033cff1546ed425 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 22 Feb 2024 17:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAvip=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/SpringBootTestController.java | 13 ++++++++----- .../impl/PileBillingTemplateServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 167ebb8a8..29bfc0ad8 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -64,7 +64,7 @@ import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.SnUtils; import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.web.*; @@ -253,11 +253,14 @@ public class SpringBootTestController { @Test public void queryBillingPriceTest() { String stationId = "19"; - List billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId); - System.out.println("老版:" + JSON.toJSONString(billingPriceVOS)); + // List billingPriceVOS = pileBillingTemplateService.queryBillingPriceOld(stationId); + // System.out.println("老版:" + JSON.toJSONString(billingPriceVOS)); + // + // List billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId); + // System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1)); - List billingPriceVOS1 = pileBillingTemplateService.queryBillingPrice(stationId); - System.out.println("新版:" + JSON.toJSONString(billingPriceVOS1)); + CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationId); + System.out.println("currentTimePriceDetails:" + JSON.toJSONString(currentTimePriceDetails)); } @Test diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index c93941106..eebfbda76 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -400,7 +400,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic // 查询站点的集团会员计费模板 BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId); if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result) ) { - List billingDetailList = billingTemplateVO.getBillingDetailList(); + List billingDetailList = preferentialBillingTemplate.getBillingDetailList(); for (BillingDetailVO detailVO : billingDetailList) { List applyTimeList = detailVO.getApplyTime(); for (String applyTime : applyTimeList) {